Merge pull request jruby#9287 from trocedge/master

Add riscv64 platform support

Author: headius

core/src/main/java/org/jruby/ext/ffi/Platform.java

@@ -92,6 +92,7 @@ public enum CPU_TYPE {
         ARM,
         AARCH64,
         LOONGARCH64,
+        RISCV64,
         UNKNOWN;
         @Override
         public String toString() { return name().toLowerCase(LOCALE); }
@@ -157,6 +158,8 @@ private static final CPU_TYPE determineCPU() {
             return CPU.AARCH64;
         } else if ("loongarch64".equals(archString)) {
             return CPU.LOONGARCH64;
+        } else if ("riscv64".equals(archString)) {
+            return CPU.RISCV64;
 	} else if ("universal".equals(archString)) {
             // OS X OpenJDK7 builds report "universal" right now
             String bits = SafePropertyAccessor.getProperty("sun.arch.data.model");
@@ -217,6 +220,7 @@ private static int determineArchDataModel() {
                 case S390X:
                 case AARCH64:
                 case LOONGARCH64:
+                case RISCV64:
                     dataModel = 64;
                     break;
                 default:

core/src/main/java/org/jruby/ext/rbconfig/RbConfigLibrary.java

@@ -113,6 +113,7 @@ public static String getArchitecture() {
         if ("amd64".equals(architecture)) architecture = "x86_64";
         if ("aarch64".equals(architecture) && Platform.IS_MAC) architecture = "arm64";
         if ("loongarch64".equals(architecture)) architecture = "loongarch64";
+        if ("riscv64".equals(architecture)) architecture = "riscv64";
 
         return architecture;
     }

install/jruby.install4j

@@ -83,6 +83,7 @@
           <entry location="lib/jni/i386-FreeBSD" />
           <entry location="lib/jni/i386-OpenBSD" />
           <entry location="lib/jni/loongarch64-Linux" />
+          <entry location="lib/jni/riscv64-Linux" />
           <entry location="lib/jni/ppc-AIX" />
           <entry location="lib/jni/ppc64-Linux" />
           <entry location="lib/jni/ppc64le-Linux" />
@@ -108,6 +109,7 @@
           <entry location="lib/jni/i386-SunOS" />
           <entry location="lib/jni/i386-Windows" />
           <entry location="lib/jni/loongarch64-Linux" />
+          <entry location="lib/jni/riscv64-Linux" />
           <entry location="lib/jni/ppc64-Linux" />
           <entry location="lib/jni/ppc64le-Linux" />
           <entry location="lib/jni/ppc-AIX" />

spec/ffi/fixtures/compile.rb

@@ -20,6 +20,8 @@ module TestLibrary
       "x86_64"
     when /loongarch64/
       "loongarch64"
+    when /riscv64/
+      "riscv64"
     when /ppc64|powerpc64/
       "powerpc64"
     when /ppc|powerpc/