Detect aarch64 as ARM and report it as a 64 bit architecture

java-native-access · Sep 20, 2019 · 4bc4b88 · 4bc4b88
1 parent 6665319
commit 4bc4b88
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/com/sun/jna/Platform.java b/src/com/sun/jna/Platform.java
@@ -194,7 +194,8 @@ public static final boolean is64Bit() {
             || "ppc64".equals(ARCH) || "ppc64le".equals(ARCH)
             || "sparcv9".equals(ARCH)
             || "mips64".equals(ARCH) || "mips64el".equals(ARCH)
-            || "amd64".equals(ARCH)) {
+            || "amd64".equals(ARCH)
+            || "aarch64".equals(ARCH)) {
             return true;
         }
         return Native.POINTER_SIZE == 8;
@@ -215,7 +216,7 @@ public static final boolean isPPC() {
     }
 
     public static final boolean isARM() {
-        return ARCH.startsWith("arm");
+        return ARCH.startsWith("arm") || ARCH.startsWith("aarch");
     }
 
     public static final boolean isSPARC() {