Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Platform.determineCPU to recognize armv7l as 32bit #59

Merged
merged 2 commits into from
Dec 28, 2018
Merged

Platform.determineCPU to recognize armv7l as 32bit #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ff6388
Platform.determineCPU to recognize armv7l as 32bit
Dec 9, 2018
20782a5
StubLoader.determineCPU to recognize armv7l
Dec 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/kenai/jffi/Platform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/kenai/jffi/internal/StubLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down