7511cd7
diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
7511cd7
index 7e1f520..734dd10 100644
7511cd7
--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
7511cd7
+++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
7c442c1
@@ -400,6 +400,36 @@
7511cd7
          install-size="0"
7511cd7
          version="0.0.0"
7511cd7
          fragment="true"/>
7511cd7
+         
7511cd7
+   
7511cd7
+         id="org.eclipse.equinox.launcher.gtk.linux.arm"
7511cd7
+         os="linux"
7511cd7
+         ws="gtk"
7511cd7
+         arch="arm"
7511cd7
+         download-size="0"
7511cd7
+         install-size="0"
7511cd7
+         version="0.0.0"
7511cd7
+         fragment="true"/>
7511cd7
+
7511cd7
+   
7511cd7
+         id="org.eclipse.equinox.launcher.gtk.linux.aarch64"
7511cd7
+         os="linux"
7511cd7
+         ws="gtk"
7511cd7
+         arch="aarch64"
7511cd7
+         download-size="0"
7511cd7
+         install-size="0"
7511cd7
+         version="0.0.0"
7511cd7
+         fragment="true"/>
74c26cc
+
74c26cc
+   
74c26cc
+         id="org.eclipse.equinox.launcher.gtk.linux.s390x"
74c26cc
+         os="linux"
74c26cc
+         ws="gtk"
74c26cc
+         arch="s390x"
74c26cc
+         download-size="0"
74c26cc
+         install-size="0"
74c26cc
+         version="0.0.0"
74c26cc
+         fragment="true"/>
7511cd7
 
7511cd7
    
7511cd7
          id="org.eclipse.equinox.launcher.gtk.linux.x86"
7c442c1
@@ -478,6 +508,39 @@
74c26cc
          download-size="0"
74c26cc
          install-size="0"
7511cd7
          version="0.0.0"
74c26cc
+         fragment="true"
74c26cc
+         unpack="false"/>
c736234
+
c736234
+   
c736234
+         id="org.eclipse.swt.gtk.linux.s390x"
c736234
+         os="linux"
c736234
+         ws="gtk"
c736234
+         arch="s390x"
c736234
+         download-size="0"
c736234
+         install-size="0"
c736234
+         version="0.0.0"
c736234
+         fragment="true"
c736234
+         unpack="false"/>
c736234
+
7511cd7
+   
7511cd7
+         id="org.eclipse.swt.gtk.linux.arm"
7511cd7
+         os="linux"
7511cd7
+         ws="gtk"
7511cd7
+         arch="arm"
7511cd7
+         download-size="0"
7511cd7
+         install-size="0"
7511cd7
+         version="0.0.0"
7511cd7
+         fragment="true"
7511cd7
+         unpack="false"/>
7511cd7
+
7511cd7
+   
7511cd7
+         id="org.eclipse.swt.gtk.linux.aarch64"
7511cd7
+         os="linux"
7511cd7
+         ws="gtk"
7511cd7
+         arch="aarch64"
7511cd7
+         download-size="0"
7511cd7
+         install-size="0"
7511cd7
+         version="0.0.0"
74c26cc
          fragment="true"
74c26cc
          unpack="false"/>
7511cd7
 
365159b
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml	2014-11-28 15:09:42.000000000 +0000
365159b
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml	2014-11-28 16:52:00.315007846 +0000
7c442c1
@@ -349,6 +349,68 @@
7c442c1
         </plugins>
7c442c1
       </build>
7c442c1
     </profile>
7c442c1
+
7c442c1
+    <profile>
7c442c1
+      <id>build-native-launchers-gtk.linux.ppc64</id>
7c442c1
+      <activation>
7c442c1
+        <property>
7c442c1
+          <name>native</name>
7c442c1
+          <value>gtk.linux.ppc64</value>
7c442c1
+        </property>
7c442c1
+      </activation>
7c442c1
+      <build>
7c442c1
+        <plugins>
7c442c1
+          <plugin>
7c442c1
+            <artifactId>maven-antrun-plugin</artifactId>
7c442c1
+            <executions>
7c442c1
+              <execution>
7c442c1
+                <id>compile-executable-natives</id>
7c442c1
+                <phase>generate-resources</phase>
7c442c1
+                <configuration>
7c442c1
+                  <target>
7c442c1
+                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
7c442c1
+                  </target>
7c442c1
+                </configuration>
7c442c1
+                <goals>
7c442c1
+                  <goal>run</goal>
7c442c1
+                </goals>
7c442c1
+              </execution>
7c442c1
+            </executions>
7c442c1
+          </plugin>
7c442c1
+        </plugins>
7c442c1
+      </build>
7c442c1
+    </profile>
7c442c1
+    <profile>
7c442c1
+      <id>build-native-launchers-gtk.linux.s390x</id>
7c442c1
+      <activation>
7c442c1
+        <property>
7c442c1
+          <name>native</name>
7c442c1
+          <value>gtk.linux.s390x</value>
7c442c1
+        </property>
7c442c1
+      </activation>
7c442c1
+      <build>
7c442c1
+        <plugins>
7c442c1
+          <plugin>
7c442c1
+            <artifactId>maven-antrun-plugin</artifactId>
7c442c1
+            <executions>
7c442c1
+              <execution>
7c442c1
+                <id>compile-executable-natives</id>
7c442c1
+                <phase>generate-resources</phase>
7c442c1
+                <configuration>
7c442c1
+                  <target>
7c442c1
+                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
7c442c1
+                  </target>
7c442c1
+                </configuration>
7c442c1
+                <goals>
7c442c1
+                  <goal>run</goal>
7c442c1
+                </goals>
7c442c1
+              </execution>
7c442c1
+            </executions>
7c442c1
+          </plugin>
7c442c1
+        </plugins>
7c442c1
+      </build>
7c442c1
+    </profile>
7c442c1
+
7c442c1
     <profile>
