--- libffi/Makefile.in.orig	2015-06-23 07:55:27 UTC
+++ libffi/Makefile.in
@@ -40,6 +40,7 @@ target_triplet = @target@
 @BFIN_TRUE@am__append_3 = src/bfin/ffi.c src/bfin/sysv.S
 @X86_TRUE@am__append_4 = src/x86/ffi.c src/x86/sysv.S
 @X86_FREEBSD_TRUE@am__append_5 = src/x86/ffi.c src/x86/freebsd.S
+@X86_BSDSUNIX_TRUE@am__append_5 = src/x86/ffi.c src/x86/bsdsunix.S
 @X86_WIN32_TRUE@am__append_6 = src/x86/ffi.c src/x86/win32.S
 @X86_WIN64_TRUE@am__append_7 = src/x86/ffi.c src/x86/win64.S
 @X86_DARWIN_TRUE@am__append_8 = src/x86/ffi.c src/x86/darwin.S src/x86/ffi64.c src/x86/darwin64.S
@@ -51,6 +52,7 @@ target_triplet = @target@
 @POWERPC_TRUE@am__append_14 = src/powerpc/ffi.c src/powerpc/ffi_sysv.c src/powerpc/ffi_linux64.c src/powerpc/sysv.S src/powerpc/ppc_closure.S src/powerpc/linux64.S src/powerpc/linux64_closure.S
 @POWERPC_AIX_TRUE@am__append_15 = src/powerpc/ffi_darwin.c src/powerpc/aix.S src/powerpc/aix_closure.S
 @POWERPC_DARWIN_TRUE@am__append_16 = src/powerpc/ffi_darwin.c src/powerpc/darwin.S src/powerpc/darwin_closure.S
+@POWERPC_BSDSUNIX_TRUE@am__append_17 = src/powerpc/ffi.c src/powerpc/ffi_sysv.c src/powerpc/sysv.S src/powerpc/ppc_closure.S
 @POWERPC_FREEBSD_TRUE@am__append_17 = src/powerpc/ffi.c src/powerpc/ffi_sysv.c src/powerpc/sysv.S src/powerpc/ppc_closure.S
 @AARCH64_TRUE@am__append_18 = src/aarch64/sysv.S src/aarch64/ffi.c
 @ARM_TRUE@am__append_19 = src/arm/sysv.S src/arm/ffi.c
@@ -123,6 +125,7 @@ am_libffi_la_OBJECTS = src/prep_cif.lo s
 @BFIN_TRUE@am__objects_3 = src/bfin/ffi.lo src/bfin/sysv.lo
 @X86_TRUE@am__objects_4 = src/x86/ffi.lo src/x86/sysv.lo
 @X86_FREEBSD_TRUE@am__objects_5 = src/x86/ffi.lo src/x86/freebsd.lo
+@X86_BSDSUNIX_TRUE@am__objects_5 = src/x86/ffi.lo src/x86/bsdsunix.lo
 @X86_WIN32_TRUE@am__objects_6 = src/x86/ffi.lo src/x86/win32.lo
 @X86_WIN64_TRUE@am__objects_7 = src/x86/ffi.lo src/x86/win64.lo
 @X86_DARWIN_TRUE@am__objects_8 = src/x86/ffi.lo src/x86/darwin.lo \
@@ -149,6 +152,10 @@ am_libffi_la_OBJECTS = src/prep_cif.lo s
 @POWERPC_FREEBSD_TRUE@	src/powerpc/ffi_sysv.lo \
 @POWERPC_FREEBSD_TRUE@	src/powerpc/sysv.lo \
 @POWERPC_FREEBSD_TRUE@	src/powerpc/ppc_closure.lo
+@POWERPC_BSDSUNIX_TRUE@am__objects_17 = src/powerpc/ffi.lo \
+@POWERPC_BSDSUNIX_TRUE@	src/powerpc/ffi_sysv.lo \
+@POWERPC_BSDSUNIX_TRUE@	src/powerpc/sysv.lo \
+@POWERPC_BSDSUNIX_TRUE@	src/powerpc/ppc_closure.lo
 @AARCH64_TRUE@am__objects_18 = src/aarch64/sysv.lo src/aarch64/ffi.lo
 @ARM_TRUE@am__objects_19 = src/arm/sysv.lo src/arm/ffi.lo
 @ARM_TRUE@@FFI_EXEC_TRAMPOLINE_TABLE_TRUE@am__objects_20 = src/arm/trampoline.lo
@@ -405,7 +412,7 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change
 	src/sparc/v9.S src/sparc/ffitarget.h src/sparc/ffi.c		\
 	src/x86/darwin64.S src/x86/ffi.c src/x86/sysv.S			\
 	src/x86/win32.S src/x86/darwin.S src/x86/win64.S		\
-	src/x86/freebsd.S src/x86/ffi64.c src/x86/unix64.S		\
+	src/x86/bsdsunix.S src/x86/freebsd.S src/x86/ffi64.c src/x86/unix64.S		\
 	src/x86/ffitarget.h src/pa/ffitarget.h src/pa/ffi.c		\
 	src/pa/linux.S src/pa/hpux32.S src/frv/ffi.c src/bfin/ffi.c	\
 	src/bfin/ffitarget.h src/bfin/sysv.S src/frv/eabi.S		\
@@ -645,6 +652,8 @@ src/x86/ffi.lo: src/x86/$(am__dirstamp) 
 	src/x86/$(DEPDIR)/$(am__dirstamp)
 src/x86/sysv.lo: src/x86/$(am__dirstamp) \
 	src/x86/$(DEPDIR)/$(am__dirstamp)
+src/x86/bsdsunix.lo: src/x86/$(am__dirstamp) \
+	src/x86/$(DEPDIR)/$(am__dirstamp)
 src/x86/freebsd.lo: src/x86/$(am__dirstamp) \
 	src/x86/$(DEPDIR)/$(am__dirstamp)
 src/x86/win32.lo: src/x86/$(am__dirstamp) \
@@ -970,6 +979,8 @@ mostlyclean-compile:
 	-rm -f src/x86/ffi.lo
 	-rm -f src/x86/ffi64.$(OBJEXT)
 	-rm -f src/x86/ffi64.lo
+	-rm -f src/x86/bsdsunix.$(OBJEXT)
+	-rm -f src/x86/bsdsunix.lo
 	-rm -f src/x86/freebsd.$(OBJEXT)
 	-rm -f src/x86/freebsd.lo
 	-rm -f src/x86/sysv.$(OBJEXT)
@@ -1044,6 +1055,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/darwin64.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/ffi.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/ffi64.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/bsdsunix.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/freebsd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/sysv.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/unix64.Plo@am__quote@