Merge branch 'master' of github.com:ffi/ffi

ffi · Jul 17, 2020 · d15fa06 · d15fa06
2 parents dc35a8f + 3c35515
commit d15fa06
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/lib/ffi/platform.rb b/lib/ffi/platform.rb
@@ -71,13 +71,12 @@ module Platform
       "powerpc"
     when /sparcv9|sparc64/
       "sparcv9"
+    when /arm64|aarch64/  # MacOS calls it "arm64", other operating systems "aarch64"
+      "aarch64"
+    when /^arm/
+      "arm"
     else
-      case RbConfig::CONFIG['host_cpu']
-      when /^arm/
-        "arm"
-      else
-        RbConfig::CONFIG['host_cpu']
-      end
+      RbConfig::CONFIG['host_cpu']
     end
 
     private

diff --git a/spec/ffi/fork_spec.rb b/spec/ffi/fork_spec.rb
@@ -5,8 +5,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
 
-# Skip platforms that don't implement Process.fork
-unless RUBY_ENGINE == "truffleruby" or FFI::Platform.windows?
+if Process.respond_to?(:fork)
   describe "Callback in conjunction with fork()" do
 
     module LibTest