Roland Grunberg 7511cd
diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binaries/pom.xml
Roland Grunberg 7511cd
index 7dd0536..66d79ee 100644
Roland Grunberg 7511cd
--- a/eclipse.platform.swt.binaries/pom.xml
Roland Grunberg 7511cd
+++ b/eclipse.platform.swt.binaries/pom.xml
365159
@@ -53,6 +53,8 @@
a69dbc
     <module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
Roland Grunberg 7511cd
     <module>bundles/org.eclipse.swt.gtk.linux.s390</module>
Roland Grunberg 7511cd
     <module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
Roland Grunberg 7511cd
+    <module>bundles/org.eclipse.swt.gtk.linux.arm</module>
Roland Grunberg 7511cd
+    <module>bundles/org.eclipse.swt.gtk.linux.aarch64</module>
Roland Grunberg 7511cd
     <module>bundles/org.eclipse.swt.gtk.linux.x86</module>
Roland Grunberg 7511cd
     <module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
Roland Grunberg 7511cd
     <module>bundles/org.eclipse.swt.gtk.solaris.sparc</module>
a0e15d
diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml
a0e15d
index b46cdc6..0fb36a5 100644
a0e15d
--- a/rt.equinox.framework/pom.xml
a0e15d
+++ b/rt.equinox.framework/pom.xml
365159
@@ -54,6 +54,8 @@
a0e15d
     <module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc</module>
a0e15d
     <module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64</module>
a0e15d
     <module>bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64</module>
a0e15d
+    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.arm</module>
a0e15d
+    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module>
a0e15d
     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc</module>
a0e15d
     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
a69dbc
     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le</module>
Roland Grunberg 7511cd
diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
Roland Grunberg 7511cd
index 7e1f520..734dd10 100644
Roland Grunberg 7511cd
--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
Roland Grunberg 7511cd
+++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
a69dbc
@@ -419,6 +419,26 @@
Roland Grunberg 7511cd
          install-size="0"
Roland Grunberg 7511cd
          version="0.0.0"
Roland Grunberg 7511cd
          fragment="true"/>
Roland Grunberg 7511cd
+         
Roland Grunberg 7511cd
+   
Roland Grunberg 7511cd
+         id="org.eclipse.equinox.launcher.gtk.linux.arm"
Roland Grunberg 7511cd
+         os="linux"
Roland Grunberg 7511cd
+         ws="gtk"
Roland Grunberg 7511cd
+         arch="arm"
Roland Grunberg 7511cd
+         download-size="0"
Roland Grunberg 7511cd
+         install-size="0"
Roland Grunberg 7511cd
+         version="0.0.0"
Roland Grunberg 7511cd
+         fragment="true"/>
Roland Grunberg 7511cd
+
Roland Grunberg 7511cd
+   
Roland Grunberg 7511cd
+         id="org.eclipse.equinox.launcher.gtk.linux.aarch64"
Roland Grunberg 7511cd
+         os="linux"
Roland Grunberg 7511cd
+         ws="gtk"
Roland Grunberg 7511cd
+         arch="aarch64"
Roland Grunberg 7511cd
+         download-size="0"
Roland Grunberg 7511cd
+         install-size="0"
Roland Grunberg 7511cd
+         version="0.0.0"
Roland Grunberg 7511cd
+         fragment="true"/>
Roland Grunberg 7511cd
 
Roland Grunberg 7511cd
    
Roland Grunberg 7511cd
          id="org.eclipse.equinox.launcher.gtk.linux.x86"
a69dbc
@@ -583,6 +613,28 @@
Roland Grunberg 7511cd
          version="0.0.0"
Roland Grunberg 7511cd
          fragment="true"
Roland Grunberg 7511cd
          unpack="false"/>
Roland Grunberg 7511cd
+         
Roland Grunberg 7511cd
+   
Roland Grunberg 7511cd
+         id="org.eclipse.swt.gtk.linux.arm"
Roland Grunberg 7511cd
+         os="linux"
Roland Grunberg 7511cd
+         ws="gtk"
Roland Grunberg 7511cd
+         arch="arm"
Roland Grunberg 7511cd
+         download-size="0"
Roland Grunberg 7511cd
+         install-size="0"
Roland Grunberg 7511cd
+         version="0.0.0"
Roland Grunberg 7511cd
+         fragment="true"
Roland Grunberg 7511cd
+         unpack="false"/>
Roland Grunberg 7511cd
+
Roland Grunberg 7511cd
+   
Roland Grunberg 7511cd
+         id="org.eclipse.swt.gtk.linux.aarch64"
Roland Grunberg 7511cd
+         os="linux"
Roland Grunberg 7511cd
+         ws="gtk"
Roland Grunberg 7511cd
+         arch="aarch64"
Roland Grunberg 7511cd
+         download-size="0"
Roland Grunberg 7511cd
+         install-size="0"
Roland Grunberg 7511cd
+         version="0.0.0"
Roland Grunberg 7511cd
+         fragment="true"
Roland Grunberg 7511cd
+         unpack="false"/>
Roland Grunberg 7511cd
 
