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

3 files changed, 3 insertions, 3 deletions

diff --git a/src/java/com/jogamp/gluegen/JavaEmitter.java b/src/java/com/jogamp/gluegen/JavaEmitter.java
index 93ef696..7e5ce51 100644
--- a/src/java/com/jogamp/gluegen/JavaEmitter.java
+++ b/src/java/com/jogamp/gluegen/JavaEmitter.java
@@ -100,7 +100,7 @@ public class JavaEmitter implements GlueEmitter {
   private PrintWriter javaWriter; // Emits either interface or, in AllStatic mode, everything
   private PrintWriter javaImplWriter; // Only used in non-AllStatic modes for impl class
   private PrintWriter cWriter;
-  private final MachineDescription machDescJava = MachineDescription.StaticConfig.X86_64_UNIX.md;
+  private final MachineDescription machDescJava = MachineDescription.StaticConfig.LP64_UNIX.md;
   private final MachineDescription.StaticConfig[] machDescTargetConfigs = MachineDescription.StaticConfig.values();
 
   protected final static Logger LOG = Logger.getLogger(JavaEmitter.class.getPackage().getName());
diff --git a/src/java/com/jogamp/gluegen/cgram/types/StructLayout.java b/src/java/com/jogamp/gluegen/cgram/types/StructLayout.java
index e3ed7c2..9d1a293 100644
--- a/src/java/com/jogamp/gluegen/cgram/types/StructLayout.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/StructLayout.java
@@ -69,7 +69,7 @@ public class StructLayout {
 
     final MachineDescription dbgMD;
     if( GlueGen.debug() ) {
-        dbgMD = MachineDescription.StaticConfig.X86_64_UNIX.md;
+        dbgMD = MachineDescription.StaticConfig.LP64_UNIX.md;
         System.err.printf("SL.__: o %03d, s %03d, t %s{%d}%n", curOffset.computeSize(dbgMD), 0, t, t.getNumFields());
     } else {
         dbgMD = null;
diff --git a/src/java/com/jogamp/gluegen/cgram/types/Type.java b/src/java/com/jogamp/gluegen/cgram/types/Type.java
index 32f48a6..63890a1 100644
--- a/src/java/com/jogamp/gluegen/cgram/types/Type.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/Type.java
@@ -112,7 +112,7 @@ public abstract class Type implements Cloneable {
         {
             long _mdSize = -1;
             try {
-                _mdSize = size.computeSize(MachineDescription.StaticConfig.X86_64_UNIX.md);
+                _mdSize = size.computeSize(MachineDescription.StaticConfig.LP64_UNIX.md);
             } catch (final Exception e) {}
             mdSize = _mdSize;
         }