summaryrefslogtreecommitdiff
path: root/patches/ios
diff options
context:
space:
mode:
Diffstat (limited to 'patches/ios')
-rw-r--r--patches/ios267
1 files changed, 126 insertions, 141 deletions
diff --git a/patches/ios b/patches/ios
index b60917f..14aa8f9 100644
--- a/patches/ios
+++ b/patches/ios
@@ -2,7 +2,7 @@ Index: libffi/ChangeLog
===================================================================
--- libffi.orig/ChangeLog
+++ libffi/ChangeLog
-@@ -33,6 +33,29 @@
+@@ -50,6 +50,29 @@
* configure: Regenerate.
@@ -36,23 +36,21 @@ Index: libffi/Makefile.am
===================================================================
--- libffi.orig/Makefile.am
+++ libffi/Makefile.am
-@@ -4,37 +4,34 @@ AUTOMAKE_OPTIONS = foreign subdir-object
-
- SUBDIRS = include testsuite man
-
--EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
-- src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \
-- src/arm/ffi.c src/arm/sysv.S src/arm/ffitarget.h \
-- src/avr32/ffi.c src/avr32/sysv.S src/avr32/ffitarget.h \
-- src/cris/ffi.c src/cris/sysv.S src/cris/ffitarget.h \
-- src/ia64/ffi.c src/ia64/ffitarget.h src/ia64/ia64_flags.h \
+@@ -10,31 +10,28 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change
+ src/avr32/ffi.c src/avr32/sysv.S src/avr32/ffitarget.h \
+ src/cris/ffi.c src/cris/sysv.S src/cris/ffitarget.h \
+ src/ia64/ffi.c src/ia64/ffitarget.h src/ia64/ia64_flags.h \
- src/ia64/unix.S \
- src/mips/ffi.c src/mips/n32.S src/mips/o32.S \
- src/mips/ffitarget.h \
- src/m32r/ffi.c src/m32r/sysv.S src/m32r/ffitarget.h \
- src/m68k/ffi.c src/m68k/sysv.S src/m68k/ffitarget.h \
- src/powerpc/ffi.c src/powerpc/sysv.S \
-- src/powerpc/linux64.S src/powerpc/linux64_closure.S \
++ src/ia64/unix.S src/mips/ffi.c src/mips/n32.S src/mips/o32.S \
++ src/mips/ffitarget.h src/m32r/ffi.c src/m32r/sysv.S \
++ src/m32r/ffitarget.h src/m68k/ffi.c src/m68k/sysv.S \
++ src/m68k/ffitarget.h src/powerpc/ffi.c src/powerpc/sysv.S \
+ src/powerpc/linux64.S src/powerpc/linux64_closure.S \
- src/powerpc/ppc_closure.S src/powerpc/asm.h \
- src/powerpc/aix.S src/powerpc/darwin.S \
- src/powerpc/aix_closure.S src/powerpc/darwin_closure.S \
@@ -62,8 +60,16 @@ Index: libffi/Makefile.am
- src/sh64/ffi.c src/sh64/sysv.S src/sh64/ffitarget.h \
- src/sparc/v8.S 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/win64.S \
-- src/x86/darwin.S src/x86/freebsd.S \
++ src/powerpc/ppc_closure.S src/powerpc/asm.h src/powerpc/aix.S \
++ src/powerpc/darwin.S src/powerpc/aix_closure.S \
++ src/powerpc/darwin_closure.S src/powerpc/ffi_darwin.c \
++ src/powerpc/ffitarget.h src/s390/ffi.c src/s390/sysv.S \
++ src/s390/ffitarget.h src/sh/ffi.c src/sh/sysv.S \
++ src/sh/ffitarget.h src/sh64/ffi.c src/sh64/sysv.S \
++ src/sh64/ffitarget.h src/sparc/v8.S 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/ffitarget.h \
- src/pa/ffitarget.h src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S \
- src/frv/ffi.c src/frv/eabi.S src/frv/ffitarget.h \
@@ -71,33 +77,13 @@ Index: libffi/Makefile.am
- src/moxie/ffi.c src/moxie/eabi.S \
- libtool-version ChangeLog.libffi m4/libtool.m4 \
- m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4
-+EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
-+ src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \
-+ src/arm/ffi.c src/arm/sysv.S src/arm/trampoline.S \
-+ src/arm/ffitarget.h src/avr32/ffi.c src/avr32/sysv.S \
-+ src/avr32/ffitarget.h src/cris/ffi.c src/cris/sysv.S \
-+ src/cris/ffitarget.h src/ia64/ffi.c src/ia64/ffitarget.h \
-+ src/ia64/ia64_flags.h src/ia64/unix.S src/mips/ffi.c \
-+ src/mips/n32.S src/mips/o32.S src/mips/ffitarget.h \
-+ src/m32r/ffi.c src/m32r/sysv.S src/m32r/ffitarget.h \
-+ src/m68k/ffi.c src/m68k/sysv.S src/m68k/ffitarget.h \
-+ src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/linux64.S \
-+ src/powerpc/linux64_closure.S src/powerpc/ppc_closure.S \
-+ src/powerpc/asm.h src/powerpc/aix.S src/powerpc/darwin.S \
-+ src/powerpc/aix_closure.S src/powerpc/darwin_closure.S \
-+ src/powerpc/ffi_darwin.c src/powerpc/ffitarget.h \
-+ src/s390/ffi.c src/s390/sysv.S src/s390/ffitarget.h \
-+ src/sh/ffi.c src/sh/sysv.S src/sh/ffitarget.h src/sh64/ffi.c \
-+ src/sh64/sysv.S src/sh64/ffitarget.h src/sparc/v8.S \
-+ 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/win64.S src/x86/darwin.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/frv/eabi.S \
-+ src/frv/ffitarget.h src/dlmalloc.c src/moxie/ffi.c \
-+ src/moxie/eabi.S libtool-version ChangeLog.libffi \
-+ m4/libtool.m4 m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 \
++ src/x86/win64.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/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \
++ src/moxie/ffi.c src/moxie/eabi.S libtool-version \
++ ChangeLog.libffi m4/libtool.m4 m4/lt~obsolete.m4 \
++ m4/ltoptions.m4 m4/ltsugar.m4
+ m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh
info_TEXINFOS = doc/libffi.texi
@@ -116,100 +102,105 @@ Index: libffi/Makefile.in
===================================================================
--- libffi.orig/Makefile.in
+++ libffi/Makefile.in
-@@ -52,20 +52,21 @@ target_triplet = @target@
+@@ -52,21 +52,22 @@ target_triplet = @target@
@POWERPC_DARWIN_TRUE@am__append_14 = src/powerpc/ffi_darwin.c src/powerpc/darwin.S src/powerpc/darwin_closure.S
@POWERPC_FREEBSD_TRUE@am__append_15 = src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S
@ARM_TRUE@am__append_16 = src/arm/sysv.S src/arm/ffi.c
-@AVR32_TRUE@am__append_17 = src/avr32/sysv.S src/avr32/ffi.c
-@LIBFFI_CRIS_TRUE@am__append_18 = src/cris/sysv.S src/cris/ffi.c
-@FRV_TRUE@am__append_19 = src/frv/eabi.S src/frv/ffi.c
--@S390_TRUE@am__append_20 = src/s390/sysv.S src/s390/ffi.c
--@X86_64_TRUE@am__append_21 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S
--@SH_TRUE@am__append_22 = src/sh/sysv.S src/sh/ffi.c
--@SH64_TRUE@am__append_23 = src/sh64/sysv.S src/sh64/ffi.c
--@PA_LINUX_TRUE@am__append_24 = src/pa/linux.S src/pa/ffi.c
--@PA_HPUX_TRUE@am__append_25 = src/pa/hpux32.S src/pa/ffi.c
+-@MOXIE_TRUE@am__append_20 = src/moxie/eabi.S src/moxie/ffi.c
+-@S390_TRUE@am__append_21 = src/s390/sysv.S src/s390/ffi.c
+-@X86_64_TRUE@am__append_22 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S
+-@SH_TRUE@am__append_23 = src/sh/sysv.S src/sh/ffi.c
+-@SH64_TRUE@am__append_24 = src/sh64/sysv.S src/sh64/ffi.c
+-@PA_LINUX_TRUE@am__append_25 = src/pa/linux.S src/pa/ffi.c
+-@PA_HPUX_TRUE@am__append_26 = src/pa/hpux32.S src/pa/ffi.c
+@ARM_TRUE@@FFI_EXEC_TRAMPOLINE_TABLE_TRUE@am__append_17 = src/arm/trampoline.S
+@AVR32_TRUE@am__append_18 = src/avr32/sysv.S src/avr32/ffi.c
+@LIBFFI_CRIS_TRUE@am__append_19 = src/cris/sysv.S src/cris/ffi.c
+@FRV_TRUE@am__append_20 = src/frv/eabi.S src/frv/ffi.c
-+@S390_TRUE@am__append_21 = src/s390/sysv.S src/s390/ffi.c
-+@X86_64_TRUE@am__append_22 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S
-+@SH_TRUE@am__append_23 = src/sh/sysv.S src/sh/ffi.c
-+@SH64_TRUE@am__append_24 = src/sh64/sysv.S src/sh64/ffi.c
-+@PA_LINUX_TRUE@am__append_25 = src/pa/linux.S src/pa/ffi.c
-+@PA_HPUX_TRUE@am__append_26 = src/pa/hpux32.S src/pa/ffi.c
++@MOXIE_TRUE@am__append_21 = src/moxie/eabi.S src/moxie/ffi.c
++@S390_TRUE@am__append_22 = src/s390/sysv.S src/s390/ffi.c
++@X86_64_TRUE@am__append_23 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S
++@SH_TRUE@am__append_24 = src/sh/sysv.S src/sh/ffi.c
++@SH64_TRUE@am__append_25 = src/sh64/sysv.S src/sh64/ffi.c
++@PA_LINUX_TRUE@am__append_26 = src/pa/linux.S src/pa/ffi.c
++@PA_HPUX_TRUE@am__append_27 = src/pa/hpux32.S src/pa/ffi.c
# Build debug. Define FFI_DEBUG on the commandline so that, when building with
# MSVC, it can link against the debug CRT.
--@FFI_DEBUG_TRUE@am__append_26 = -DFFI_DEBUG
-+@FFI_DEBUG_TRUE@am__append_27 = -DFFI_DEBUG
+-@FFI_DEBUG_TRUE@am__append_27 = -DFFI_DEBUG
++@FFI_DEBUG_TRUE@am__append_28 = -DFFI_DEBUG
# Build opt.
--@FFI_DEBUG_FALSE@am__append_27 = -O2
-+@FFI_DEBUG_FALSE@am__append_28 = -O2
+-@FFI_DEBUG_FALSE@am__append_28 = -O2
++@FFI_DEBUG_FALSE@am__append_29 = -O2
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/doc/stamp-vti \
-@@ -142,16 +143,17 @@ am_libffi_la_OBJECTS = src/debug.lo src/
+@@ -141,17 +142,18 @@ am_libffi_la_OBJECTS = src/debug.lo src/
@POWERPC_FREEBSD_TRUE@ src/powerpc/sysv.lo \
@POWERPC_FREEBSD_TRUE@ src/powerpc/ppc_closure.lo
@ARM_TRUE@am__objects_16 = src/arm/sysv.lo src/arm/ffi.lo
-@AVR32_TRUE@am__objects_17 = src/avr32/sysv.lo src/avr32/ffi.lo
-@LIBFFI_CRIS_TRUE@am__objects_18 = src/cris/sysv.lo src/cris/ffi.lo
-@FRV_TRUE@am__objects_19 = src/frv/eabi.lo src/frv/ffi.lo
--@S390_TRUE@am__objects_20 = src/s390/sysv.lo src/s390/ffi.lo
--@X86_64_TRUE@am__objects_21 = src/x86/ffi64.lo src/x86/unix64.lo \
+-@MOXIE_TRUE@am__objects_20 = src/moxie/eabi.lo src/moxie/ffi.lo
+-@S390_TRUE@am__objects_21 = src/s390/sysv.lo src/s390/ffi.lo
+-@X86_64_TRUE@am__objects_22 = src/x86/ffi64.lo src/x86/unix64.lo \
+@ARM_TRUE@@FFI_EXEC_TRAMPOLINE_TABLE_TRUE@am__objects_17 = src/arm/trampoline.lo
+@AVR32_TRUE@am__objects_18 = src/avr32/sysv.lo src/avr32/ffi.lo
+@LIBFFI_CRIS_TRUE@am__objects_19 = src/cris/sysv.lo src/cris/ffi.lo
+@FRV_TRUE@am__objects_20 = src/frv/eabi.lo src/frv/ffi.lo
-+@S390_TRUE@am__objects_21 = src/s390/sysv.lo src/s390/ffi.lo
-+@X86_64_TRUE@am__objects_22 = src/x86/ffi64.lo src/x86/unix64.lo \
++@MOXIE_TRUE@am__objects_21 = src/moxie/eabi.lo src/moxie/ffi.lo
++@S390_TRUE@am__objects_22 = src/s390/sysv.lo src/s390/ffi.lo
++@X86_64_TRUE@am__objects_23 = src/x86/ffi64.lo src/x86/unix64.lo \
@X86_64_TRUE@ src/x86/ffi.lo src/x86/sysv.lo
--@SH_TRUE@am__objects_22 = src/sh/sysv.lo src/sh/ffi.lo
--@SH64_TRUE@am__objects_23 = src/sh64/sysv.lo src/sh64/ffi.lo
--@PA_LINUX_TRUE@am__objects_24 = src/pa/linux.lo src/pa/ffi.lo
--@PA_HPUX_TRUE@am__objects_25 = src/pa/hpux32.lo src/pa/ffi.lo
-+@SH_TRUE@am__objects_23 = src/sh/sysv.lo src/sh/ffi.lo
-+@SH64_TRUE@am__objects_24 = src/sh64/sysv.lo src/sh64/ffi.lo
-+@PA_LINUX_TRUE@am__objects_25 = src/pa/linux.lo src/pa/ffi.lo
-+@PA_HPUX_TRUE@am__objects_26 = src/pa/hpux32.lo src/pa/ffi.lo
+-@SH_TRUE@am__objects_23 = src/sh/sysv.lo src/sh/ffi.lo
+-@SH64_TRUE@am__objects_24 = src/sh64/sysv.lo src/sh64/ffi.lo
+-@PA_LINUX_TRUE@am__objects_25 = src/pa/linux.lo src/pa/ffi.lo
+-@PA_HPUX_TRUE@am__objects_26 = src/pa/hpux32.lo src/pa/ffi.lo
++@SH_TRUE@am__objects_24 = src/sh/sysv.lo src/sh/ffi.lo
++@SH64_TRUE@am__objects_25 = src/sh64/sysv.lo src/sh64/ffi.lo
++@PA_LINUX_TRUE@am__objects_26 = src/pa/linux.lo src/pa/ffi.lo
++@PA_HPUX_TRUE@am__objects_27 = src/pa/hpux32.lo src/pa/ffi.lo
nodist_libffi_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
$(am__objects_3) $(am__objects_4) $(am__objects_5) \
$(am__objects_6) $(am__objects_7) $(am__objects_8) \
-@@ -160,17 +162,17 @@ nodist_libffi_la_OBJECTS = $(am__objects
+@@ -160,17 +162,18 @@ nodist_libffi_la_OBJECTS = $(am__objects
$(am__objects_15) $(am__objects_16) $(am__objects_17) \
$(am__objects_18) $(am__objects_19) $(am__objects_20) \
$(am__objects_21) $(am__objects_22) $(am__objects_23) \
-- $(am__objects_24) $(am__objects_25)
-+ $(am__objects_24) $(am__objects_25) $(am__objects_26)
+- $(am__objects_24) $(am__objects_25) $(am__objects_26)
++ $(am__objects_24) $(am__objects_25) $(am__objects_26) \
++ $(am__objects_27)
libffi_la_OBJECTS = $(am_libffi_la_OBJECTS) \
$(nodist_libffi_la_OBJECTS)
libffi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libffi_la_LDFLAGS) $(LDFLAGS) -o $@
libffi_convenience_la_LIBADD =
--am__objects_26 = src/debug.lo src/prep_cif.lo src/types.lo \
-+am__objects_27 = src/debug.lo src/prep_cif.lo src/types.lo \
+-am__objects_27 = src/debug.lo src/prep_cif.lo src/types.lo \
++am__objects_28 = src/debug.lo src/prep_cif.lo src/types.lo \
src/raw_api.lo src/java_raw_api.lo src/closures.lo
--am_libffi_convenience_la_OBJECTS = $(am__objects_26)
--am__objects_27 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \
-+am_libffi_convenience_la_OBJECTS = $(am__objects_27)
-+am__objects_28 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \
+-am_libffi_convenience_la_OBJECTS = $(am__objects_27)
+-am__objects_28 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \
++am_libffi_convenience_la_OBJECTS = $(am__objects_28)
++am__objects_29 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \
$(am__objects_4) $(am__objects_5) $(am__objects_6) \
$(am__objects_7) $(am__objects_8) $(am__objects_9) \
$(am__objects_10) $(am__objects_11) $(am__objects_12) \
-@@ -178,8 +180,8 @@ am__objects_27 = $(am__objects_1) $(am__
+@@ -178,8 +181,8 @@ am__objects_28 = $(am__objects_1) $(am__
$(am__objects_16) $(am__objects_17) $(am__objects_18) \
$(am__objects_19) $(am__objects_20) $(am__objects_21) \
$(am__objects_22) $(am__objects_23) $(am__objects_24) \
-- $(am__objects_25)
--nodist_libffi_convenience_la_OBJECTS = $(am__objects_27)
-+ $(am__objects_25) $(am__objects_26)
-+nodist_libffi_convenience_la_OBJECTS = $(am__objects_28)
+- $(am__objects_25) $(am__objects_26)
+-nodist_libffi_convenience_la_OBJECTS = $(am__objects_28)
++ $(am__objects_25) $(am__objects_26) $(am__objects_27)
++nodist_libffi_convenience_la_OBJECTS = $(am__objects_29)
libffi_convenience_la_OBJECTS = $(am_libffi_convenience_la_OBJECTS) \
$(nodist_libffi_convenience_la_OBJECTS)
DEFAULT_INCLUDES = -I.@am__isrc@
-@@ -297,6 +299,7 @@ ECHO_N = @ECHO_N@
+@@ -297,6 +300,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
@@ -217,7 +208,7 @@ Index: libffi/Makefile.in
FGREP = @FGREP@
GREP = @GREP@
HAVE_LONG_DOUBLE = @HAVE_LONG_DOUBLE@
-@@ -386,6 +389,7 @@ psdir = @psdir@
+@@ -386,6 +390,7 @@ psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -225,23 +216,21 @@ Index: libffi/Makefile.in
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
-@@ -399,37 +403,34 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = foreign subdir-objects
- SUBDIRS = include testsuite man
--EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
-- src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \
-- src/arm/ffi.c src/arm/sysv.S src/arm/ffitarget.h \
-- src/avr32/ffi.c src/avr32/sysv.S src/avr32/ffitarget.h \
-- src/cris/ffi.c src/cris/sysv.S src/cris/ffitarget.h \
-- src/ia64/ffi.c src/ia64/ffitarget.h src/ia64/ia64_flags.h \
+@@ -405,31 +410,27 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change
+ src/avr32/ffi.c src/avr32/sysv.S src/avr32/ffitarget.h \
+ src/cris/ffi.c src/cris/sysv.S src/cris/ffitarget.h \
+ src/ia64/ffi.c src/ia64/ffitarget.h src/ia64/ia64_flags.h \
- src/ia64/unix.S \
- src/mips/ffi.c src/mips/n32.S src/mips/o32.S \
- src/mips/ffitarget.h \
- src/m32r/ffi.c src/m32r/sysv.S src/m32r/ffitarget.h \
- src/m68k/ffi.c src/m68k/sysv.S src/m68k/ffitarget.h \
- src/powerpc/ffi.c src/powerpc/sysv.S \
-- src/powerpc/linux64.S src/powerpc/linux64_closure.S \
++ src/ia64/unix.S src/mips/ffi.c src/mips/n32.S src/mips/o32.S \
++ src/mips/ffitarget.h src/m32r/ffi.c src/m32r/sysv.S \
++ src/m32r/ffitarget.h src/m68k/ffi.c src/m68k/sysv.S \
++ src/m68k/ffitarget.h src/powerpc/ffi.c src/powerpc/sysv.S \
+ src/powerpc/linux64.S src/powerpc/linux64_closure.S \
- src/powerpc/ppc_closure.S src/powerpc/asm.h \
- src/powerpc/aix.S src/powerpc/darwin.S \
- src/powerpc/aix_closure.S src/powerpc/darwin_closure.S \
@@ -251,8 +240,16 @@ Index: libffi/Makefile.in
- src/sh64/ffi.c src/sh64/sysv.S src/sh64/ffitarget.h \
- src/sparc/v8.S 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/win64.S \
-- src/x86/darwin.S src/x86/freebsd.S \
++ src/powerpc/ppc_closure.S src/powerpc/asm.h src/powerpc/aix.S \
++ src/powerpc/darwin.S src/powerpc/aix_closure.S \
++ src/powerpc/darwin_closure.S src/powerpc/ffi_darwin.c \
++ src/powerpc/ffitarget.h src/s390/ffi.c src/s390/sysv.S \
++ src/s390/ffitarget.h src/sh/ffi.c src/sh/sysv.S \
++ src/sh/ffitarget.h src/sh64/ffi.c src/sh64/sysv.S \
++ src/sh64/ffitarget.h src/sparc/v8.S 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/ffitarget.h \
- src/pa/ffitarget.h src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S \
- src/frv/ffi.c src/frv/eabi.S src/frv/ffitarget.h \
@@ -260,51 +257,31 @@ Index: libffi/Makefile.in
- src/moxie/ffi.c src/moxie/eabi.S \
- libtool-version ChangeLog.libffi m4/libtool.m4 \
- m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4
-+EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
-+ src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \
-+ src/arm/ffi.c src/arm/sysv.S src/arm/trampoline.S \
-+ src/arm/ffitarget.h src/avr32/ffi.c src/avr32/sysv.S \
-+ src/avr32/ffitarget.h src/cris/ffi.c src/cris/sysv.S \
-+ src/cris/ffitarget.h src/ia64/ffi.c src/ia64/ffitarget.h \
-+ src/ia64/ia64_flags.h src/ia64/unix.S src/mips/ffi.c \
-+ src/mips/n32.S src/mips/o32.S src/mips/ffitarget.h \
-+ src/m32r/ffi.c src/m32r/sysv.S src/m32r/ffitarget.h \
-+ src/m68k/ffi.c src/m68k/sysv.S src/m68k/ffitarget.h \
-+ src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/linux64.S \
-+ src/powerpc/linux64_closure.S src/powerpc/ppc_closure.S \
-+ src/powerpc/asm.h src/powerpc/aix.S src/powerpc/darwin.S \
-+ src/powerpc/aix_closure.S src/powerpc/darwin_closure.S \
-+ src/powerpc/ffi_darwin.c src/powerpc/ffitarget.h \
-+ src/s390/ffi.c src/s390/sysv.S src/s390/ffitarget.h \
-+ src/sh/ffi.c src/sh/sysv.S src/sh/ffitarget.h src/sh64/ffi.c \
-+ src/sh64/sysv.S src/sh64/ffitarget.h src/sparc/v8.S \
-+ 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/win64.S src/x86/darwin.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/frv/eabi.S \
-+ src/frv/ffitarget.h src/dlmalloc.c src/moxie/ffi.c \
-+ src/moxie/eabi.S libtool-version ChangeLog.libffi \
-+ m4/libtool.m4 m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 \
-+ m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh
++ src/x86/win64.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/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \
++ src/moxie/ffi.c src/moxie/eabi.S libtool-version \
++ ChangeLog.libffi m4/libtool.m4 m4/lt~obsolete.m4 \
++ m4/ltoptions.m4 m4/ltsugar.m4
info_TEXINFOS = doc/libffi.texi
-@@ -488,10 +489,10 @@ nodist_libffi_la_SOURCES = $(am__append_
+@@ -488,10 +489,11 @@ nodist_libffi_la_SOURCES = $(am__append_
$(am__append_15) $(am__append_16) $(am__append_17) \
$(am__append_18) $(am__append_19) $(am__append_20) \
$(am__append_21) $(am__append_22) $(am__append_23) \
-- $(am__append_24) $(am__append_25)
-+ $(am__append_24) $(am__append_25) $(am__append_26)
+- $(am__append_24) $(am__append_25) $(am__append_26)
++ $(am__append_24) $(am__append_25) $(am__append_26) \
++ $(am__append_27)
libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
--AM_CFLAGS = -Wall -g -fexceptions $(am__append_26) $(am__append_27)
-+AM_CFLAGS = -Wall -g -fexceptions $(am__append_27) $(am__append_28)
+-AM_CFLAGS = -Wall -g -fexceptions $(am__append_27) $(am__append_28)
++AM_CFLAGS = -Wall -g -fexceptions $(am__append_28) $(am__append_29)
libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS)
AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
AM_CCASFLAGS = $(AM_CPPFLAGS)
-@@ -727,6 +728,8 @@ src/arm/sysv.lo: src/arm/$(am__dirstamp)
+@@ -727,6 +729,8 @@ src/arm/sysv.lo: src/arm/$(am__dirstamp)
src/arm/$(DEPDIR)/$(am__dirstamp)
src/arm/ffi.lo: src/arm/$(am__dirstamp) \
src/arm/$(DEPDIR)/$(am__dirstamp)
@@ -313,7 +290,7 @@ Index: libffi/Makefile.in
src/avr32/$(am__dirstamp):
@$(MKDIR_P) src/avr32
@: > src/avr32/$(am__dirstamp)
-@@ -814,6 +817,8 @@ mostlyclean-compile:
+@@ -824,6 +828,8 @@ mostlyclean-compile:
-rm -f src/arm/ffi.lo
-rm -f src/arm/sysv.$(OBJEXT)
-rm -f src/arm/sysv.lo
@@ -322,7 +299,7 @@ Index: libffi/Makefile.in
-rm -f src/avr32/ffi.$(OBJEXT)
-rm -f src/avr32/ffi.lo
-rm -f src/avr32/sysv.$(OBJEXT)
-@@ -932,6 +937,7 @@ distclean-compile:
+@@ -946,6 +952,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@src/alpha/$(DEPDIR)/osf.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/arm/$(DEPDIR)/ffi.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/arm/$(DEPDIR)/sysv.Plo@am__quote@
@@ -330,11 +307,19 @@ Index: libffi/Makefile.in
@AMDEP_TRUE@@am__include@ @am__quote@src/avr32/$(DEPDIR)/ffi.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/avr32/$(DEPDIR)/sysv.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/cris/$(DEPDIR)/ffi.Plo@am__quote@
+@@ -1813,6 +1820,7 @@ uninstall-am: uninstall-dvi-am uninstall
+ uninstall-info-am uninstall-libLTLIBRARIES uninstall-pdf-am \
+ uninstall-pkgconfigDATA uninstall-ps-am
+
++ m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh
+
+ # No install-html or install-pdf support in automake yet
+ .PHONY: install-html install-pdf
Index: libffi/configure.ac
===================================================================
--- libffi.orig/configure.ac
+++ libffi/configure.ac
-@@ -328,13 +328,23 @@ if test x$TARGET = xX86_WIN64; then
+@@ -322,13 +322,23 @@ if test x$TARGET = xX86_WIN64; then
fi
fi
@@ -384,9 +369,9 @@ Index: libffi/src/arm/ffi.c
ARM Foreign Function Interface
-@@ -337,6 +338,220 @@ ffi_prep_incoming_args_SYSV(char *stack,
+@@ -339,6 +340,220 @@ ffi_prep_incoming_args_SYSV(char *stack,
- /* How to make a trampoline. */
+ extern unsigned int ffi_arm_trampoline[3];
+#if FFI_EXEC_TRAMPOLINE_TABLE
+
@@ -605,7 +590,7 @@ Index: libffi/src/arm/ffi.c
#define FFI_INIT_TRAMPOLINE(TRAMP,FUN,CTX) \
({ unsigned char *__tramp = (unsigned char*)(TRAMP); \
unsigned int __fun = (unsigned int)(FUN); \
-@@ -353,6 +568,7 @@ ffi_prep_incoming_args_SYSV(char *stack,
+@@ -353,6 +568,7 @@ extern unsigned int ffi_arm_trampoline[3
mapping. */ \
})
@@ -703,7 +688,7 @@ Index: libffi/src/arm/sysv.S
UNWIND .fnstart
.endm
#endif
-@@ -141,8 +164,7 @@ _L__\name:
+@@ -141,8 +164,7 @@ _L__\name:
#endif
.endm
View Lorry Controller Status