ffi 1.11.3 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 644662e700692019ada112b10a164622c08978bbe2aecfeb38205a43df099e28
-  data.tar.gz: 8699b821c2200c62c49c4265d5ce8b67862f53d71e1a2862b41ed5f44eedad87
+  metadata.gz: 25dd066fd8b6f12993326fc9d040deaeaad0dfc2a1b7d9093203fd7238edbfdd
+  data.tar.gz: d41f93c8bfc0050811478a9584aa0baf00ba78ffc64b2617f46ed111df5b074d
 SHA512:
-  metadata.gz: 6aee46baf520f91e112a1fdcd40218f51f100b50f56d126a94982d341f38919f3f550831db1c9da569d8457c2b50707654681b06ae6cae48ac4597d927b0569d
-  data.tar.gz: c728916db8dad5ec04403ab9cead139b870f56d3e0a34f0b08ec467f9a153c1f29d2f9ad2e30bb3056476a4dd3d42edebfdfbd9f88477f9e08862601cb3277a0
+  metadata.gz: 5dc01cb0cc8066cf8346a6d36fefad672b1efa0e7a27c390b5e139cf5de6d83a39efb99046c8cad1fe7434ea0052ac485810e12a04ff4758ea3757b2647b1930
+  data.tar.gz: 73e2d674137d21fa1f1fe322d5c51490c89dee6b815acd9372591509bc9d14972867a718b55a607b0b57f33ec6ded17bed0cbf097dabf3e6374f16a681b7ca75

data/.travis.yml

@@ -23,6 +23,8 @@ matrix:
   allow_failures:
     - os: osx
       rvm: ruby-head
+    - os: osx
+      rvm: 2.3.8
   include:
     - name: powerpc
       language: generic

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+1.12.1 / 2020-01-14
+-------------------
+
+Added:
+* Add binary gem support for ruby-2.7 on Windows
+
+
+1.12.0 / 2020-01-14
+-------------------
+
+Added:
+* FFI::VERSION is defined as part of `require 'ffi'` now.
+  It is no longer necessary to `require 'ffi/version'` .
+
+Changed:
+* Update libffi to latest master.
+
+Deprecated:
+* Overwriting struct layouts is now warned and will be disallowed in ffi-2.0. #734, #735
+
+
 1.11.3 / 2019-11-25
 -------------------
 

data/Gemfile

@@ -1,9 +1,9 @@
 source 'https://rubygems.org'
 
 group :development do
-  gem 'rake', '~> 12.1'
+  gem 'rake', '~> 13.0'
   gem 'rake-compiler', '~> 1.0.3'
-  gem 'rake-compiler-dock', '~> 0.7.0'
+  gem 'rake-compiler-dock', '~> 1.0'
   gem 'rspec', '~> 3.0'
   gem 'rubygems-tasks', '~> 0.2.4', :require => 'rubygems/tasks'
   gem "rubysl", "~> 2.0", :platforms => 'rbx'

data/README.md

@@ -38,10 +38,19 @@ For less minimalistic and more examples you may look at:
 
 ## Requirements
 
-When installing the gem on CRuby (MRI) or Rubinius, you will need:
+When installing the gem on CRuby (MRI), you will need:
 * A C compiler (e.g., Xcode on macOS, `gcc` or `clang` on everything else)
+Optionally (speeds up installation):
 * The `libffi` library and development headers - this is commonly in the `libffi-dev` or `libffi-devel` packages
 
