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
---
 src/java/jogamp/common/os/MachineDescriptionRuntime.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/java/jogamp/common/os/MachineDescriptionRuntime.java')

diff --git a/src/java/jogamp/common/os/MachineDescriptionRuntime.java b/src/java/jogamp/common/os/MachineDescriptionRuntime.java
index e62c914..c45aeb7 100644
--- a/src/java/jogamp/common/os/MachineDescriptionRuntime.java
+++ b/src/java/jogamp/common/os/MachineDescriptionRuntime.java
@@ -82,6 +82,8 @@ public class MachineDescriptionRuntime {
         case PPC:
             return true;
         case X86_64:
+        case ARM64:
+        case ARMv8_A:
         case IA64:
         case SPARCV9_64:
         case PA_RISC2_0:
@@ -107,7 +109,9 @@ public class MachineDescriptionRuntime {
           }
           return StaticConfig.X86_32_UNIX;
       } else {
-          if( osType == Platform.OSType.WINDOWS ) {
+          if( cpuType.getFamily() == Platform.CPUFamily.ARM && littleEndian) {
+              return StaticConfig.X86_64_UNIX;
+          } else if( osType == Platform.OSType.WINDOWS ) {
               return StaticConfig.X86_64_WINDOWS;
           }
           return StaticConfig.X86_64_UNIX;
-- 
cgit v1.2.3