Roland Grunberg 7511cd
    
Roland Grunberg 7511cd
          id="org.eclipse.swt.gtk.linux.ppc"
Mat Booth f0d416
diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
Roland Grunberg 7511cd
index 29d3871..45526c8 100644
Mat Booth f0d416
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
Mat Booth f0d416
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
a0e15d
@@ -119,6 +125,16 @@
Roland Grunberg 7511cd
 				defaultJava=DEFAULT_JAVA_EXEC
Roland Grunberg 7511cd
 				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
Roland Grunberg 7511cd
 				;;
Roland Grunberg 7511cd
+			arm*)
Roland Grunberg 7511cd
+				defaultOSArch="arm"
Roland Grunberg 7511cd
+				defaultJava=DEFAULT_JAVA_EXEC
Roland Grunberg 7511cd
+				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
Roland Grunberg 7511cd
+				;;
Roland Grunberg 7511cd
+			"aarch64")
Roland Grunberg 7511cd
+				defaultOSArch="aarch64"
Roland Grunberg 7511cd
+				defaultJava=DEFAULT_JAVA_EXEC
Roland Grunberg 7511cd
+				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
Roland Grunberg 7511cd
+				;;
Roland Grunberg 7511cd
 			*)
Roland Grunberg 7511cd
 				echo "*** Unknown MODEL <${MODEL}>"
Roland Grunberg 7511cd
 				;;
365159
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml	2014-11-28 15:09:42.000000000 +0000
365159
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml	2014-11-28 16:52:00.315007846 +0000
1695dc
@@ -219,6 +219,189 @@
Krzysztof Daniel 9929ce
         </plugins>
Krzysztof Daniel 9929ce
       </build>
Krzysztof Daniel 9929ce
     </profile>