+The ffi gem comes with a builtin libffi version, which is used, when the system libffi library is not available or too old.
+Use of the system libffi can be enforced by:
+```
+gem install ffi -- --enable-system-libffi        # to install the gem manually
+bundle config build.ffi --enable-system-libffi   # for bundle install
+```
+or prevented by `--disable-system-libffi`.
+
 On Linux systems running with [PaX](https://en.wikipedia.org/wiki/PaX) (Gentoo, Alpine, etc.), FFI may trigger `mprotect` errors. You may need to disable [mprotect](https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options#Restrict_mprotect.28.29) for ruby (`paxctl -m [/path/to/ruby]`) for the time being until a solution is found.
 
 On FreeBSD systems pkgconf must be installed for the gem to be able to compile using clang. Install either via packages `pkg install pkgconf` or from ports via `devel/pkgconf`.

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

@@ -9,10 +9,21 @@ language: cpp
 
 matrix:
   include:
-    - os: osx
-      env: HOST=aarch64-apple-darwin13
+    - os: linux
+      env: HOST=powerpc-eabisim RUNTESTFLAGS="--target_board powerpc-eabisim" DEJAGNU="/opt/.travis/site.exp"
+    - os: linux
+      env: HOST=or1k-elf RUNTESTFLAGS="--target_board or1k-sim" DEJAGNU="/opt/.travis/site.exp"
+    - os: linux
+      env: HOST=m32r-elf RUNTESTFLAGS="--target_board m32r-sim" DEJAGNU="/opt/.travis/site.exp"
+    - os: linux
+      env: HOST=bfin-elf RUNTESTFLAGS="--target_board bfin-sim" DEJAGNU="/opt/.travis/site.exp"
+# This configuration is still using the native x86 toolchain?
+#    - os: osx
+#      env: HOST=aarch64-apple-darwin13
     - os: osx
       env: HOST=x86_64-apple-darwin10
+    - os: linux
+      env: HOST=x86_64-w64-mingw32 MEVAL='export CC="x86_64-w64-mingw32-gcc" && CXX="x86_64-w64-mingw32-g++" RUNTESTFLAGS="--target_board wine-sim" DEJAGNU="$TRAVIS_BUILD_DIR/.travis/site.exp" CONFIGURE_OPTIONS=--disable-shared LIBFFI_TEST_OPTIMIZATION="-O2"
     - os: linux
       env: HOST=sh4-linux-gnu CONFIGURE_OPTIONS=--disable-shared QEMU_LD_PREFIX=/usr/sh4-linux-gnu
     - os: linux
@@ -20,21 +31,26 @@ matrix:
     - os: linux
       env: HOST=m68k-linux-gnu MEVAL='export CC="m68k-linux-gnu-gcc-8 -mcpu=547x" && CXX="m68k-linux-gnu-g++-8 -mcpu=547x"' CONFIGURE_OPTIONS=--disable-shared QEMU_LD_PREFIX=/usr/m68k-linux-gnu QEMU_CPU=cfv4e
     - os: linux
-      env: HOST=s390x-linux-gnu MEVAL='export CC="s390x-linux-gnu-gcc-8" && CXX="s390x-linux-gnu-g++-8"' CONFIGURE_OPTIONS=--disable-shared QEMU_LD_PREFIX=/usr/s390x-linux-gnu QEMU_CPU=max
+      arch: s390x
+      env: HOST=s390x-linux-gnu
+    - os: linux
+      arch: ppc64le
+      env: HOST=ppc64le-linux-gnu
+    - os: linux
+      arch: arm64
+      env: HOST=aarch64-linux-gnu
     - os: linux
       env: HOST=arm32v7-linux-gnu LIBFFI_TEST_OPTIMIZATION="-O0"
     - os: linux
       env: HOST=arm32v7-linux-gnu LIBFFI_TEST_OPTIMIZATION="-O2"
     - os: linux
       env: HOST=arm32v7-linux-gnu LIBFFI_TEST_OPTIMIZATION="-O2 -fomit-frame-pointer"
-    - os: linux
-      env: HOST=sparc64-linux-gnu
-    - os: linux
-      env: HOST=aarch64-linux-gnu
-    - os: linux
-      env: HOST=powerpc64le-unknown-linux-gnu
-    - os: linux
-      env: HOST=mips64el-linux-gnu
+# The sparc64 linux system in the GCC compile farm is non-responsive.
+#    - os: linux
+#      env: HOST=sparc64-linux-gnu
+# The mips64 linux system in the GCC compile farm is not allowing logins
+#    - os: linux
+#      env: HOST=mips64el-linux-gnu
     - os: linux
       compiler: gcc
       env: HOST=i386-pc-linux-gnu MEVAL='export CC="$CC -m32" && CXX="$CXX -m32"'
@@ -59,5 +75,5 @@ install:
 
 script:
   - if ! test x"$MEVAL" = x; then eval ${MEVAL}; fi
-  - travis_wait 45 sleep infinity &
+  - travis_wait 115 sleep infinity &
   - ./.travis/build.sh

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

@@ -0,0 +1,58 @@
+# Copyright (C) 2010, 2019  Free Software Foundation, Inc.
+#
+# This file is part of DejaGnu.
+#
+# DejaGnu 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 of the License, or
+# (at your option) any later version.
+#
+# DejaGnu 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 DejaGnu; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+# This is a list of toolchains that are supported on this board.
+set_board_info target_install {bfin-elf}
+
+# Load the generic configuration for this board. This will define a basic set
+# of routines needed by the tool to communicate with the board.
+load_generic_config "sim"
+
+# basic-sim.exp is a basic description for the standard Cygnus simulator.
+load_base_board_description "basic-sim"
+
+# "bfin" is the name of the sim subdir in devo/sim.
+setup_sim bfin
+
+# No multilib options needed by default.
+process_multilib_options ""
+
+# We only support newlib on this target. We assume that all multilib
+# options have been specified before we get here.
+
+set_board_info compiler  "[find_gcc]"
+set_board_info cflags    "[libgloss_include_flags] [newlib_include_flags]"
+set_board_info ldflags   "[libgloss_link_flags] [newlib_link_flags]"
+
+# Configuration settings for testsuites
+set_board_info noargs 1
+set_board_info gdb,nosignals 1
+set_board_info gdb,noresults 1
+set_board_info gdb,cannot_call_functions 1
+set_board_info gdb,skip_float_tests 1
+set_board_info gdb,can_reverse 1
+set_board_info gdb,use_precord 1
+
+# More time is needed
+set_board_info gcc,timeout 800
+set_board_info gdb,timeout 60
+
+# Used by a few gcc.c-torture testcases to delimit how large the stack can
+# be.
+set_board_info gcc,stack_size  5000
+

data/ext/ffi_c/libffi/.travis/build-cross-in-container.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+cd /opt
+
+echo $PATH
+export PATH=/usr/local/bin:$PATH
+echo $PATH
+
+./configure --host=${HOST} || cat */config.log
+make
+make dist
+make check RUNTESTFLAGS="-a $RUNTESTFLAGS" || true
+
+

data/ext/ffi_c/libffi/.travis/build-in-container.sh

@@ -7,16 +7,6 @@ export QEMU_LD_PREFIX=/usr/${HOST}
 ./configure ${HOST+--host=$HOST --disable-shared}
 make
 make dist
-make check RUNTESTFLAGS="-a $RUNTESTFLAGS"
-EXITCODE=$?
-gzip -c -9 */testsuite/libffi.log > libffi.log.gz
-echo ================================================================
-echo The logs are too long for travis to handle, so we compress and
-echo uuencode them.  Download, decode and uncompress if you need to
-echo read them.
-echo ================================================================
-uuencode libffi.log.gz -
-echo ================================================================
-echo ================================================================
-exit $EXITCODE
+make check RUNTESTFLAGS="-a $RUNTESTFLAGS" || true
+
 

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

@@ -8,54 +8,65 @@ else
     export SET_QEMU_CPU="-e QEMU_CPU=${QEMU_CPU}"
 fi
 
-# Default to podman where available, docker otherwise.
-# Override by setting the DOCKER environment variable.
-if test -z "$DOCKER"; then
-  which podman > /dev/null 2>&1
-  if [ $? != 0 ]; then
-    export DOCKER=docker
-  else
-    export DOCKER=podman
-  fi
-fi
+export DOCKER=docker
 
 function build_cfarm()
 {
-    curl -u ${CFARM_AUTH} https://cfarm-test-libffi-libffi.apps.home.labdroid.net/test?host=${HOST}\&commit=${TRAVIS_COMMIT}
+    curl -u ${CFARM_AUTH} https://cfarm-test-libffi-libffi.apps.home.labdroid.net/test?host=${HOST}\&commit=${TRAVIS_COMMIT} | tee build.log
+    echo :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+    echo $(tail build.log | grep '^==LOGFILE==')
+    echo $(tail build.log | grep '^==LOGFILE==' | cut -b13-)
+    echo :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+    curl -u ${CFARM_AUTH} "$(tail build.log | grep '^==LOGFILE==' | cut -b13-)" > libffi.log
+
+    ./rlgl l --key=${RLGL_KEY} https://rl.gl
+    ID=$(./rlgl start)
+    ./rlgl e --id=$ID --policy=https://github.com/libffi/rlgl-policy.git libffi.log
+    exit $?
 }
 
 function build_linux()
 {
     ./autogen.sh
-    ./configure ${HOST+--host=$HOST} ${CONFIGURE_OPTIONS}
+    ./configure ${HOST+--host=$HOST} ${CONFIGURE_OPTIONS} || cat */config.log
     make
     make dist
     make check RUNTESTFLAGS="-a $RUNTESTFLAGS"
-    EXITCODE=$?
-
-    gzip -c -9 */testsuite/libffi.log > libffi.log.gz
-    echo ================================================================
-    echo The logs are too long for travis to handle, so we compress and
-    echo uuencode them.  Download, decode and uncompress if you need to
-    echo read them.  For example, if you select and save this text
-    echo as libffi.uu, run: 'cat libffi.uu | uudecode | gzip -d | less'.
-    echo ================================================================
-    uuencode libffi.log.gz -
-    echo ================================================================
-    echo ================================================================
-
-    exit $EXITCODE
+
+    ./rlgl l --key=${RLGL_KEY} https://rl.gl
+    ID=$(./rlgl start)
+    ./rlgl e --id=$ID --policy=https://github.com/libffi/rlgl-policy.git */testsuite/libffi.log
+    exit $?
 }
 
 function build_foreign_linux()
 {
-    ${DOCKER} run --rm -t -i -v `pwd`:/opt ${SET_QEMU_CPU} -e LIBFFI_TEST_OPTIMIZATION="${LIBFFI_TEST_OPTIMIZATION}" $2 bash -c /opt/.travis/build-in-container.sh
+    ${DOCKER} run --rm -t -i -v $(pwd):/opt ${SET_QEMU_CPU} -e LIBFFI_TEST_OPTIMIZATION="${LIBFFI_TEST_OPTIMIZATION}" $2 bash -c /opt/.travis/build-in-container.sh
+
+    ./rlgl l --key=${RLGL_KEY} https://rl.gl
+    ID=$(./rlgl start)
+    ./rlgl e --id=$ID --policy=https://github.com/libffi/rlgl-policy.git */testsuite/libffi.log
     exit $?
 }
 
 function build_cross_linux()
 {
-    ${DOCKER} run --rm -t -i -v `pwd`:/opt ${SET_QEMU_CPU} -e HOST="${HOST}" -e CC="${HOST}-gcc-8 ${GCC_OPTIONS}" -e CXX="${HOST}-g++-8 ${GCC_OPTIONS}" -e LIBFFI_TEST_OPTIMIZATION="${LIBFFI_TEST_OPTIMIZATION}" moxielogic/cross-ci-build-container:latest bash -c /opt/.travis/build-in-container.sh
+    ${DOCKER} run --rm -t -i -v $(pwd):/opt ${SET_QEMU_CPU} -e HOST="${HOST}" -e CC="${HOST}-gcc-8 ${GCC_OPTIONS}" -e CXX="${HOST}-g++-8 ${GCC_OPTIONS}" -e LIBFFI_TEST_OPTIMIZATION="${LIBFFI_TEST_OPTIMIZATION}" moxielogic/cross-ci-build-container:latest bash -c /opt/.travis/build-in-container.sh
+
+    ./rlgl l --key=${RLGL_KEY} https://rl.gl
+    ID=$(./rlgl start)
+    ./rlgl e --id=$ID --policy=https://github.com/libffi/rlgl-policy.git */testsuite/libffi.log
+    exit $?
+}
+
+function build_cross()
+{
+    ${DOCKER} pull quay.io/moxielogic/libffi-ci-${HOST} 
+    ${DOCKER} run --rm -t -i -v $(pwd):/opt -e HOST="${HOST}" -e CC="${HOST}-gcc ${GCC_OPTIONS}" -e CXX="${HOST}-g++ ${GCC_OPTIONS}" -e TRAVIS_BUILD_DIR=/opt -e DEJAGNU="${DEJAGNU}" -e RUNTESTFLAGS="${RUNTESTFLAGS}" -e LIBFFI_TEST_OPTIMIZATION="${LIBFFI_TEST_OPTIMIZATION}" quay.io/moxielogic/libffi-ci-${HOST} bash -c /opt/.travis/build-cross-in-container.sh
+
+    ./rlgl l --key=${RLGL_KEY} https://rl.gl
+    ID=$(./rlgl start)
+    ./rlgl e --id=$ID --policy=https://github.com/libffi/rlgl-policy.git */testsuite/libffi.log
     exit $?
 }
 
@@ -76,6 +87,7 @@ function build_macosx()
     ./generate-darwin-source-and-headers.py --only-osx
     xcodebuild -showsdks
     xcodebuild -project libffi.xcodeproj -target "libffi-Mac" -configuration Release -sdk macosx10.13
+    echo "Finished build"
     exit $?
 }
 
