diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index 6c567f8..969eafb 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -209,29 +209,14 @@
x86_64
- solaris
- gtk
- sparc
-
-
- solaris
- gtk
- x86
-
-
- hpux
+ linux
gtk
- ia64
+ arm
- aix
- gtk
- ppc
-
-
- aix
+ linux
gtk
- ppc64
+ aarch64
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
index 80a32e4..85de879 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
@@ -27,6 +27,10 @@ root.solaris.gtk.sparc.permissions.755=eclipse
root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86
root.solaris.gtk.x86.permissions.755=eclipse
+root.linux.gtk.arm=target/resources/linux.gtk.arm,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/arm
+root.linux.gtk.arm.permissions.755=eclipse
+root.linux.gtk.aarch64=target/resources/linux.gtk.aarch64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/aarch64
+root.linux.gtk.aarch64.permissions.755=eclipse
root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86
root.linux.gtk.x86.permissions.755=libcairo-swt.so,eclipse
root.linux.gtk.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
index bb03da8..257d417 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
@@ -19,6 +19,44 @@
maven-resources-plugin
2.6
+
+ copy-resources-gtk.linux.aarch64
+ validate
+
+ copy-resources
+
+
+ ${basedir}/target/resources/linux.gtk.aarch64
+
+
+ ../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.aarch64
+
+ about_files/*
+ about.html
+
+
+
+
+
+
+ copy-resources-gtk.linux.arm
+ validate
+
+ copy-resources
+
+
+ ${basedir}/target/resources/linux.gtk.arm
+
+
+ ../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.arm
+
+ about_files/*
+ about.html
+
+
+
+
+
copy-resources-gtk.linux.x86
validate
diff --git a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
index 03bf359..3acacc2 100644
--- a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
+++ b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
@@ -134,8 +134,65 @@
version="0.0.0"
fragment="true"
unpack="false"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
bundles/org.eclipse.core.filesystem
+ bundles/org.eclipse.core.filesystem.linux.arm
+ bundles/org.eclipse.core.filesystem.linux.aarch64
+ bundles/org.eclipse.core.filesystem.linux.s390
+ bundles/org.eclipse.core.filesystem.linux.s390x
bundles/org.eclipse.core.filesystem.hpux.ia64
bundles/org.eclipse.core.filesystem.hpux.PA_RISC
bundles/org.eclipse.core.filesystem.linux.ppc
diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binaries/pom.xml
index 7dd0536..66d79ee 100644
--- a/eclipse.platform.swt.binaries/pom.xml
+++ b/eclipse.platform.swt.binaries/pom.xml
@@ -53,6 +53,8 @@
bundles/org.eclipse.swt.gtk.linux.ppc64
bundles/org.eclipse.swt.gtk.linux.s390
bundles/org.eclipse.swt.gtk.linux.s390x
+ bundles/org.eclipse.swt.gtk.linux.arm
+ bundles/org.eclipse.swt.gtk.linux.aarch64
bundles/org.eclipse.swt.gtk.linux.x86
bundles/org.eclipse.swt.gtk.linux.x86_64
bundles/org.eclipse.swt.gtk.solaris.sparc
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
index 689616e..4caf0a9 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
@@ -411,7 +411,7 @@ esac
# For 64-bit CPUs, we have a switch
-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparc64' -o ${MODEL} = 's390x' ]; then
+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparc64' -o ${MODEL} = 's390x' -o ${MODEL} = 'aarch64' ]; then
SWT_PTR_CFLAGS=-DJNI64
if [ -d /lib64 ]; then
XLIB64=-L/usr/X11R6/lib64
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
index f5fb504..1187e84 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
@@ -429,6 +429,7 @@
+
Is64=${is64}
diff --git a/eclipse.platform.team/pom.xml b/eclipse.platform.team/pom.xml
index 8637ed3..e36538a 100644
--- a/eclipse.platform.team/pom.xml
+++ b/eclipse.platform.team/pom.xml
@@ -63,6 +63,12 @@
features/org.eclipse.cvs-feature
+ bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.arm
+ bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.aarch64
+ bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.ppc
+ bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.ppc64
+ bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.s390
+ bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.s390x
bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86
bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64
bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86
diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
index 7e1f520..734dd10 100644
--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
+++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
@@ -420,6 +420,36 @@
install-size="0"
version="0.0.0"
fragment="true"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
"
;;
diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
index fac13bf..e487001 100644
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
@@ -207,6 +207,221 @@
+
+
+ build-native-launchers-gtk.linux.ppc
+
+
+ native
+ gtk.linux.ppc
+
+
+
+
+
+ maven-antrun-plugin
+ 1.7
+
+
+ compile-executable-natives
+ generate-resources
+
+
+
+
+
+
+ run
+
+
+
+
+
+ bsf
+ bsf
+ 2.4.0
+
+
+ rhino
+ js
+ 1.7R2
+
+
+ org.apache.ant
+ ant-apache-bsf
+ 1.8.3
+
+
+ org.apache.ant
+ ant-nodeps
+ 1.8.1
+
+
+
+
+
+
+
+ build-native-launchers-gtk.linux.ppc64
+
+
+ native
+ gtk.linux.ppc64
+
+
+
+
+
+ maven-antrun-plugin
+ 1.7
+
+
+ compile-executable-natives
+ generate-resources
+
+
+
+
+
+
+ run
+
+
+
+
+
+ bsf
+ bsf
+ 2.4.0
+
+
+ rhino
+ js
+ 1.7R2
+
+
+ org.apache.ant
+ ant-apache-bsf
+ 1.8.3
+
+
+ org.apache.ant
+ ant-nodeps
+ 1.8.1
+
+
+
+
+
+
+
+
+ build-native-launchers-gtk.linux.arm
+
+
+ native
+ gtk.linux.arm
+
+
+
+
+
+ maven-antrun-plugin
+ 1.7
+
+
+ compile-executable-natives
+ generate-resources
+
+
+
+
+
+
+ run
+
+
+
+
+
+ bsf
+ bsf
+ 2.4.0
+
+
+ rhino
+ js
+ 1.7R2
+
+
+ org.apache.ant
+ ant-apache-bsf
+ 1.8.3
+
+
+ org.apache.ant
+ ant-nodeps
+ 1.8.1
+
+
+
+
+
+
+
+ build-native-launchers-gtk.linux.aarch64
+
+
+ native
+ gtk.linux.aarch64
+
+
+
+
+
+ maven-antrun-plugin
+ 1.7
+
+
+ compile-executable-natives
+ generate-resources
+
+
+
+
+
+
+ run
+
+
+
+
+
+ bsf
+ bsf
+ 2.4.0
+
+
+ rhino
+ js
+ 1.7R2
+
+
+ org.apache.ant
+ ant-apache-bsf
+ 1.8.3
+
+
+ org.apache.ant
+ ant-nodeps
+ 1.8.1
+
+
+
+
+
+
+
build-native-launchers-win32.win32.x86_64
diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml
index b46cdc6..0fb36a5 100644
--- a/rt.equinox.framework/pom.xml
+++ b/rt.equinox.framework/pom.xml
@@ -53,6 +53,8 @@
bundles/org.eclipse.equinox.launcher.gtk.aix.ppc
bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64
bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64
+ bundles/org.eclipse.equinox.launcher.gtk.linux.arm
+ bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64
bundles/org.eclipse.equinox.launcher.gtk.linux.ppc
bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64
bundles/org.eclipse.equinox.launcher.gtk.linux.s390