Mat Booth f0d416
+
Mat Booth f0d416
+    <profile>
Krzysztof Daniel 9929ce
+      <id>build-native-launchers-gtk.linux.ppc</id>
Krzysztof Daniel 9929ce
+      <activation>
Krzysztof Daniel 9929ce
+        <property>
Krzysztof Daniel 9929ce
+          <name>native</name>
Krzysztof Daniel 9929ce
+          <value>gtk.linux.ppc</value>
Krzysztof Daniel 9929ce
+        </property>
Krzysztof Daniel 9929ce
+      </activation>
Krzysztof Daniel 9929ce
+      <build>
Krzysztof Daniel 9929ce
+        <plugins>
Krzysztof Daniel 9929ce
+          <plugin>
Krzysztof Daniel 9929ce
+            <artifactid>maven-antrun-plugin</artifactid>
Krzysztof Daniel 9929ce
+            <executions>
Krzysztof Daniel 9929ce
+              <execution>
Krzysztof Daniel 9929ce
+                <id>compile-executable-natives</id>
Krzysztof Daniel 9929ce
+                <phase>generate-resources</phase>
Krzysztof Daniel 9929ce
+                <configuration>
Krzysztof Daniel 9929ce
+                  <target>
8fc0bf
+                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
Krzysztof Daniel 9929ce
+                  </target>
Krzysztof Daniel 9929ce
+                </configuration>
Krzysztof Daniel 9929ce
+                <goals>
Krzysztof Daniel 9929ce
+                  <goal>run</goal>
Krzysztof Daniel 9929ce
+                </goals>
Krzysztof Daniel 9929ce
+              </execution>
Krzysztof Daniel 9929ce
+            </executions>
Krzysztof Daniel 9929ce
+          </plugin>
Krzysztof Daniel 9929ce
+        </plugins>
Krzysztof Daniel 9929ce
+      </build>
Krzysztof Daniel 9929ce
+    </profile>
Mat Booth f0d416
+    <profile>
Krzysztof Daniel 9929ce
+      <id>build-native-launchers-gtk.linux.ppc64</id>
Krzysztof Daniel 9929ce
+      <activation>
Krzysztof Daniel 9929ce
+        <property>
Krzysztof Daniel 9929ce
+          <name>native</name>
Krzysztof Daniel 9929ce
+          <value>gtk.linux.ppc64</value>
Krzysztof Daniel 9929ce
+        </property>
Krzysztof Daniel 9929ce
+      </activation>
Krzysztof Daniel 9929ce
+      <build>
Krzysztof Daniel 9929ce
+        <plugins>
Krzysztof Daniel 9929ce
+          <plugin>
Krzysztof Daniel 9929ce
+            <artifactid>maven-antrun-plugin</artifactid>
Krzysztof Daniel 9929ce
+            <executions>
Krzysztof Daniel 9929ce
+              <execution>
Krzysztof Daniel 9929ce
+                <id>compile-executable-natives</id>
Krzysztof Daniel 9929ce
+                <phase>generate-resources</phase>
Krzysztof Daniel 9929ce
+                <configuration>
Krzysztof Daniel 9929ce
+                  <target>
8fc0bf
+                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
Krzysztof Daniel 9929ce
+                  </target>
Krzysztof Daniel 9929ce
+                </configuration>
Krzysztof Daniel 9929ce
+                <goals>
Krzysztof Daniel 9929ce
+                  <goal>run</goal>
Krzysztof Daniel 9929ce
+                </goals>
Krzysztof Daniel 9929ce
+              </execution>
Krzysztof Daniel 9929ce
+            </executions>
Krzysztof Daniel 9929ce
+          </plugin>
Krzysztof Daniel 9929ce
+        </plugins>
Krzysztof Daniel 9929ce
+      </build>
Krzysztof Daniel 9929ce
+    </profile>
Mat Booth f0d416
+
Mat Booth f0d416
+    <profile>
Krzysztof Daniel 9929ce
+      <id>build-native-launchers-gtk.linux.arm</id>
Krzysztof Daniel 9929ce
+      <activation>
Krzysztof Daniel 9929ce
+        <property>
Krzysztof Daniel 9929ce
+          <name>native</name>
Krzysztof Daniel 9929ce
+          <value>gtk.linux.arm</value>
Krzysztof Daniel 9929ce
+        </property>
Krzysztof Daniel 9929ce
+      </activation>
Krzysztof Daniel 9929ce
+      <build>
Krzysztof Daniel 9929ce
+        <plugins>
Krzysztof Daniel 9929ce
+          <plugin>
Krzysztof Daniel 9929ce
+            <artifactid>maven-antrun-plugin</artifactid>
Krzysztof Daniel 9929ce
+            <executions>
Krzysztof Daniel 9929ce
+              <execution>
Krzysztof Daniel 9929ce
+                <id>compile-executable-natives</id>
Krzysztof Daniel 9929ce
+                <phase>generate-resources</phase>
Krzysztof Daniel 9929ce
+                <configuration>
Krzysztof Daniel 9929ce
+                  <target>
8fc0bf
+                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
Krzysztof Daniel 9929ce
+                  </target>
Krzysztof Daniel 9929ce
+                </configuration>
Krzysztof Daniel 9929ce
+                <goals>
Krzysztof Daniel 9929ce
+                  <goal>run</goal>
Krzysztof Daniel 9929ce
+                </goals>
Krzysztof Daniel 9929ce
+              </execution>
Krzysztof Daniel 9929ce
+            </executions>
Krzysztof Daniel 9929ce
+          </plugin>
Krzysztof Daniel 9929ce
+        </plugins>
Krzysztof Daniel 9929ce
+      </build>
Krzysztof Daniel 9929ce
+    </profile>
Roland Grunberg 7511cd
+    <profile>
Roland Grunberg 7511cd
+      <id>build-native-launchers-gtk.linux.aarch64</id>
Roland Grunberg 7511cd
+      <activation>
Roland Grunberg 7511cd
+        <property>
Roland Grunberg 7511cd
+          <name>native</name>
Roland Grunberg 7511cd
+          <value>gtk.linux.aarch64</value>
Roland Grunberg 7511cd
+        </property>
Roland Grunberg 7511cd
+      </activation>
Roland Grunberg 7511cd
+      <build>
Roland Grunberg 7511cd
+        <plugins>
Roland Grunberg 7511cd
+          <plugin>
Roland Grunberg 7511cd
+            <artifactid>maven-antrun-plugin</artifactid>
Roland Grunberg 7511cd
+            <executions>
Roland Grunberg 7511cd
+              <execution>
Roland Grunberg 7511cd
+                <id>compile-executable-natives</id>
Roland Grunberg 7511cd
+                <phase>generate-resources</phase>
Roland Grunberg 7511cd
+                <configuration>
Roland Grunberg 7511cd
+                  <target>
8fc0bf
+                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
Roland Grunberg 7511cd
+                  </target>
Roland Grunberg 7511cd
+                </configuration>
Roland Grunberg 7511cd
+                <goals>
Roland Grunberg 7511cd
+                  <goal>run</goal>
Roland Grunberg 7511cd
+                </goals>
Roland Grunberg 7511cd
+              </execution>
Roland Grunberg 7511cd
+            </executions>
Roland Grunberg 7511cd
+          </plugin>
Roland Grunberg 7511cd
+        </plugins>
Roland Grunberg 7511cd
+      </build>
Roland Grunberg 7511cd
+    </profile>
1695dc
+    <profile>
1695dc
+      <id>build-native-launchers-gtk.linux.s390x</id>
1695dc
+      <activation>
1695dc
+        <property>
1695dc
+          <name>native</name>
1695dc
+          <value>gtk.linux.s390x</value>
1695dc
+        </property>
1695dc
+      </activation>
1695dc
+      <build>
1695dc
+        <plugins>
1695dc
+          <plugin>
1695dc
+            <artifactid>maven-antrun-plugin</artifactid>
1695dc
+            <executions>
1695dc
+              <execution>
1695dc
+                <id>compile-executable-natives</id>
1695dc
+                <phase>generate-resources</phase>
1695dc
+                <configuration>
1695dc
+                  <target>
1695dc
+                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
1695dc
+                  </target>
1695dc
+                </configuration>
1695dc
+                <goals>
1695dc
+                  <goal>run</goal>
1695dc
+                </goals>
1695dc
+              </execution>
1695dc
+            </executions>
1695dc
+          </plugin>
1695dc
+        </plugins>
1695dc
+      </build>
1695dc
+    </profile>
1695dc
+    <profile>
1695dc
+      <id>build-native-launchers-gtk.linux.s390</id>
1695dc
+      <activation>
1695dc
+        <property>
1695dc
+          <name>native</name>
1695dc
+          <value>gtk.linux.s390</value>
1695dc
+        </property>
1695dc
+      </activation>
1695dc
+      <build>
1695dc
+        <plugins>
1695dc
+          <plugin>
1695dc
+            <artifactid>maven-antrun-plugin</artifactid>
1695dc
+            <executions>
1695dc
+              <execution>
1695dc
+                <id>compile-executable-natives</id>
1695dc
+                <phase>generate-resources</phase>
1695dc
+                <configuration>
1695dc
+                  <target>
1695dc
+                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
1695dc
+                  </target>
1695dc
+                </configuration>
1695dc
+                <goals>
1695dc
+                  <goal>run</goal>
1695dc
+                </goals>
1695dc
+              </execution>
1695dc
+            </executions>
1695dc
+          </plugin>
1695dc
+        </plugins>
1695dc
+      </build>
1695dc
+    </profile>
Mat Booth f0d416
+
Krzysztof Daniel 9929ce
     <profile>