@@ -92,14 +104,30 @@ case "$HOST" in
 	./autogen.sh
         build_foreign_linux arm moxielogic/arm32v7-ci-build-container:latest 
 	;;
-    aarch64-linux-gnu| powerpc64le-unknown-linux-gnu | mips64el-linux-gnu | sparc64-linux-gnu)
+    mips64el-linux-gnu | sparc64-linux-gnu)
         build_cfarm
 	;;
+    bfin-elf )
+	./autogen.sh
+	GCC_OPTIONS=-msim build_cross
+	;;
+    m32r-elf )
+	./autogen.sh
+	build_cross
+	;;
+    or1k-elf )
+	./autogen.sh
+	build_cross
+	;;
+    powerpc-eabisim )
+	./autogen.sh
+	build_cross
+	;;
     m68k-linux-gnu )
 	./autogen.sh
 	GCC_OPTIONS=-mcpu=547x build_cross_linux
 	;;
-    alpha-linux-gnu | sh4-linux-gnu | s390x-linux-gnu )
+    alpha-linux-gnu | sh4-linux-gnu )
 	./autogen.sh
 	build_cross_linux
 	;;

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

@@ -2,42 +2,70 @@
 set -x
 
 if [[ $TRAVIS_OS_NAME != 'linux' ]]; then
