From 30933c60156c67a9624fefae2be6504300ce71bb Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 30 Jan 2015 07:04:39 +0100
Subject: Bug 1122: Add AArch64 support (Android, GNU/Linux and in general)

- Add AArch64 detection via
  - Elf Parser
  - Android properties
  - Java properties
  - Android: Validate CPUType.Family _and_ ABIType

- MachineDescription
  - Remove redundant Type ID and its field
  - Reuse X86_64_UNIX for AArch64 (static config)

New ARCH 'aarch64' for
  ant: <os arch>
    armv8a
    aarch64

 New CPUType.ARM64 (ARM):
  java: os.arch
    aarch64
    arm64

 New CPUType.ARMv8_A (ARM):
  java: os.arch
    armv8-a
    arm64-v8a

New ABIType:
  EABI_AARCH64
---
 make/gluegen-cpptasks-base.xml | 69 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 66 insertions(+), 3 deletions(-)

(limited to 'make/gluegen-cpptasks-base.xml')

diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml
index 222cad7..e896fc0 100755
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -21,7 +21,7 @@
    -   isI386
    -   isAMD64
    -   is64Bit
-   -   isAbiEabiGnuArmel (implicit if isAndroidARMv6 or isLinuxARMv6)
+   -   isAbiEabiGnuArmel (implicit if isAndroidARMv6 or isAndroidARM64)
    -   isAbiEabiGnuArmhf (shall be declared explicit)
    -   isUnix
    -   isX11
@@ -32,6 +32,7 @@
    -   isIA64
    -   isAndroid
    -   isAndroidARMv6
+   -   isAndroidARM64
    -   isAndroidARMv6Armel (set in gluegen.cpptasks.detected.os.2)
    -   isAndroidARMv6Armhf (set in gluegen.cpptasks.detected.os.2)
    -   isLinux
@@ -39,6 +40,7 @@
    -   isLinuxIA64
    -   isLinuxX86
    -   isLinuxARMv6
+   -   isLinuxARM64
    -   isLinuxARMv6Armel   (set in gluegen.cpptasks.detected.os.2)
    -   isLinuxARMv6Armhf   (set in gluegen.cpptasks.detected.os.2)
    -   isLinuxAlpha
@@ -125,6 +127,7 @@
    -   compiler.cfg.linux.x86
    -   compiler.cfg.linux.amd64
    -   compiler.cfg.linux.armv6
+   -   compiler.cfg.linux.aarch64
    -   compiler.cfg.linux.alpha
    -   compiler.cfg.linux.hppa
    -   compiler.cfg.linux.mips
@@ -146,6 +149,7 @@
    -   linker.cfg.linux.x86
    -   linker.cfg.linux.amd64
    -   linker.cfg.linux.armv6
+   -   linker.cfg.linux.aarch64
    -   linker.cfg.linux.alpha
    -   linker.cfg.linux.hppa
    -   linker.cfg.linux.mips
@@ -255,6 +259,8 @@
         <istrue value="${isAMD64}" />
         <os arch="IA64" />
         <os arch="sparcv9" />
+        <os arch="armv8a" />
+        <os arch="aarch64" />
       </or>
     </condition>
 
@@ -324,6 +330,15 @@
         </or>
       </and>
     </condition>
+    <condition property="isAndroidARM64">
+      <and>
+        <istrue value="${isAndroid}" />
+        <or>
+            <os arch="armv8a" />
+            <os arch="aarch64" />
+        </or>
+      </and>
+    </condition>
     <condition property="isLinuxARMv6">
       <and>
         <istrue value="${isLinux}" />
@@ -334,12 +349,23 @@
         </or>
       </and>
     </condition>
+    <condition property="isLinuxARM64">
+      <and>
+        <istrue value="${isLinux}" />
+        <or>
+            <os arch="armv8a" />
+            <os arch="aarch64" />
+        </or>
+      </and>
+    </condition>
     <condition property="isAbiEabiGnuArmel">
       <and>
         <isfalse value="${isAbiEabiGnuArmhf}" />
         <or>
             <istrue value="${isAndroidARMv6}" />
+            <istrue value="${isAndroidARM64}" />
             <istrue value="${isLinuxARMv6}" />
+            <istrue value="${isLinuxARM64}" />
         </or>
       </and>
     </condition>
@@ -559,6 +585,7 @@
     <echo message="IA64=${isIA64}" />
     <echo message="Android=${isAndroid}" />
     <echo message="AndroidARMv6=${isAndroidARMv6}" />
+    <echo message="AndroidARM64=${isAndroidARM64}" />
     <echo message="AndroidARMv6Armel=${isAndroidARMv6Armel}" />
     <echo message="AndroidARMv6Armhf=${isAndroidARMv6Armhf}" />
     <echo message="Linux=${isLinux}" />