7c442c1
       <id>build-native-launchers-win32.win32.x86_64</id>
7c442c1
       <activation>
7c442c1
@@ -563,8 +563,11 @@
46cd6ac
                     <copy todir="bin" verbose="true" includeEmptyDirs="false" failonerror="true">
46cd6ac
                       <fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/">
46cd6ac
                         <include name="cocoa/macosx/x86_64/**/*"/>
46cd6ac
+                        <include name="gtk/linux/arm/**/*"/>
46cd6ac
+                        <include name="gtk/linux/aarch64/**/*"/>
7c442c1
                         <include name="gtk/linux/ppc64/**/*"/>
46cd6ac
                         <include name="gtk/linux/ppc64le/**/*"/>
46cd6ac
+                        <include name="gtk/linux/s390x/**/*"/>
46cd6ac
                         <include name="gtk/linux/x86/**/*"/>
46cd6ac
                         <include name="gtk/linux/x86_64/**/*"/>
46cd6ac
                         <include name="win32/win32/x86/**/*"/>
365159b
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties	2015-01-30 14:44:03.436891441 +0000
365159b
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties	2015-01-30 14:45:25.232480509 +0000
7c442c1
@@ -37,3 +37,12 @@
365159b
 
c736234
 root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
c736234
 root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
c736234
+
365159b
+root.linux.gtk.aarch64=bin/gtk/linux/aarch64,gtk_root
365159b
+root.linux.gtk.aarch64.permissions.755=launcher
c736234
+
7c442c1
+root.linux.gtk.arm=bin/gtk/linux/arm,gtk_root
7c442c1
+root.linux.gtk.arm.permissions.755=launcher
c736234
+
c736234
+root.linux.gtk.s390x=bin/gtk/linux/s390x,gtk_root
c736234
+root.linux.gtk.s390x.permissions.755=launcher
c736234
--- a/eclipse.platform.swt.binaries/pom.xml	2017-04-05 01:57:59.142576722 +0100
c736234
+++ b/eclipse.platform.swt.binaries/pom.xml	2017-04-05 02:00:00.153247342 +0100
7c442c1
@@ -55,8 +55,11 @@
365159b
 
c736234
   <modules>
c736234
     <module>bundles/org.eclipse.swt.cocoa.macosx.x86_64</module>
c736234
+    <module>bundles/org.eclipse.swt.gtk.linux.arm</module>
c736234
+    <module>bundles/org.eclipse.swt.gtk.linux.aarch64</module>
7c442c1
     <module>bundles/org.eclipse.swt.gtk.linux.ppc64</module>
c736234
     <module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
c736234
+    <module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
c736234
     <module>bundles/org.eclipse.swt.gtk.linux.x86</module>
c736234
     <module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
c736234
     <module>bundles/org.eclipse.swt.win32.win32.x86</module>
8ae0eb0
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	2017-04-21 10:15:34.857977599 +0100
8ae0eb0
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	2017-04-21 10:18:22.878025820 +0100
7c442c1
@@ -45,3 +45,18 @@
7c442c1
 requires.9.name = org.eclipse.swt.gtk.linux.ppc64le
7c442c1
 requires.9.range = [$version$,$version$]
7c442c1
 requires.9.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))
0c31782
+
0c31782
+requires.10.namespace = org.eclipse.equinox.p2.iu
7c442c1
+requires.10.name = org.eclipse.swt.gtk.linux.arm
0c31782
+requires.10.range = [$version$,$version$]
7c442c1
+requires.10.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=arm)(!(org.eclipse.swt.buildtime=true)))
908a2dc
+
908a2dc
+requires.11.namespace = org.eclipse.equinox.p2.iu
7c442c1
+requires.11.name = org.eclipse.swt.gtk.linux.aarch64
908a2dc
+requires.11.range = [$version$,$version$]
7c442c1
+requires.11.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
7c442c1
+
7c442c1
+requires.12.namespace = org.eclipse.equinox.p2.iu
7c442c1
+requires.12.name = org.eclipse.swt.gtk.linux.s390x
7c442c1
+requires.12.range = [$version$,$version$]
7c442c1
+requires.12.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true)))
704905c
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh	2017-04-19 13:31:15.000000000 +0100
704905c
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh	2017-04-23 16:58:34.022207885 +0100
7c442c1
@@ -128,7 +128,7 @@
a33980e
 				defaultJava=DEFAULT_JAVA_EXEC
7c442c1
 				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
a33980e
 				;;
7c442c1
-                        "arm*")
7c442c1
+                        arm*)
a33980e
 				defaultOSArch="arm"
7c442c1
 				defaultJava=DEFAULT_JAVA_EXEC
7c442c1
 				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
74c26cc
--- a/rt.equinox.framework/pom.xml	2017-04-26 22:19:15.548461372 +0100
74c26cc
+++ b/rt.equinox.framework/pom.xml	2017-04-26 22:20:41.348571492 +0100
7c442c1
@@ -73,6 +73,18 @@
74c26cc
 	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module>
74c26cc
       </modules>
74c26cc
     </profile>
74c26cc
+    <profile>
74c26cc
+      <id>build-native-launchers-gtk.linux.s390x</id>
74c26cc
+      <activation>
74c26cc
+	<property>
74c26cc
+	  <name>native</name>
74c26cc
+	  <value>gtk.linux.s390x</value>
74c26cc
+        </property>
74c26cc
+      </activation>
74c26cc
+      <modules>
74c26cc
+	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390x</module>
74c26cc
+      </modules>
74c26cc
+    </profile>
74c26cc
   </profiles>
74c26cc
 
74c26cc
   <modules>