ffi 1.12.2 → 1.14.2

data/ext/ffi_c/StructLayout.c

@@ -32,12 +32,9 @@
 
 #ifndef _MSC_VER
 # include <sys/param.h>
-# include <stdint.h>
-# include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-# include "win32/stdint.h"
 #endif
+#include <stdint.h>
+#include <stdbool.h>
 #include <ruby.h>
 #include "rbffi.h"
 #include "compat.h"
@@ -350,8 +347,13 @@ array_field_put(VALUE self, VALUE pointer, VALUE value)
         argv[0] = INT2FIX(f->offset);
         argv[1] = value;
 
-        rb_funcall2(pointer, rb_intern("put_string"), 2, argv);
-
+        if (RSTRING_LEN(value) < array->length) {
+            rb_funcall2(pointer, rb_intern("put_string"), 2, argv);
+        } else if (RSTRING_LEN(value) == array->length) {
+            rb_funcall2(pointer, rb_intern("put_bytes"), 2, argv);
+        } else {
+            rb_raise(rb_eIndexError, "String is longer (%ld bytes) than the char array (%d bytes)", RSTRING_LEN(value), array->length);
+        }
     } else {
 #ifdef notyet
         MemoryOp* op;

data/ext/ffi_c/Thread.c

@@ -28,12 +28,7 @@
  */
 
 #include <stddef.h>
-#ifndef _MSC_VER
 #include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-# include "win32/stdint.h"
-#endif
 
 #if defined(__CYGWIN__) || !defined(_WIN32)
 # include <pthread.h>
@@ -74,9 +69,6 @@ void
 rbffi_frame_push(rbffi_frame_t* frame)
 {
     memset(frame, 0, sizeof(*frame));
-#ifndef HAVE_RUBY_THREAD_HAS_GVL_P
-    frame->has_gvl = true;
-#endif
     frame->exc = Qnil;
 
 #ifdef _WIN32

data/ext/ffi_c/Thread.h

@@ -30,12 +30,7 @@
 #ifndef RBFFI_THREAD_H
 #define	RBFFI_THREAD_H
 
-#ifndef _MSC_VER
-# include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-# include "win32/stdint.h"
-#endif
+#include <stdbool.h>
 #include <ruby.h>
 #include "extconf.h"
 
@@ -66,9 +61,6 @@ typedef struct rbffi_frame {
     struct thread_data* td;
 #endif
     struct rbffi_frame* prev;
-#ifndef HAVE_RUBY_THREAD_HAS_GVL_P
-    bool has_gvl;
-#endif
     VALUE exc;
 } rbffi_frame_t;
 

data/ext/ffi_c/Type.c

@@ -28,7 +28,7 @@
  */
 
 #ifndef _MSC_VER
-#include <sys/param.h>
+# include <sys/param.h>
 #endif
 
 #include <sys/types.h>

data/ext/ffi_c/Variadic.c

@@ -33,13 +33,8 @@
 #include <sys/types.h>
 
 #include <stdio.h>
-#ifndef _MSC_VER
-# include <stdint.h>
-# include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-# include "win32/stdint.h"
-#endif
+#include <stdint.h>
+#include <stdbool.h>
 #include <ruby.h>
 
 #include <ffi.h>

data/ext/ffi_c/compat.h

@@ -64,6 +64,10 @@
 #  define unlikely(x) (x)
 #endif
 
+#ifdef _MSC_VER
+#define ffi_type_longdouble ffi_type_double
+#endif
+
 #ifndef MAX
 #  define MAX(a, b) ((a) < (b) ? (b) : (a))
 #endif

data/ext/ffi_c/extconf.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
+if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
   require 'mkmf'
   require 'rbconfig'
 
@@ -8,14 +8,22 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
     # We need pkg_config or ffi.h
     libffi_ok = pkg_config("libffi") ||
         have_header("ffi.h") ||
-        find_header("ffi.h", "/usr/local/include", "/usr/include/ffi")
+        find_header("ffi.h", "/usr/local/include", "/usr/include/ffi",
+                    "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi",
+                    "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/ffi") ||
+        (find_header("ffi.h", `xcrun --sdk macosx --show-sdk-path`.strip + "/usr/include/ffi") rescue false)
 
-    # Ensure we can link to ffi_call
-    libffi_ok &&= have_library("ffi", "ffi_call", [ "ffi.h" ]) ||
-                  have_library("libffi", "ffi_call", [ "ffi.h" ])
+    # Ensure we can link to ffi_prep_closure_loc
+    libffi_ok &&= have_library("ffi", "ffi_prep_closure_loc", [ "ffi.h" ]) ||
+                  have_library("libffi", "ffi_prep_closure_loc", [ "ffi.h" ]) ||
+                  have_library("libffi-8", "ffi_prep_closure_loc", [ "ffi.h" ])
 
-    # And we need a libffi version recent enough to provide ffi_closure_alloc
-    libffi_ok &&= have_func("ffi_closure_alloc")
+    if RbConfig::CONFIG['host_os'] =~ /mswin/
+      have_library('libffi_convenience')
+      have_library('shlwapi')
+    end
+
+    libffi_ok
   end
 
   dir_config("ffi_c")
@@ -36,40 +44,42 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
     abort "system libffi is not usable" unless system_libffi_usable?
   end
 
-  have_header('shlwapi.h')
-  have_func('rb_thread_call_without_gvl') || abort("Ruby C-API function `rb_thread_call_without_gvl` is missing")
-  have_func('ruby_native_thread_p')
-  if RUBY_VERSION >= "2.3.0"
-    # On OSX and Linux ruby_thread_has_gvl_p() is detected but fails at runtime for ruby < 2.3.0
-    have_func('ruby_thread_has_gvl_p')
-  end
-
   if system_libffi
     have_func('ffi_prep_cif_var')
     $defs << "-DHAVE_RAW_API" if have_func("ffi_raw_call") && have_func("ffi_prep_raw_closure")
   else
     $defs << "-DHAVE_FFI_PREP_CIF_VAR"
     $defs << "-DUSE_INTERNAL_LIBFFI"
+
+    # Ensure libffi symbols aren't exported when using static libffi.
+    # This is to avoid interference with other gems like fiddle.
+    # See https://github.com/ffi/ffi/issues/835
+    append_ldflags "-Wl,--exclude-libs,ALL"
+  end
+
+  ffi_alloc_default = RbConfig::CONFIG['host_os'] =~ /darwin/i && RbConfig::CONFIG['host'] =~ /arm/i
+  if enable_config('libffi-alloc', ffi_alloc_default)
+    $defs << "-DUSE_FFI_ALLOC"
   end
 
   $defs << "-DHAVE_EXTCONF_H" if $defs.empty? # needed so create_header works
-  $defs << "-DFFI_BUILDING" if RbConfig::CONFIG['host_os'] =~ /mswin/ # for compatibility with newer libffi
 
   create_header
-
-  $LOCAL_LIBS << " ./libffi/.libs/libffi_convenience.lib" if !system_libffi && RbConfig::CONFIG['host_os'] =~ /mswin/
-
   create_makefile("ffi_c")
+
   unless system_libffi
     File.open("Makefile", "a") do |mf|
       mf.puts "LIBFFI_HOST=--host=#{RbConfig::CONFIG['host_alias']}" if RbConfig::CONFIG.has_key?("host_alias")
-      if RbConfig::CONFIG['host_os'].downcase =~ /darwin/
+      if RbConfig::CONFIG['host_os'] =~ /darwin/i
+        if RbConfig::CONFIG['host'] =~ /arm/i
+          mf.puts "LIBFFI_HOST=--host=aarch64-apple-#{RbConfig::CONFIG['host_os']}"
+        end
         mf.puts "include ${srcdir}/libffi.darwin.mk"
-      elsif RbConfig::CONFIG['host_os'].downcase =~ /bsd/
+      elsif RbConfig::CONFIG['host_os'] =~ /bsd/i
         mf.puts '.include "${srcdir}/libffi.bsd.mk"'
-      elsif RbConfig::CONFIG['host_os'].downcase =~ /mswin64/
+      elsif RbConfig::CONFIG['host_os'] =~ /mswin64/i
         mf.puts '!include $(srcdir)/libffi.vc64.mk'
-      elsif RbConfig::CONFIG['host_os'].downcase =~ /mswin32/
+      elsif RbConfig::CONFIG['host_os'] =~ /mswin32/i
         mf.puts '!include $(srcdir)/libffi.vc.mk'
       else
         mf.puts "include ${srcdir}/libffi.mk"

data/ext/ffi_c/libffi/.travis.yml

@@ -39,6 +39,10 @@ matrix:
     - os: linux
       arch: arm64
       env: HOST=aarch64-linux-gnu
+    - os: linux
+      arch: arm64
+      env: HOST=aarch64-linux-gnu
+      compiler: clang
     - os: linux
       env: HOST=arm32v7-linux-gnu LIBFFI_TEST_OPTIMIZATION="-O0"
     - os: linux

data/ext/ffi_c/libffi/.travis/bfin-sim.exp

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, MA 02110, USA.
 
 # This is a list of toolchains that are supported on this board.
 set_board_info target_install {bfin-elf}

data/ext/ffi_c/libffi/.travis/build.sh

@@ -2,6 +2,10 @@
 
 set -x
 
+# This is a policy bound API key.  It can only be used with
+# https://github.com/libffi/rlgl-policy.git.
+RLGL_KEY=0LIBFFI-0LIBFFI-0LIBFFI-0LIBFFI
+
 if [ -z ${QEMU_CPU+x} ]; then
     export SET_QEMU_CPU=
 else

data/ext/ffi_c/libffi/.travis/m32r-sim.exp

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, MA 02110, USA.
 
 # This is a list of toolchains that are supported on this board.
 set_board_info target_install {m32r-elf}

data/ext/ffi_c/libffi/.travis/moxie-sim.exp

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, MA 02110, USA.
 
 # This is a list of toolchains that are supported on this board.
 set_board_info target_install {moxie-elf}

data/ext/ffi_c/libffi/.travis/or1k-sim.exp

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, MA 02110, USA.
 
 # This is a list of toolchains that are supported on this board.
 set_board_info target_install {or1k-elf}

data/ext/ffi_c/libffi/.travis/powerpc-eabisim.exp

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, MA 02110, USA.
 
 # This is a list of toolchains that are supported on this board.
 set_board_info target_install {powerpc-eabisim}

data/ext/ffi_c/libffi/.travis/wine-sim.exp

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, MA 02110, USA.
 
 # This is a list of toolchains that are supported on this board.
 set_board_info target_install {i686-w64-mingw32}

data/ext/ffi_c/libffi/Makefile.am

@@ -44,65 +44,55 @@ if FFI_DEBUG
 libffi_la_SOURCES += src/debug.c
 endif
 
-noinst_HEADERS = \
-	src/aarch64/ffitarget.h src/aarch64/internal.h			\
+noinst_HEADERS = src/aarch64/ffitarget.h src/aarch64/internal.h		\
 	src/alpha/ffitarget.h src/alpha/internal.h			\
-	src/arc/ffitarget.h						\
-	src/arm/ffitarget.h src/arm/internal.h				\
-	src/avr32/ffitarget.h						\
-	src/bfin/ffitarget.h						\
-	src/cris/ffitarget.h						\
-	src/frv/ffitarget.h						\
+	src/arc/ffitarget.h src/arm/ffitarget.h src/arm/internal.h	\
+	src/avr32/ffitarget.h src/bfin/ffitarget.h			\
+	src/cris/ffitarget.h src/csky/ffitarget.h src/frv/ffitarget.h	\
 	src/ia64/ffitarget.h src/ia64/ia64_flags.h			\
-	src/m32r/ffitarget.h						\
-	src/m68k/ffitarget.h						\
-	src/m88k/ffitarget.h						\
-	src/metag/ffitarget.h						\
-	src/microblaze/ffitarget.h					\
-	src/mips/ffitarget.h						\
-	src/moxie/ffitarget.h						\
-	src/nios2/ffitarget.h						\
-	src/or1k/ffitarget.h						\
-	src/pa/ffitarget.h						\
-	src/powerpc/ffitarget.h src/powerpc/asm.h src/powerpc/ffi_powerpc.h \
-	src/riscv/ffitarget.h						\
-	src/s390/ffitarget.h src/s390/internal.h			\
-	src/sh/ffitarget.h						\
-	src/sh64/ffitarget.h						\
-	src/sparc/ffitarget.h src/sparc/internal.h			\
-	src/tile/ffitarget.h						\
-	src/vax/ffitarget.h						\
-	src/x86/ffitarget.h src/x86/internal.h src/x86/internal64.h src/x86/asmnames.h \
-	src/xtensa/ffitarget.h						\
-	src/dlmalloc.c
-
-EXTRA_libffi_la_SOURCES = src/aarch64/ffi.c src/aarch64/sysv.S \
-	src/aarch64/win64_armasm.S src/alpha/ffi.c src/alpha/osf.S \
-	src/arc/ffi.c src/arc/arcompact.S src/arm/ffi.c	\
-	src/arm/sysv.S src/arm/ffi.c src/arm/sysv_msvc_arm32.S \
-	src/avr32/ffi.c src/avr32/sysv.S src/bfin/ffi.c	\
-	src/bfin/sysv.S src/cris/ffi.c src/cris/sysv.S src/frv/ffi.c \
-	src/frv/eabi.S src/ia64/ffi.c src/ia64/unix.S src/m32r/ffi.c \
-	src/m32r/sysv.S src/m68k/ffi.c src/m68k/sysv.S src/m88k/ffi.c \
-	src/m88k/obsd.S src/metag/ffi.c src/metag/sysv.S \
-	src/microblaze/ffi.c src/microblaze/sysv.S src/mips/ffi.c \
-	src/mips/o32.S src/mips/n32.S src/moxie/ffi.c \
-	src/moxie/eabi.S src/nios2/ffi.c src/nios2/sysv.S \
-	src/or1k/ffi.c src/or1k/sysv.S src/pa/ffi.c src/pa/linux.S \
-	src/pa/hpux32.S src/powerpc/ffi.c src/powerpc/ffi_sysv.c \
-	src/powerpc/ffi_linux64.c src/powerpc/sysv.S \
-	src/powerpc/linux64.S src/powerpc/linux64_closure.S \
-	src/powerpc/ppc_closure.S src/powerpc/aix.S \
-	src/powerpc/darwin.S src/powerpc/aix_closure.S \
-	src/powerpc/darwin_closure.S src/powerpc/ffi_darwin.c \
-	src/riscv/ffi.c src/riscv/sysv.S src/s390/ffi.c	\
-	src/s390/sysv.S src/sh/ffi.c src/sh/sysv.S src/sh64/ffi.c \
-	src/sh64/sysv.S src/sparc/ffi.c src/sparc/ffi64.c \
-	src/sparc/v8.S src/sparc/v9.S src/tile/ffi.c src/tile/tile.S \
-	src/vax/ffi.c src/vax/elfbsd.S src/x86/ffi.c src/x86/sysv.S \
-	src/x86/ffiw64.c src/x86/win64.S src/x86/ffi64.c \
-	src/x86/unix64.S src/x86/sysv_intel.S src/x86/win64_intel.S \
-	src/xtensa/ffi.c src/xtensa/sysv.S
+	src/m32r/ffitarget.h src/m68k/ffitarget.h			\
+	src/m88k/ffitarget.h src/metag/ffitarget.h			\
+	src/microblaze/ffitarget.h src/mips/ffitarget.h			\
+	src/moxie/ffitarget.h src/nios2/ffitarget.h			\
+	src/or1k/ffitarget.h src/pa/ffitarget.h				\
+	src/powerpc/ffitarget.h src/powerpc/asm.h			\
+	src/powerpc/ffi_powerpc.h src/riscv/ffitarget.h			\
+	src/s390/ffitarget.h src/s390/internal.h src/sh/ffitarget.h	\
+	src/sh64/ffitarget.h src/sparc/ffitarget.h			\
+	src/sparc/internal.h src/tile/ffitarget.h src/vax/ffitarget.h	\
+	src/x86/ffitarget.h src/x86/internal.h src/x86/internal64.h	\
+	src/x86/asmnames.h src/xtensa/ffitarget.h src/dlmalloc.c	\
+	src/kvx/ffitarget.h
+
+EXTRA_libffi_la_SOURCES = src/aarch64/ffi.c src/aarch64/sysv.S		\
+	src/aarch64/win64_armasm.S src/alpha/ffi.c src/alpha/osf.S	\
+	src/arc/ffi.c src/arc/arcompact.S src/arm/ffi.c			\
+	src/arm/sysv.S src/arm/ffi.c src/arm/sysv_msvc_arm32.S		\
+	src/avr32/ffi.c src/avr32/sysv.S src/bfin/ffi.c			\
+	src/bfin/sysv.S src/cris/ffi.c src/cris/sysv.S src/frv/ffi.c	\
+	src/csky/ffi.c src/csky/sysv.S src/frv/eabi.S src/ia64/ffi.c	\
+	src/ia64/unix.S src/m32r/ffi.c src/m32r/sysv.S src/m68k/ffi.c	\
+	src/m68k/sysv.S src/m88k/ffi.c src/m88k/obsd.S			\
+	src/metag/ffi.c src/metag/sysv.S src/microblaze/ffi.c		\
+	src/microblaze/sysv.S src/mips/ffi.c src/mips/o32.S		\
+	src/mips/n32.S src/moxie/ffi.c src/moxie/eabi.S			\
+	src/nios2/ffi.c src/nios2/sysv.S src/or1k/ffi.c			\
+	src/or1k/sysv.S src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S	\
+	src/powerpc/ffi.c src/powerpc/ffi_sysv.c			\
+	src/powerpc/ffi_linux64.c src/powerpc/sysv.S			\
+	src/powerpc/linux64.S src/powerpc/linux64_closure.S		\
+	src/powerpc/ppc_closure.S src/powerpc/aix.S			\
+	src/powerpc/darwin.S src/powerpc/aix_closure.S			\
+	src/powerpc/darwin_closure.S src/powerpc/ffi_darwin.c		\
+	src/riscv/ffi.c src/riscv/sysv.S src/s390/ffi.c			\
+	src/s390/sysv.S src/sh/ffi.c src/sh/sysv.S src/sh64/ffi.c	\
+	src/sh64/sysv.S src/sparc/ffi.c src/sparc/ffi64.c		\
+	src/sparc/v8.S src/sparc/v9.S src/tile/ffi.c src/tile/tile.S	\
+	src/vax/ffi.c src/vax/elfbsd.S src/x86/ffi.c src/x86/sysv.S	\
+	src/x86/ffiw64.c src/x86/win64.S src/x86/ffi64.c		\
+	src/x86/unix64.S src/x86/sysv_intel.S src/x86/win64_intel.S	\
+	src/xtensa/ffi.c src/xtensa/sysv.S src/kvx/ffi.c		\
+	src/kvx/sysv.S
 
 TARGET_OBJ = @TARGET_OBJ@
 libffi_la_LIBADD = $(TARGET_OBJ)
@@ -144,7 +134,8 @@ endif
 libffi_version_info = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
 
 libffi.map: $(top_srcdir)/libffi.map.in
-	$(COMPILE) -D$(TARGET) -E -x assembler-with-cpp -o $@ $<
+	$(COMPILE) -D$(TARGET) -DGENERATE_LIBFFI_MAP \
+	 -E -x assembler-with-cpp -o $@ $(top_srcdir)/libffi.map.in
 
 libffi_la_LDFLAGS = -no-undefined $(libffi_version_info) $(libffi_version_script) $(LTLDFLAGS) $(AM_LTLDFLAGS)
 libffi_la_DEPENDENCIES = $(libffi_la_LIBADD) $(libffi_version_dep)

data/ext/ffi_c/libffi/README.md

@@ -4,7 +4,7 @@ Status
 [![Build Status](https://travis-ci.org/libffi/libffi.svg?branch=master)](https://travis-ci.org/libffi/libffi)
 [![Build status](https://ci.appveyor.com/api/projects/status/8lko9vagbx4w2kxq?svg=true)](https://ci.appveyor.com/project/atgreen/libffi)
 
-libffi-3.3 was released on November 23, 2019.  Check the libffi web
+libffi-3.4 was released on TBD.  Check the libffi web
 page for updates: <URL:http://sourceware.org/libffi/>.
 
 
@@ -60,7 +60,9 @@ tested:
 | ARM             | Windows          | MSVC                    |
 | AVR32           | Linux            | GCC                     |
 | Blackfin        | uClinux          | GCC                     |
+| CSKY            | Linux            | GCC                     |
 | HPPA            | HPUX             | GCC                     |
+| KVX             | Linux            | GCC                     |
 | IA-64           | Linux            | GCC                     |
 | M68K            | FreeMiNT         | GCC                     |
 | M68K            | Linux            | GCC                     |
@@ -196,6 +198,13 @@ History
 
 See the git log for details at http://github.com/libffi/libffi.
 
+    3.4 TBD
+    	Add support for Alibaba's CSKY architecture.
+        Add support for Intel Control-flow Enforcement Technology (CET).
+	Add support for ARM Pointer Authentication (PA).
+	Fix 32-bit PPC regression.
+	Fix MIPS soft-float problem.
+
     3.3 Nov-23-19
         Add RISC-V support.
         New API in support of GO closures.
@@ -428,6 +437,7 @@ developers:
     avr32               Bradley Smith
     blackfin            Alexandre Keunecke I. de Mendonca
     cris                Simon Posnjak, Hans-Peter Nilsson
+    csky		Ma Jun, Zhang Wenmeng
     frv                 Anthony Green
     ia64                Hans Boehm
     m32r                Kazuhiro Inaoka