@@ -566,6 +593,7 @@
     <echo message="LinuxIA64=${isLinuxIA64}" />
     <echo message="LinuxX86=${isLinuxX86}" />
     <echo message="LinuxARMv6=${isLinuxARMv6}" />
+    <echo message="LinuxARM64=${isLinuxARM64}" />
     <echo message="LinuxARMv6Armel=${isLinuxARMv6Armel}" />
     <echo message="LinuxARMv6Armhf=${isLinuxARMv6Armhf}" />
     <echo message="LinuxAlpha=${isLinuxAlpha}" />
@@ -629,6 +657,10 @@
     <property name="os.and.arch" value="linux-armv6hf" />
   </target>
 
+  <target name="gluegen.cpptasks.detect.os.linux.aarch64" unless="gluegen.cpptasks.detected.os.2" if="isLinuxARM64">
+    <property name="os.and.arch" value="linux-aarch64" />
+  </target>
+
   <target name="gluegen.cpptasks.detect.os.linux.alpha" unless="gluegen.cpptasks.detected.os.2" if="isLinuxAlpha">
     <property name="os.and.arch" value="linux-alpha" />
   </target>
@@ -669,7 +701,11 @@
     <property name="os.and.arch" value="android-armv6hf" />
   </target>
 
-  <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.detect.os.linux.mipsel,gluegen.cpptasks.detect.os.linux.ppc,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.s390x,gluegen.cpptasks.detect.os.linux.sparc" unless="gluegen.cpptasks.detected.os.2" />
+  <target name="gluegen.cpptasks.detect.os.android.aarch64" unless="gluegen.cpptasks.detected.os.2" if="isAndroidARM64">
+    <property name="os.and.arch" value="android-aarch64" />
+  </target>
+
+  <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.linux.aarch64,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.android.aarch64,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.detect.os.linux.mipsel,gluegen.cpptasks.detect.os.linux.ppc,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.s390x,gluegen.cpptasks.detect.os.linux.sparc" unless="gluegen.cpptasks.detected.os.2" />
 
   <target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX">
     <property name="native.library.suffix"     value="*lib" />
@@ -977,6 +1013,19 @@
       <compilerarg value="${gluegen.root.abs-path}/make/stub_includes/platform/glibc-compat-symbols.h" />
     </compiler>
 
+    <compiler id="compiler.cfg.linux.aarch64" name="${gcc.compat.compiler}">
+      <defineset>
+        <define name="__unix__"/>
+        <define name="__X11__"  if="isX11"/>
+        <define name="_DEBUG"   if="c.compiler.use-debug"/>        
+        <define name="DEBUG"    if="c.compiler.use-debug"/>        
+        <define name="NDEBUG"   unless="c.compiler.use-debug"/>        
+      </defineset>
+      <compilerarg value="-fpic" /> 
+      <compilerarg value="-include"/>
+      <compilerarg value="${gluegen.root.abs-path}/make/stub_includes/platform/glibc-compat-symbols.h" />
+    </compiler>
+
     <compiler id="compiler.cfg.android" name="${gcc.compat.compiler}">
         <!-- shall be defined in custom ${gluegen-cpptasks.file} ! -->
     </compiler>
@@ -1188,6 +1237,13 @@
       <linkerarg value="-static-libgcc" if="isGCC"/>
     </linker>
 
+    <linker id="linker.cfg.linux.aarch64" name="${gcc.compat.compiler}">
+      <linkerarg value="-fpic" /> 
+      <linkerarg value="-nostdlib" />
+      <linkerarg value="-Bdynamic" />
+      <linkerarg value="-static-libgcc" if="isGCC"/>
+    </linker>
+
     <linker id="linker.cfg.linux.alpha" name="${gcc.compat.compiler}">
     </linker>
 
@@ -1390,6 +1446,13 @@
       <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/arm" />
     </target>
 
+    <target name="gluegen.cpptasks.declare.compiler.linux.aarch64" if="isLinuxARM64">
+      <echo message="Linux.aarch64" />
+      <property name="compiler.cfg.id.base"          value="compiler.cfg.linux.aarch64" /> 
+      <property name="linker.cfg.id.base"            value="linker.cfg.linux.aarch64" /> 
+      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/arm" />
+    </target>
+
     <target name="gluegen.cpptasks.declare.compiler.linux.ia64" if="isLinuxIA64">
       <echo message="Linux.IA64" />
       <property name="compiler.cfg.id.base"          value="compiler.cfg.linux" /> 
@@ -1446,7 +1509,7 @@
       <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/sparc" />
     </target>
 
-    <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux">
+    <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.aarch64,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux">
         <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
     </target>
 
-- 
cgit v1.2.3