From 0deceee37d943faa7c34971388863a27f395d6a5 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 30 Jan 2015 21:15:45 +0100 Subject: Bug 1122: Refine AArch64 and OSType/32Bit incl. MachineDescription Android: - Detect ABIType.EABI_GNU_ARMHF via 'armeabi-v7a-hard' Platform.CPUType: - contains is32Bit now MachineDescription: - Rename *x86_64_unix* -> *lp64_unix*, reflecting universal __LP64__ mode - Remove is32Bit, which is determined by CPUType --- src/java/com/jogamp/common/os/AndroidVersion.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'src/java/com/jogamp/common/os/AndroidVersion.java') diff --git a/src/java/com/jogamp/common/os/AndroidVersion.java b/src/java/com/jogamp/common/os/AndroidVersion.java index 0e30602..f727a47 100644 --- a/src/java/com/jogamp/common/os/AndroidVersion.java +++ b/src/java/com/jogamp/common/os/AndroidVersion.java @@ -91,7 +91,8 @@ public class AndroidVersion { } else if( cpuABI.equals("aarch64") || cpuABI.startsWith("arm64") ) { return CPUType.ARM64; - } else if( cpuABI.equals("armeabi-v7a") ) { + } else if( cpuABI.equals("armeabi-v7a") || + cpuABI.equals("armeabi-v7a-hard") ) { return CPUType.ARMv7; } else if( cpuABI.equals("armeabi") || cpuABI.startsWith("arm") ) { // last 32bit chance .. @@ -107,13 +108,18 @@ public class AndroidVersion { private static final ABIType getABITypeImpl(final CPUType cpuType, final String cpuABI) { if( null == cpuType || null == cpuABI ) { return null; - } else if( CPUFamily.ARM != cpuType.family ) { + } else if( CPUFamily.ARM == cpuType.family ) { + if( CPUType.ARM64 == cpuType || + CPUType.ARMv8_A == cpuType ) { + return ABIType.EABI_AARCH64; + } else if( cpuABI.equals("armeabi-v7a-hard") ) { + return ABIType.EABI_GNU_ARMHF; + } else { + return ABIType.EABI_GNU_ARMEL; + } + } else { return ABIType.GENERIC_ABI; - } else if( CPUType.ARM64 == cpuType || - CPUType.ARMv8_A == cpuType ) { - return ABIType.EABI_AARCH64; } - return ABIType.EABI_GNU_ARMEL; // FIXME: How will they name ABIType.EABI_GNU_ARMHF } static { -- cgit v1.2.3