ffi 1.9.23 → 1.9.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 286fc5e69721d659cb72bba4dbafc0a65ce8ddd3d85432eefe94c4f8fae78d6c
-  data.tar.gz: e1395b53a83cd497c8fe32176d029f0a5daf47de36a40390f6fadc2d478cc748
+  metadata.gz: 3c08414eed21b4a4c2dbb89687f9004a970ce2b997fc419566221ee01384e5eb
+  data.tar.gz: 4849cae15554e04a89322a7e1738b804be57f09e8606170803655c4804ba03a3
 SHA512:
-  metadata.gz: 5538683e786da7e3c4ec7665f9e1ca3cfdd6ec2df3aaf3529b008f3acaf39b840889fe8cbdc8f19ecc1ea979882508a4b4e284ec59d1dd43ef6d6fa7062ce4c3
-  data.tar.gz: b5cca527e86e49ac8e3d8d157a907f9601f68d1ccaf06fd922d7b3706ae1c5df4ff1539be2305fde2db7d357377530a76238082bd0f8577fe5d2b79a6936c8ed
+  metadata.gz: a4984c832d1358e61c05b50b936e6f757cb301202d441a686bbd2b2a963f77fd1371bfcb2644e75522ded093d0f9055843d28bf7593ef7f037c349cd443efab5
+  data.tar.gz: cae427a16110ac965beb4e999f9f5a8950a69f321a09d641343dfd2b3ec4f3fcd5ad428047f25e1b87800b4f0dd2827eb5cd143e51c50af9944ce2c0f38eb892

data/CHANGELOG.md

