Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 98f78148c89a
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e06bd07096e9
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 28, 2017

  1. Add AARCH64 support in FFI

    @yuqilinaro
    yuqilinaro committed Mar 28, 2017
    Copy the full SHA
    fe4fa8a View commit details

Commits on Apr 6, 2017

  1. use spaces instead of tab

    @yuqilinaro
    yuqilinaro authored Apr 6, 2017
    Copy the full SHA
    fa7b4c8 View commit details

Commits on Apr 19, 2017

  1. Merge pull request #4548 from yuqilinaro/aarch64 

    Add AARCH64 support in FFI
    @headius
    headius authored Apr 19, 2017
    Copy the full SHA
    e06bd07 View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 core/src/main/java/org/jruby/ext/ffi/Platform.java
4 changes: 4 additions & 0 deletions core/src/main/java/org/jruby/ext/ffi/Platform.java
View file
Original file line number Diff line number Diff line change
@@ -84,6 +84,7 @@ public enum CPU_TYPE {
SPARCV9,
S390X,
ARM,
AARCH64,
UNKNOWN;
@Override
public String toString() { return name().toLowerCase(LOCALE); }
@@ -145,6 +146,8 @@ private static final CPU_TYPE determineCPU() {
return CPU.S390X;
} else if ("arm".equals(archString)) {
return CPU.ARM;
} else if ("aarch64".equals(archString)) {
return CPU.AARCH64;
} else if ("universal".equals(archString)) {
// OS X OpenJDK7 builds report "universal" right now
String bits = SafePropertyAccessor.getProperty("sun.arch.data.model");
@@ -203,6 +206,7 @@ protected Platform(OS_TYPE os) {
case POWERPC64LE:
case SPARCV9:
case S390X:
case AARCH64:
dataModel = 64;
break;
default: