diff -urEbwB eclipse-platform-sources-I20200305-0155/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf eclipse-platform-sources-I20200305-0155.new/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
--- eclipse-platform-sources-I20200305-0155/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	2020-03-05 08:07:32.000000000 +0100
+++ eclipse-platform-sources-I20200305-0155.new/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	2020-04-29 14:34:16.387156867 +0200
@@ -24,3 +24,18 @@
 requires.5.name = org.eclipse.swt.gtk.linux.ppc64le
 requires.5.range = [$version$,$version$]
 requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))
+
+requires.6.namespace = org.eclipse.equinox.p2.iu
+requires.6.name = org.eclipse.swt.gtk.linux.aarch64
+requires.6.range = [$version$,$version$]
+requires.6.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
+
+requires.7.namespace = org.eclipse.equinox.p2.iu
+requires.7.name = org.eclipse.swt.gtk.linux.s390x
+requires.7.range = [$version$,$version$]
+requires.7.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true)))
+
+requires.8.namespace = org.eclipse.equinox.p2.iu
+requires.8.name = org.eclipse.swt.gtk.linux.ppc64
+requires.8.range = [$version$,$version$]
+requires.8.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64)(!(org.eclipse.swt.buildtime=true)))
diff -urEbwB eclipse-platform-sources-I20200305-0155/eclipse.platform.swt.binaries/pom.xml eclipse-platform-sources-I20200305-0155.new/eclipse.platform.swt.binaries/pom.xml
--- eclipse-platform-sources-I20200305-0155/eclipse.platform.swt.binaries/pom.xml	2020-03-05 08:07:32.000000000 +0100
+++ eclipse-platform-sources-I20200305-0155.new/eclipse.platform.swt.binaries/pom.xml	2020-04-29 14:32:52.690665564 +0200
@@ -54,7 +54,10 @@
 
   <modules>
     <module>bundles/org.eclipse.swt.cocoa.macosx.x86_64</module>
+    <module>bundles/org.eclipse.swt.gtk.linux.aarch64</module>
+    <module>bundles/org.eclipse.swt.gtk.linux.ppc64</module>
     <module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
+    <module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
     <module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
     <module>bundles/org.eclipse.swt.win32.win32.x86_64</module>
   </modules>
diff -urEbwB eclipse-platform-sources-I20200305-0155/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml eclipse-platform-sources-I20200305-0155.new/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
--- eclipse-platform-sources-I20200305-0155/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml	2020-03-05 08:07:35.000000000 +0100
+++ eclipse-platform-sources-I20200305-0155.new/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml	2020-04-29 14:30:52.145958027 +0200
@@ -393,6 +393,26 @@
          unpack="false"/>
 
    <plugin
+         id="org.eclipse.equinox.launcher.gtk.linux.aarch64"
+         os="linux"
+         ws="gtk"
+         arch="aarch64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.launcher.gtk.linux.s390x"
+         os="linux"
+         ws="gtk"
+         arch="s390x"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
          id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"
          os="macosx"
          ws="cocoa"
@@ -403,6 +423,16 @@
          fragment="true"/>
 
    <plugin
+         id="org.eclipse.equinox.launcher.gtk.linux.ppc64"
+         os="linux"
+         ws="gtk"
+         arch="ppc64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
          id="org.eclipse.equinox.launcher.gtk.linux.ppc64le"
          os="linux"
          ws="gtk"
@@ -451,6 +481,17 @@
          unpack="false"/>
 
    <plugin
+         id="org.eclipse.swt.gtk.linux.ppc64"
+         os="linux"
+         ws="gtk"
+         arch="ppc64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
          id="org.eclipse.swt.gtk.linux.ppc64le"
          os="linux"
          ws="gtk"
@@ -480,6 +521,28 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.swt.gtk.linux.s390x"
+         os="linux"
+         ws="gtk"
+         arch="s390x"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.swt.gtk.linux.aarch64"
+         os="linux"
+         ws="gtk"
+         arch="aarch64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
          fragment="true"
          unpack="false"/>
 
