diff options
Diffstat (limited to 'data/libffi')
| -rw-r--r-- | data/libffi/_metadata/in.1443.00 | 0 | ||||
| l--------- | data/libffi/_metadata/maintainer | 2 | ||||
| -rw-r--r-- | data/libffi/_metadata/version | 2 | ||||
| -rw-r--r-- | data/libffi/assembler.diff | 25 | ||||
| -rw-r--r-- | data/libffi/cname.diff | 30 | ||||
| -rw-r--r-- | data/libffi/debug.diff | 24 | ||||
| -rw-r--r-- | data/libffi/includes.diff | 22 | ||||
| -rw-r--r-- | data/libffi/incompetant.diff | 75 | ||||
| -rw-r--r-- | data/libffi/libffi-3.0.10.tar.gz | bin | 753346 -> 0 bytes | |||
| -rw-r--r-- | data/libffi/libffi-3.2.1.tar.gz | bin | 0 -> 940837 bytes | |||
| -rw-r--r-- | data/libffi/make.sh | 4 |
11 files changed, 46 insertions, 138 deletions
diff --git a/data/libffi/_metadata/in.1443.00 b/data/libffi/_metadata/in.1443.00 new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/data/libffi/_metadata/in.1443.00 diff --git a/data/libffi/_metadata/maintainer b/data/libffi/_metadata/maintainer index 0fa66e077..573d7ebef 120000 --- a/data/libffi/_metadata/maintainer +++ b/data/libffi/_metadata/maintainer @@ -1 +1 @@ -../../../people/saurik
\ No newline at end of file +../../../people/sbingner
\ No newline at end of file diff --git a/data/libffi/_metadata/version b/data/libffi/_metadata/version index 4c45776d3..08ebb261e 100644 --- a/data/libffi/_metadata/version +++ b/data/libffi/_metadata/version @@ -1 +1 @@ -1:3.0.10 +1:3.2.1 diff --git a/data/libffi/assembler.diff b/data/libffi/assembler.diff index 415a85d56..344d7efc6 100644 --- a/data/libffi/assembler.diff +++ b/data/libffi/assembler.diff @@ -1,17 +1,17 @@ -diff -ru libffi-3.0.10/src/arm/sysv.S libffi-3.0.10+iPhone/src/arm/sysv.S ---- libffi-3.0.10/src/arm/sysv.S 2011-08-23 14:27:24.000000000 +0000 -+++ libffi-3.0.10+iPhone/src/arm/sysv.S 2012-03-18 22:32:12.000000000 +0000 -@@ -335,7 +335,9 @@ - - /* Below are VFP hard-float ABI call and closure implementations. - Add VFP FPU directive here. */ +diff -ur libffi-3.2.1/src/arm/sysv.S libffi-3.2.1+iPhone/src/arm/sysv.S +--- libffi-3.2.1/src/arm/sysv.S 2014-11-08 02:47:24.000000000 -1000 ++++ libffi-3.2.1+iPhone/src/arm/sysv.S 2019-03-30 22:41:22.000000000 -1000 +@@ -322,7 +322,9 @@ + Add VFP FPU directive here. This is only compiled into the library + under EABI. */ + #ifdef __ARM_EABI__ +#ifndef __APPLE__ .fpu vfp +#endif @ r0: fn @ r1: &ecif -@@ -428,7 +430,9 @@ +@@ -416,7 +418,9 @@ .ffi_call_VFP_end: UNWIND .fnend @@ -20,14 +20,15 @@ diff -ru libffi-3.0.10/src/arm/sysv.S libffi-3.0.10+iPhone/src/arm/sysv.S +#endif - ARM_FUNC_START ffi_closure_VFP -@@ -490,7 +494,9 @@ + ARM_FUNC_START(ffi_closure_VFP) +@@ -478,8 +482,10 @@ .ffi_closure_VFP_end: UNWIND .fnend +#ifdef __ELF__ .size CNAME(ffi_closure_VFP),.ffi_closure_VFP_end-CNAME(ffi_closure_VFP) + #endif +#endif - #if defined __ELF__ && defined __linux__ - .section .note.GNU-stack,"",%progbits + ENTRY(ffi_arm_trampoline) + stmfd sp!, {r0-r3} diff --git a/data/libffi/cname.diff b/data/libffi/cname.diff deleted file mode 100644 index bfa2419b5..000000000 --- a/data/libffi/cname.diff +++ /dev/null @@ -1,30 +0,0 @@ -diff -ru libffi-3.0.10/src/arm/sysv.S libffi-3.0.10+iPhone/src/arm/sysv.S ---- libffi-3.0.10/src/arm/sysv.S 2011-08-23 14:27:24.000000000 +0000 -+++ libffi-3.0.10+iPhone/src/arm/sysv.S 2012-03-18 23:31:44.000000000 +0000 -@@ -187,7 +187,7 @@ - @ r1 already set - - @ Call ffi_prep_args(stack, &ecif) -- bl ffi_prep_args -+ bl CNAME(ffi_prep_args) - - @ move first 4 parameters in registers - ldmia sp, {r0-r3} -@@ -362,7 +362,7 @@ - sub r2, fp, #64 @ VFP scratch space - - @ Call ffi_prep_args(stack, &ecif, vfp_space) -- bl ffi_prep_args -+ bl CNAME(ffi_prep_args) - - @ Load VFP register args if needed - cmp r0, #0 -@@ -444,7 +444,7 @@ - sub sp, sp, #72 - str sp, [sp, #64] - add r1, sp, #64 -- bl ffi_closure_SYSV_inner -+ bl CNAME(ffi_closure_SYSV_inner) - - cmp r0, #FFI_TYPE_INT - beq .Lretint_vfp diff --git a/data/libffi/debug.diff b/data/libffi/debug.diff deleted file mode 100644 index bf33daa01..000000000 --- a/data/libffi/debug.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru libffi-3.0.10/Makefile.am libffi-3.0.10+iPhone/Makefile.am ---- libffi-3.0.10/Makefile.am 2011-08-23 14:28:04.000000000 +0000 -+++ libffi-3.0.10+iPhone/Makefile.am 2012-03-19 00:29:07.000000000 +0000 -@@ -178,7 +178,7 @@ - libffi_convenience_la_SOURCES = $(libffi_la_SOURCES) - nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) - --AM_CFLAGS = -g -+AM_CFLAGS = - if FFI_DEBUG - # Build debug. Define FFI_DEBUG on the commandline so that, when building with - # MSVC, it can link against the debug CRT. -diff -ru libffi-3.0.10/Makefile.in libffi-3.0.10+iPhone/Makefile.in ---- libffi-3.0.10/Makefile.in 2011-08-23 14:28:35.000000000 +0000 -+++ libffi-3.0.10+iPhone/Makefile.in 2012-03-19 00:29:18.000000000 +0000 -@@ -501,7 +501,7 @@ - $(am__append_24) $(am__append_25) $(am__append_26) - libffi_convenience_la_SOURCES = $(libffi_la_SOURCES) - nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) --AM_CFLAGS = -g $(am__append_27) -+AM_CFLAGS = $(am__append_27) - 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) diff --git a/data/libffi/includes.diff b/data/libffi/includes.diff new file mode 100644 index 000000000..4a3f999b7 --- /dev/null +++ b/data/libffi/includes.diff @@ -0,0 +1,22 @@ +diff -ur libffi-3.2.1/include/Makefile.am libffi-3.2.1+Sane/include/Makefile.am +--- libffi-3.2.1/include/Makefile.am 2014-11-08 02:47:24.000000000 -1000 ++++ libffi-3.2.1+Sane/include/Makefile.am 2018-08-14 10:09:46.000000000 -1000 +@@ -5,5 +5,4 @@ + DISTCLEANFILES=ffitarget.h + EXTRA_DIST=ffi.h.in ffi_common.h + +-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include +-nodist_includes_HEADERS = ffi.h ffitarget.h ++nodist_include_HEADERS = ffi.h ffitarget.h +diff -ur libffi-3.2.1/libffi.pc.in libffi-3.2.1+Sane/libffi.pc.in +--- libffi-3.2.1/libffi.pc.in 2014-11-08 02:47:24.000000000 -1000 ++++ libffi-3.2.1+Sane/libffi.pc.in 2018-08-14 10:10:11.000000000 -1000 +@@ -2,7 +2,7 @@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ + toolexeclibdir=@toolexeclibdir@ +-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include ++includedir=@includedir@ + + Name: @PACKAGE_NAME@ + Description: Library supporting Foreign Function Interfaces diff --git a/data/libffi/incompetant.diff b/data/libffi/incompetant.diff index 3245f3077..9f33cc57d 100644 --- a/data/libffi/incompetant.diff +++ b/data/libffi/incompetant.diff @@ -1,68 +1,7 @@ -diff -ru libffi-3.0.10/include/ffi.h.in libffi-3.0.10+iPhone/include/ffi.h.in ---- libffi-3.0.10/include/ffi.h.in 2011-08-23 14:28:00.000000000 +0000 -+++ libffi-3.0.10+iPhone/include/ffi.h.in 2012-03-18 23:19:19.000000000 +0000 -@@ -274,7 +274,16 @@ - __declspec(align(8)) - #endif - typedef struct { -+union { -+#if @FFI_EXEC_TRAMPOLINE_TABLE@ -+ struct { -+ void *trampoline_table; -+ void *trampoline_table_entry; -+ }; -+#endif - char tramp[FFI_TRAMPOLINE_SIZE]; -+}; -+ - ffi_cif *cif; - void (*fun)(ffi_cif*,void*,void**,void*); - void *user_data; -@@ -307,7 +316,15 @@ - # pragma pack 8 - #endif - typedef struct { -+union { -+#if @FFI_EXEC_TRAMPOLINE_TABLE@ -+ struct { -+ void *trampoline_table; -+ void *trampoline_table_entry; -+ }; -+#endif - char tramp[FFI_TRAMPOLINE_SIZE]; -+}; - - ffi_cif *cif; - -@@ -328,7 +345,15 @@ - } ffi_raw_closure; - - typedef struct { -+union { -+#if @FFI_EXEC_TRAMPOLINE_TABLE@ -+ struct { -+ void *trampoline_table; -+ void *trampoline_table_entry; -+ }; -+#endif - char tramp[FFI_TRAMPOLINE_SIZE]; -+}; - - ffi_cif *cif; - -diff -ru libffi-3.0.10/libtool-version libffi-3.0.10+iPhone/libtool-version ---- libffi-3.0.10/libtool-version 2011-08-22 18:38:12.000000000 +0000 -+++ libffi-3.0.10+iPhone/libtool-version 2012-03-18 23:08:29.000000000 +0000 -@@ -26,4 +26,4 @@ - # release, then set age to 0. - # - # CURRENT:REVISION:AGE --5:10:0 -+4:1:0 -diff -ru libffi-3.0.10/src/arm/ffi.c libffi-3.0.10+iPhone/src/arm/ffi.c ---- libffi-3.0.10/src/arm/ffi.c 2011-08-23 14:28:04.000000000 +0000 -+++ libffi-3.0.10+iPhone/src/arm/ffi.c 2012-03-18 23:15:50.000000000 +0000 -@@ -552,7 +552,7 @@ +diff -ur libffi-3.2.1/src/arm/ffi.c libffi-3.2.1+iPhone/src/arm/ffi.c +--- libffi-3.2.1/src/arm/ffi.c 2014-11-08 02:47:24.000000000 -1000 ++++ libffi-3.2.1+iPhone/src/arm/ffi.c 2019-03-30 22:46:09.000000000 -1000 +@@ -749,7 +749,7 @@ free (closure); } @@ -71,7 +10,7 @@ diff -ru libffi-3.0.10/src/arm/ffi.c libffi-3.0.10+iPhone/src/arm/ffi.c #define FFI_INIT_TRAMPOLINE(TRAMP,FUN,CTX) \ ({ unsigned char *__tramp = (unsigned char*)(TRAMP); \ -@@ -570,8 +570,6 @@ +@@ -765,8 +765,6 @@ mapping. */ \ }) @@ -80,9 +19,9 @@ diff -ru libffi-3.0.10/src/arm/ffi.c libffi-3.0.10+iPhone/src/arm/ffi.c /* the cif must already be prep'ed */ ffi_status -@@ -591,13 +589,19 @@ +@@ -788,13 +786,19 @@ return FFI_BAD_ABI; - + #if FFI_EXEC_TRAMPOLINE_TABLE +if (closure != codeloc) { void **config = FFI_TRAMPOLINE_CODELOC_CONFIG(codeloc); diff --git a/data/libffi/libffi-3.0.10.tar.gz b/data/libffi/libffi-3.0.10.tar.gz Binary files differdeleted file mode 100644 index 3c44c6609..000000000 --- a/data/libffi/libffi-3.0.10.tar.gz +++ /dev/null diff --git a/data/libffi/libffi-3.2.1.tar.gz b/data/libffi/libffi-3.2.1.tar.gz Binary files differnew file mode 100644 index 000000000..5c21bb012 --- /dev/null +++ b/data/libffi/libffi-3.2.1.tar.gz diff --git a/data/libffi/make.sh b/data/libffi/make.sh index 39dd00bfc..06a51d34b 100644 --- a/data/libffi/make.sh +++ b/data/libffi/make.sh @@ -1,6 +1,6 @@ pkg:setup +autoreconf -f -i pkg:configure pkg:make pkg:install -mv "${PKG_DEST}"/usr/lib/libffi-*/include "${PKG_DEST}"/usr -rmdir "${PKG_DEST}"/usr/lib/libffi-* +pkg: rm -rvf /usr/share |