-  brew update > brew-update.log 2>&1
-  # fix an issue with libtool on travis by reinstalling it
-  brew uninstall libtool;
-  brew install libtool dejagnu;
+    brew update > brew-update.log 2>&1
+    # fix an issue with libtool on travis by reinstalling it
+    brew uninstall libtool;
+    brew install libtool dejagnu;
+
+    # Download and extract the rlgl client
+    wget -qO - https://rl.gl/cli/rlgl-darwin-amd64.tgz | \
+	tar --strip-components=2 -xvzf - ./rlgl/rlgl;
+
 else
-  sudo apt-get clean # clear the cache
-  sudo apt-get update
-  case $HOST in
-      aarch64-linux-gnu | powerpc64le-unknown-linux-gnu | mips64el-linux-gnu | sparc64-linux-gnu)
-          ;;	  
-      alpha-linux-gnu | arm32v7-linux-gnu | m68k-linux-gnu | sh4-linux-gnu | s390x-linux-gnu )
-	  sudo apt-get install qemu-user-static
-	  ;;
-      hppa-linux-gnu )
-	  sudo apt-get install -y qemu-user-static g++-5-hppa-linux-gnu
-	  ;;
-      i386-pc-linux-gnu)
-	  sudo apt-get install gcc-multilib g++-multilib;
-	  ;;
-      moxie-elf)
-	  echo 'deb https://repos.moxielogic.org:7114/MoxieLogic moxiedev main' | sudo tee -a /etc/apt/sources.list
-	  sudo apt-get clean # clear the cache
-	  sudo apt-get update ## -qq
-	  sudo apt-get update
-	  sudo apt-get install -y --allow-unauthenticated moxielogic-moxie-elf-gcc moxielogic-moxie-elf-gcc-c++ moxielogic-moxie-elf-gcc-libstdc++ moxielogic-moxie-elf-gdb-sim
-	  ;;
-      i686-w64-mingw32)
-	  sudo apt-get install gcc-mingw-w64-i686 binutils-mingw-w64-i686 wine;
-	  ;;
-  esac
-  case $HOST in
-      arm32v7-linux-gnu | aarch64-linux-gnu | ppc64le-linux-gnu | s390x-linux-gnu)
-          # don't install host tools
-          ;;
-      *)
-	  sudo apt-get install dejagnu texinfo sharutils
-	  ;;
-  esac
+    # Download and extract the rlgl client
+    case $HOST in
+	aarch64-linux-gnu)
+	    wget -qO - https://rl.gl/cli/rlgl-linux-arm.tgz | \
+		tar --strip-components=2 -xvzf - ./rlgl/rlgl;
+	    ;;
+	ppc64le-linux-gnu)
+	    wget -qO - https://rl.gl/cli/rlgl-linux-ppc64le.tgz | \
+		tar --strip-components=2 -xvzf - ./rlgl/rlgl;
+	    ;;
+	s390x-linux-gnu)
+	    wget -qO - https://rl.gl/cli/rlgl-linux-s390x.tgz | \
+		tar --strip-components=2 -xvzf - ./rlgl/rlgl;
+	    ;;
+	*) 
+	    wget -qO - https://rl.gl/cli/rlgl-linux-amd64.tgz | \
+		tar --strip-components=2 -xvzf - ./rlgl/rlgl;
+	    ;;
+    esac
+
+    sudo apt-get clean # clear the cache
+    sudo apt-get update
+    case $HOST in
+	mips64el-linux-gnu | sparc64-linux-gnu)
+        ;;	  
+	alpha-linux-gnu | arm32v7-linux-gnu | m68k-linux-gnu | sh4-linux-gnu)
+	    sudo apt-get install qemu-user-static
+	    ;;
+	hppa-linux-gnu )
+	    sudo apt-get install -y qemu-user-static g++-5-hppa-linux-gnu
+	    ;;
+	i386-pc-linux-gnu)
+	    sudo apt-get install gcc-multilib g++-multilib;
+	    ;;
+	moxie-elf)
+	    echo 'deb https://repos.moxielogic.org:7114/MoxieLogic moxiedev main' | sudo tee -a /etc/apt/sources.list
+	    sudo apt-get clean # clear the cache
+	    sudo apt-get update ## -qq
+	    sudo apt-get update
+	    sudo apt-get install -y --allow-unauthenticated moxielogic-moxie-elf-gcc moxielogic-moxie-elf-gcc-c++ moxielogic-moxie-elf-gcc-libstdc++ moxielogic-moxie-elf-gdb-sim
+	    ;;
+	x86_64-w64-mingw32)
+	    sudo apt-get install gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 wine;
+	    ;;
+	i686-w32-mingw32)
+	    sudo apt-get install gcc-mingw-w64-i686 g++-mingw-w64-i686 wine;
+	    ;;
+    esac
+    case $HOST in
+	arm32v7-linux-gnu)
+        # don't install host tools
+        ;;
+	*)
+	    sudo apt-get install dejagnu texinfo sharutils
+	    ;;
+    esac
 fi