merge from upstream libffi 3.2.1

Author: twall

native/README.libffi

@@ -2,9 +2,9 @@
 The libffi subdirectory is managed as a subtree.  Use subtree merging
 to update from upstream, e.g.
 
-$ git pull -s subtree libffi master (or other branch, if necessary)
+$ git pull -s subtree -Xsubtree=native/libffi libffi master (or other branch, if necessary)
 
-The libffi subdirectory was originally mapped as follows:
+The libffi subdirectory was originally mapped into the local repo as follows:
 
 $ git remote add -f libffi [email protected]:atgreen/libffi.git
 $ git merge -s ours --no-commit libffi/master

native/libffi/.gitignore

@@ -5,17 +5,31 @@
 .dirstamp
 *.la
 Makefile
-config.log
-config.status
+Makefile.in
+aclocal.m4
+compile
+config.*
+configure
+depcomp
+doc/libffi.info
 *~
+fficonfig.h.in
 fficonfig.h
 include/ffi.h
 include/ffitarget.h
+install-sh
 libffi.pc
 libtool
+libtool-ldflags
+ltmain.sh
+m4/libtool.m4
+m4/lt*.m4
+mdate-sh
+missing
 stamp-h1
 libffi*gz
 autom4te.cache
 libffi.xcodeproj/xcuserdata
 libffi.xcodeproj/project.xcworkspace
-ios/
+build_*/
+darwin_*/

native/libffi/.travis.yml

@@ -1,8 +1,22 @@
-language: c
+language: cpp
 compiler:
   - gcc
   - clang
+env:
+  -
+  - HOST=i386-pc-linux-gnu
+matrix:
+  exclude:
+    - compiler: clang
+      env: HOST=i386-pc-linux-gnu
 
-before_script: sudo apt-get install dejagnu
+before_script:
+  - sudo apt-get install dejagnu texinfo
+  - if [ "$HOST" = i386-pc-linux-gnu ] ; then sudo apt-get install gcc-multilib g++-multilib && CC="$CC -m32" && CXX="$CXX -m32" ; fi
 
-script: ./configure && make && make check
+script:
+  - ./autogen.sh
+  - ./configure ${HOST+--host=$HOST}
+  - make
+  - make dist
+  - make check