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

matthiasblaesing · matthiasblaesing · commit 4bc4b884f02d · 2019-09-20T22:57:12.000+02:00
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() {

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,8 @@ public static final boolean is64Bit() {`
`194`	`194`	`\|\| "ppc64".equals(ARCH) \|\| "ppc64le".equals(ARCH)`
`195`	`195`	`\|\| "sparcv9".equals(ARCH)`
`196`	`196`	`\|\| "mips64".equals(ARCH) \|\| "mips64el".equals(ARCH)`
`197`		`- \|\| "amd64".equals(ARCH)) {`
	`197`	`+ \|\| "amd64".equals(ARCH)`
	`198`	`+ \|\| "aarch64".equals(ARCH)) {`
`198`	`199`	`return true;`
`199`	`200`	`}`
`200`	`201`	`return Native.POINTER_SIZE == 8;`
`@@ -215,7 +216,7 @@ public static final boolean isPPC() {`
`215`	`216`	`}`
`216`	`217`
`217`	`218`	`public static final boolean isARM() {`
`218`		`- return ARCH.startsWith("arm");`
	`219`	`+ return ARCH.startsWith("arm") \|\| ARCH.startsWith("aarch");`
`219`	`220`	`}`
`220`	`221`
`221`	`222`	`public static final boolean isSPARC() {`