From 2ff63885c621eca540406a955cac0c55a4e337a7 Mon Sep 17 00:00:00 2001 From: Tom J Date: Sun, 9 Dec 2018 12:25:46 +0000 Subject: [PATCH 1/2] Platform.determineCPU to recognize armv7l as 32bit see #57 --- src/main/java/com/kenai/jffi/Platform.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/kenai/jffi/Platform.java b/src/main/java/com/kenai/jffi/Platform.java index 84473695..8b298d0f 100644 --- a/src/main/java/com/kenai/jffi/Platform.java +++ b/src/main/java/com/kenai/jffi/Platform.java @@ -225,7 +225,7 @@ private static CPU determineCPU() { } else if (Util.equalsIgnoreCase("s390", archString, LOCALE) || Util.equalsIgnoreCase("s390x", archString, LOCALE)) { return CPU.S390X; - } else if (Util.equalsIgnoreCase("arm", archString, LOCALE)) { + } else if (Util.equalsIgnoreCase("arm", archString, LOCALE) || Util.equalsIgnoreCase("armv7l", archString, LOCALE)) { return CPU.ARM; } else if (Util.equalsIgnoreCase("aarch64", archString, LOCALE)) { From 20782a569c966ef9d1fc1bc1fb833e40d04c93b9 Mon Sep 17 00:00:00 2001 From: Tom J Date: Sun, 9 Dec 2018 12:33:06 +0000 Subject: [PATCH 2/2] StubLoader.determineCPU to recognize armv7l https://github.com/jnr/jffi/issues/57 --- src/main/java/com/kenai/jffi/internal/StubLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/kenai/jffi/internal/StubLoader.java b/src/main/java/com/kenai/jffi/internal/StubLoader.java index 71dbdfc3..26e11da5 100644 --- a/src/main/java/com/kenai/jffi/internal/StubLoader.java +++ b/src/main/java/com/kenai/jffi/internal/StubLoader.java @@ -180,7 +180,7 @@ private static CPU determineCPU() { return CPU.PPC64LE; } else if (equalsIgnoreCase("s390", archString, LOCALE) || equalsIgnoreCase("s390x", archString, LOCALE)) { return CPU.S390X; - } else if (Util.equalsIgnoreCase("arm", archString, LOCALE)) { + } else if (Util.equalsIgnoreCase("arm", archString, LOCALE) || Util.equalsIgnoreCase("armv7l", archString, LOCALE)) { return CPU.ARM; } else if (Util.equalsIgnoreCase("aarch64", archString, LOCALE)) { return CPU.AARCH64;