diff -urEbwB eclipse-platform-sources-I20200305-0155/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties eclipse-platform-sources-I20200305-0155.new/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
--- eclipse-platform-sources-I20200305-0155/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties	2020-03-05 08:07:38.000000000 +0100
+++ eclipse-platform-sources-I20200305-0155.new/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties	2020-04-29 14:32:29.866531591 +0200
@@ -24,6 +24,9 @@
 root.win32.win32.x86_64=bin/win32/win32/x86_64
 root.win32.win32.x86_64.permissions.755=launcher.exe
 
+root.linux.gtk.ppc64=bin/gtk/linux/ppc64,gtk_root
+root.linux.gtk.ppc64.permissions.755=launcher
+
 root.linux.gtk.ppc64le=bin/gtk/linux/ppc64le,gtk_root
 root.linux.gtk.ppc64le.permissions.755=launcher
 
@@ -32,3 +35,9 @@
 
 root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
 root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
+
+root.linux.gtk.aarch64=bin/gtk/linux/aarch64,gtk_root
+root.linux.gtk.aarch64.permissions.755=launcher
+
+root.linux.gtk.s390x=bin/gtk/linux/s390x,gtk_root
+root.linux.gtk.s390x.permissions.755=launcher
diff -urEbwB eclipse-platform-sources-I20200305-0155/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh eclipse-platform-sources-I20200305-0155.new/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
--- eclipse-platform-sources-I20200305-0155/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh	2020-03-05 08:07:38.000000000 +0100
+++ eclipse-platform-sources-I20200305-0155.new/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh	2020-04-29 14:36:12.123836247 +0200
@@ -97,10 +97,15 @@
 				defaultJavaHome=`readlink -f /usr/bin/java | sed "s:jre/bin/java::"`
 				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
 				;;
+			"ppc64")
+				defaultOSArch="ppc64"
+				defaultJava=DEFAULT_JAVA_EXEC
+				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
+				;;
 			"s390x")
 				defaultOSArch="s390x"
 				defaultJava=DEFAULT_JAVA_EXEC
-				OUTPUT_DIR="$EXEC_DIR/contributed/$defaultWS/$defaultOS/$defaultOSArch"
+				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
 				;;
             "aarch64")
 				defaultOSArch="aarch64"
diff -urEbwB eclipse-platform-sources-I20200305-0155/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml eclipse-platform-sources-I20200305-0155.new/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
--- eclipse-platform-sources-I20200305-0155/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml	2020-03-05 08:07:38.000000000 +0100
+++ eclipse-platform-sources-I20200305-0155.new/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml	2020-04-29 14:31:40.098239474 +0200
@@ -123,7 +123,10 @@
                     <copy todir="bin" verbose="true" includeEmptyDirs="false" failonerror="true">
                       <fileset dir="${rt.equinox.binaries.loc}/org.eclipse.equinox.executable/bin/">
                         <include name="cocoa/macosx/x86_64/**/*"/>
+                        <include name="gtk/linux/aarch64/**/*"/>
+                        <include name="gtk/linux/ppc64/**/*"/>
                         <include name="gtk/linux/ppc64le/**/*"/>
+                        <include name="gtk/linux/s390x/**/*"/>
                         <include name="gtk/linux/x86_64/**/*"/>
                         <include name="win32/win32/x86_64/**/*"/>
                       </fileset>
diff -urEbwB eclipse-platform-sources-I20200305-0155/rt.equinox.framework/pom.xml eclipse-platform-sources-I20200305-0155.new/rt.equinox.framework/pom.xml
--- eclipse-platform-sources-I20200305-0155/rt.equinox.framework/pom.xml	2020-03-05 08:07:38.000000000 +0100
+++ eclipse-platform-sources-I20200305-0155.new/rt.equinox.framework/pom.xml	2020-04-29 14:38:40.772708813 +0200
@@ -77,6 +77,30 @@
 	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module>
       </modules>
     </profile>
+    <profile>
+      <id>build-native-launchers-gtk.linux.s390x</id>
+      <activation>
+	<property>
+	  <name>native</name>
+	  <value>gtk.linux.s390x</value>
+        </property>
+      </activation>
+      <modules>
+	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390x</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>build-native-launchers-gtk.linux.ppc64</id>
+      <activation>
+	<property>
+	  <name>native</name>
+	  <value>gtk.linux.ppc64</value>
+        </property>
+      </activation>
+      <modules>
+	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
+      </modules>
+    </profile>
   </profiles>
 
   <modules>