Krzysztof Daniel 9929ce
       <id>build-native-launchers-win32.win32.x86_64</id>
Krzysztof Daniel 9929ce
       <activation>
8b5c72
@@ -347,8 +530,8 @@
365159
                         <include name="gtk/solaris/x86/**/*"/>
365159
                         <include name="win32/win32/x86/**/*"/>
365159
                         <include name="win32/win32/x86_64/**/*"/>
1695dc
-                      </fileset>
1695dc
-                      <fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/">
8b5c72
+                        <include name="gtk/linux/arm/**/*"/>
8b5c72
+                        <include name="gtk/linux/aarch64/**/*"/>
365159
                         <include name="gtk/linux/s390/**/*"/>
365159
                         <include name="gtk/linux/s390x/**/*"/>
1695dc
                       </fileset>
365159
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties	2015-01-30 14:44:03.436891441 +0000
365159
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties	2015-01-30 14:45:25.232480509 +0000
365159
@@ -59,4 +59,8 @@
365159
 root.linux.gtk.s390=bin/gtk/linux/s390,gtk_root
365159
 root.linux.gtk.s390.permissions.755=launcher
365159
 
365159
+root.linux.gtk.aarch64=bin/gtk/linux/aarch64,gtk_root
365159
+root.linux.gtk.aarch64.permissions.755=launcher
365159
+root.linux.gtk.arm=bin/gtk/linux/arm,gtk_root
365159
+root.linux.gtk.arm.permissions.755=launcher
365159