@@ -0,0 +1,66 @@
+1.9.24 / 2018-06-02
+-------------------
+
+Added:
+* Added a CHANGELOG file
+* Add mips64(eb) support, and mips r6 support. (#601)
+
+Changed:
+* Update libffi to latest changes on master.
+* Don't search in hardcoded /usr paths on Windows.
+* Don't treat Symbol args different to Strings in ffi_lib.
+* Make sure size_t is defined in Thread.c. Fixes #609
+
+
+1.9.23 / 2018-02-25
+-------------------
+
+Changed:
+* Fix unnecessary rebuild of configure in darwin multi arch. Fixes #605
+
+
+1.9.22 / 2018-02-22
+-------------------
+
+Changed:
+* Update libffi to latest changes on master.
+* Update detection of system libffi to match new requirements. Fixes #617
+* Prefer bundled libffi over system libffi on Mac OS.
+* Do closures via libffi. This removes ClosurePool and fixes compat with PaX. #540
+* Use a more deterministic gem packaging.
+* Fix unnecessary update of autoconf files at gem install.
+
+
+1.9.21 / 2018-02-06
+-------------------
+
+Added:
+* Ruby-2.5 support by Windows binary gems. Fixes #598
+* Add missing win64 types.
+* Added support for Bitmask. (#573)
+* Add support for MSYS2 (#572) and Sparc64 Linux. (#574)
+
+Changed:
+* Fix read_string to not throw an error on length 0.
+* Don't use absolute paths for sh and env. Fixes usage on Adroid #528
+* Use Ruby implementation for `which` for better compat with Windows. Fixes #315
+* Fix compatibility with PPC64LE platform. (#577)
+* Normalize sparc64 to sparcv9. (#575)
+
+Removed:
+* Drop Ruby 1.8.7 support (#480)
+
+
+1.9.18 / 2017-03-03
+-------------------
+
+Added:
+* Add compatibility with Ruby-2.4.
+
+Changed:
+* Add missing shlwapi.h include to fix Windows build.
+* Avoid undefined behaviour of LoadLibrary() on Windows. #553
+
+
+1.9.17 / 2017-01-13
+-------------------

data/Rakefile

@@ -161,7 +161,7 @@ namespace 'java' do
     s.homepage = gem_spec.homepage
     s.summary = gem_spec.summary
     s.description = gem_spec.description
-    s.files = %w(LICENSE COPYING README.md Rakefile)
+    s.files = %w(LICENSE COPYING README.md CHANGELOG.md Rakefile)
     s.has_rdoc = false
     s.license = gem_spec.license
     s.platform = 'java'

data/ext/ffi_c/Call.c

@@ -43,6 +43,9 @@
 #endif
 #include <errno.h>
 #include <ruby.h>
+#if defined(HAVE_RUBY_THREAD_H)
+#include <ruby/thread.h>
+#endif
 #if defined(HAVE_NATIVETHREAD) && (defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)) && !defined(_WIN32)
 #  include <signal.h>
 #  include <pthread.h>
@@ -317,7 +320,7 @@ rbffi_SetupCallParams(int argc, VALUE* argv, int paramCount, Type** paramTypes,
     }
 }
 
-static VALUE
+static void *
 call_blocking_function(void* data)
 {
     rbffi_blocking_call_t* b = (rbffi_blocking_call_t *) data;
@@ -325,7 +328,7 @@ call_blocking_function(void* data)
     ffi_call(&b->cif, FFI_FN(b->function), b->retval, b->ffiValues);
     b->frame->has_gvl = true;
 
-    return Qnil;
+    return NULL;
 }
 
 VALUE

data/ext/ffi_c/Function.c

@@ -47,6 +47,9 @@
 # endif
 #endif
 #include <ruby.h>
+#if defined(HAVE_RUBY_THREAD_H)
+#include <ruby/thread.h>
+#endif
 
 #include <ffi.h>
 #if defined(HAVE_NATIVETHREAD) && !defined(_WIN32)
@@ -554,7 +557,7 @@ struct async_wait {
     bool stop;
 };
 
-static VALUE async_cb_wait(void *);
+static void * async_cb_wait(void *);
 static void async_cb_stop(void *);
 
 #if defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
@@ -643,7 +646,7 @@ async_cb_event(void* unused)
 #endif
 
 #ifdef _WIN32
-static VALUE
+static void *
 async_cb_wait(void *data)
 {
     struct async_wait* w = (struct async_wait *) data;
@@ -665,7 +668,7 @@ async_cb_wait(void *data)
 
     LeaveCriticalSection(&async_cb_lock);
 
-    return Qnil;
+    return NULL;
 }
 
 static void
@@ -680,7 +683,7 @@ async_cb_stop(void *data)
 }
 
 #else
-static VALUE
+static void *
 async_cb_wait(void *data)
 {
     struct async_wait* w = (struct async_wait *) data;
@@ -700,7 +703,7 @@ async_cb_wait(void *data)
 
     pthread_mutex_unlock(&async_cb_mutex);
 
-    return Qnil;
+    return NULL;
 }
 
 static void

data/ext/ffi_c/Thread.c

@@ -27,6 +27,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <stddef.h>
 #ifndef _MSC_VER
 #include <stdbool.h>
 #else

data/ext/ffi_c/extconf.rb

@@ -26,6 +26,7 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
   end
 
   have_header('shlwapi.h')
+  have_header('ruby/thread.h') # for compat with ruby < 2.0
   have_func('rb_thread_blocking_region')
   have_func('rb_thread_call_with_gvl')
   have_func('rb_thread_call_without_gvl')

data/ext/ffi_c/libffi/.appveyor.yml

@@ -28,10 +28,10 @@ install:
           $env:HOST="x86-pc-windows"
         } Else {
           $env:VCVARS_PLATFORM="amd64"
-          $env:BUILD="x86_64-pc-cygwin"
-          $env:HOST="x86_64-pc-winnt"
+          $env:BUILD="x86_64-w64-cygwin"
+          $env:HOST="x86_64-w64-cygwin"
       }
-  - 'appveyor DownloadFile http://cygwin.com/setup-x86.exe -FileName setup.exe'
+  - 'appveyor DownloadFile https://cygwin.com/setup-x86.exe -FileName setup.exe'
   - 'setup.exe -qnNdO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_CACHE%" -P dejagnu >NUL'
   - '%CYG_ROOT%/bin/bash -lc "cygcheck -dc cygwin"'
   - ps: $env:VSCOMNTOOLS=(Get-Content ("env:VS" + "$env:VSVER" + "0COMNTOOLS"))
@@ -40,7 +40,9 @@ install:
 
 build_script:
   - c:\cygwin\bin\sh -lc "(cd $OLDPWD; ./autogen.sh;)"
-  - c:\cygwin\bin\sh -lc "(cd $OLDPWD; ./configure CC='/cygdrive/c/projects/libffi/msvcc.sh -m64' CXX='/cygdrive/c/projects/libffi/msvcc.sh -m64' LD=link CPP='cl -nologo -EP' --build=$BUILD --host=$HOST; cp src/x86/ffitarget.h include; make;)"
+  - c:\cygwin\bin\sh -lc "(cd $OLDPWD; ./configure CC='/cygdrive/c/projects/libffi/msvcc.sh -m64' CXX='/cygdrive/c/projects/libffi/msvcc.sh -m64' LD='link' CPP='cl -nologo -EP' CXXCPP='cl -nologo -EP' CPPFLAGS='-DFFI_BUILDING_DLL' AR='/cygdrive/c/projects/libffi/.travis/ar-lib lib' NM='dumpbin -symbols' STRIP=':' --build=$BUILD --host=$HOST;)"
+  - c:\cygwin\bin\sh -lc "(cd $OLDPWD; cp src/x86/ffitarget.h include; make; find .;)"
+  - c:\cygwin\bin\sh -lc "(cd $OLDPWD; cp `find . -name 'libffi-?.dll'` $HOST/testsuite/; make check; cat `find ./ -name libffi.log`)"
 
 # FIXME: "make check" currently fails.  It just looks like msvcc needs
 # to learn about -L and -l options.  If you add "make check; cat `find

data/ext/ffi_c/libffi/.github/issue_template.md

@@ -0,0 +1,10 @@
+## System Details
+
+<!--- What platform are you working with? eg. the output of config.guess -->
+<!--- Provide any toolchain details here. eg. compiler version -->
+
+## Problems Description
+
+<!--- Provide a description of the problem here -->
+<!--- If this is a configure-time problem, attach config.log -->
+<!--- If this is a testsuite problem, attach the relevant log output -->

data/ext/ffi_c/libffi/.gitignore

@@ -5,9 +5,11 @@
 .dirstamp
 *.la
 Makefile
+!testsuite/libffi.bhaible/Makefile
 Makefile.in
 aclocal.m4
 compile
+!.travis/compile
 configure
 depcomp
 doc/libffi.info

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

@@ -3,28 +3,32 @@ sudo: required
 
 language: cpp
 
-os:
-  - linux
-compiler:
-  - gcc
-  - clang
-env:
-  - CONFIGURE_OPTIONS=--disable-shared
-  - CONFIGURE_OPTIONS=
 matrix:
   include:
+    - os: osx
+      env: HOST=arm-apple-darwin
     - os: linux
       compiler: gcc
-      env: HOST=i386-pc-linux-gnu
+      env: HOST=i386-pc-linux-gnu MEVAL='export CC="$CC -m32" && CXX="$CXX -m32"'
+    - os: linux
+      compiler: gcc
+    - os: linux
+      compiler: gcc
+      env: CONFIGURE_OPTIONS=--disable-shared
+    - os: linux
+      compiler: clang
+    - os: linux
+      compiler: clang
+      env: CONFIGURE_OPTIONS=--disable-shared
+    - os: linux
+      env: HOST=moxie-elf MEVAL='export PATH=/opt/moxielogic/bin:$PATH && CC=moxie-elf-gcc && CXX=moxie-elf-g++' LDFLAGS=-Tsim.ld RUNTESTFLAGS="--target_board moxie-sim" DEJAGNU="$TRAVIS_BUILD_DIR/.travis/site.exp"
+
+before_install:
+  - if test x"$MEVAL" != x; then eval ${MEVAL}; fi
 
 install:
   - ./.travis/install.sh
 
 script:
-  - ./autogen.sh
-  - if test x"$HOST" = x"i386-pc-linux-gnu"; then CC="$CC -m32"; CXX="$CXX -m32"; fi
-  - ./configure ${HOST+--host=$HOST} ${CONFIGURE_OPTIONS}
-  - make
-  - make dist
-  - make check
-  - cat */testsuite/libffi.log
+  - if ! test x"$MEVAL" = x; then eval ${MEVAL}; fi
+  - ./.travis/build.sh

data/ext/ffi_c/libffi/.travis/ar-lib

@@ -0,0 +1,270 @@
+#! /bin/sh
+# Wrapper for Microsoft lib.exe
+
+me=ar-lib
+scriptversion=2012-03-01.08; # UTC
+
+# Copyright (C) 2010-2018 Free Software Foundation, Inc.
+# Written by Peter Rosin <peda@lysator.liu.se>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+
+# func_error message
+func_error ()
+{
+  echo "$me: $1" 1>&2
+  exit 1
+}
+
+file_conv=
+
+# func_file_conv build_file
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv in
+	mingw)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_at_file at_file operation archive
+# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE
+# for each of them.
+# When interpreting the content of the @FILE, do NOT use func_file_conv,
+# since the user would need to supply preconverted file names to
+# binutils ar, at least for MinGW.
+func_at_file ()
+{
+  operation=$2
+  archive=$3
+  at_file_contents=`cat "$1"`
+  eval set x "$at_file_contents"
+  shift
+
+  for member
+  do
+    $AR -NOLOGO $operation:"$member" "$archive" || exit $?
+  done
+}
+
+case $1 in
+  '')
+     func_error "no command.  Try '$0 --help' for more information."
+     ;;
+  -h | --h*)
+    cat <<EOF
+Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...]
+
+Members may be specified in a file named with @FILE.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "$me, version $scriptversion"
+    exit $?
+    ;;
+esac
+
+if test $# -lt 3; then
+  func_error "you must specify a program, an action and an archive"
+fi
+
+AR=$1
+shift
+while :
+do
+  if test $# -lt 2; then
+    func_error "you must specify a program, an action and an archive"
+  fi
+  case $1 in
+    -lib | -LIB \
+    | -ltcg | -LTCG \
+    | -machine* | -MACHINE* \
+    | -subsystem* | -SUBSYSTEM* \
+    | -verbose | -VERBOSE \
+    | -wx* | -WX* )
+      AR="$AR $1"
+      shift
+      ;;
+    *)
+      action=$1
+      shift
+      break
+      ;;
+  esac
+done
+orig_archive=$1
+shift
+func_file_conv "$orig_archive"
+archive=$file
+
+# strip leading dash in $action
+action=${action#-}
+
+delete=
+extract=
+list=
+quick=
+replace=
+index=
+create=
+
+while test -n "$action"
+do
+  case $action in
+    d*) delete=yes  ;;
+    x*) extract=yes ;;
+    t*) list=yes    ;;
+    q*) quick=yes   ;;
+    r*) replace=yes ;;
+    s*) index=yes   ;;
+    S*)             ;; # the index is always updated implicitly
+    c*) create=yes  ;;
+    u*)             ;; # TODO: don't ignore the update modifier
+    v*)             ;; # TODO: don't ignore the verbose modifier
+    *)
+      func_error "unknown action specified"
+      ;;
+  esac
+  action=${action#?}
+done
+
+case $delete$extract$list$quick$replace,$index in
+  yes,* | ,yes)
+    ;;
+  yesyes*)
+    func_error "more than one action specified"
+    ;;
+  *)
+    func_error "no action specified"
+    ;;
+esac
+
+if test -n "$delete"; then
+  if test ! -f "$orig_archive"; then
+    func_error "archive not found"
+  fi
+  for member
+  do
+    case $1 in
+      @*)
+        func_at_file "${1#@}" -REMOVE "$archive"
+        ;;
+      *)
+        func_file_conv "$1"
+        $AR -NOLOGO -REMOVE:"$file" "$archive" || exit $?
+        ;;
+    esac
+  done
+
+elif test -n "$extract"; then
+  if test ! -f "$orig_archive"; then
+    func_error "archive not found"
+  fi
+  if test $# -gt 0; then
+    for member
+    do
+      case $1 in
+        @*)
+          func_at_file "${1#@}" -EXTRACT "$archive"
+          ;;
+        *)
+          func_file_conv "$1"
+          $AR -NOLOGO -EXTRACT:"$file" "$archive" || exit $?
+          ;;
+      esac
+    done
+  else
+    $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member
+    do
+      $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $?
+    done
+  fi
+
+elif test -n "$quick$replace"; then
+  if test ! -f "$orig_archive"; then
+    if test -z "$create"; then
+      echo "$me: creating $orig_archive"
+    fi
+    orig_archive=
+  else
+    orig_archive=$archive
+  fi
+
+  for member
+  do
+    case $1 in
+    @*)
+      func_file_conv "${1#@}"
+      set x "$@" "@$file"
+      ;;
+    *)
+      func_file_conv "$1"
+      set x "$@" "$file"
+      ;;
+    esac
+    shift
+    shift
+  done
+
+  if test -n "$orig_archive"; then
+    $AR -NOLOGO -OUT:"$archive" "$orig_archive" "$@" || exit $?
+  else
+    $AR -NOLOGO -OUT:"$archive" "$@" || exit $?
+  fi
+
+elif test -n "$list"; then
+  if test ! -f "$orig_archive"; then
+    func_error "archive not found"
+  fi
+  $AR -NOLOGO -LIST "$archive" || exit $?
+fi