[tools/depends][target] bump libffi 3.4.2

4 files changed, 7 insertions, 67 deletions

diff --git a/tools/depends/target/libffi/LIBFFI-VERSION b/tools/depends/target/libffi/LIBFFI-VERSION
new file mode 100644
index 0000000000..9d1e722692
--- /dev/null
+++ b/tools/depends/target/libffi/LIBFFI-VERSION
@@ -0,0 +1,4 @@
+LIBNAME=libffi
+VERSION=3.4.2
+ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
+SHA512=31bad35251bf5c0adb998c88ff065085ca6105cf22071b9bd4b5d5d69db4fadf16cadeec9baca944c4bb97b619b035bb8279de8794b922531fddeb0779eb7fb1
diff --git a/tools/depends/target/libffi/Makefile b/tools/depends/target/libffi/Makefile
index 126f3e3985..713fb08ec1 100644
--- a/tools/depends/target/libffi/Makefile
+++ b/tools/depends/target/libffi/Makefile
@@ -1,27 +1,16 @@
-include ../../Makefile.include
-DEPS = ../../Makefile.include Makefile armAssembler.patch ../../download-files.include
-
-# lib name, version
-LIBNAME=libffi
-VERSION=3.2.1
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
-SHA512=980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
-include ../../download-files.include
+include ../../Makefile.include LIBFFI-VERSION ../../download-files.include
+DEPS = ../../Makefile.include Makefile LIBFFI-VERSION ../../download-files.include
 
 # configuration settings
 CONFIGURE= ./configure --prefix=$(PREFIX) --disable-shared --disable-builddir
 
-
 LIBDYLIB=$(PLATFORM)/.libs/$(LIBNAME).a
 
 all: .installed-$(PLATFORM)
 
-
 $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) $(DEPS)
 	rm -rf $(PLATFORM); mkdir -p $(PLATFORM)
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	cd $(PLATFORM); patch -p1 -i ../armAssembler.patch
 	cd $(PLATFORM); $(CONFIGURE)
 
 $(LIBDYLIB): $(PLATFORM)
@@ -30,8 +19,6 @@ $(LIBDYLIB): $(PLATFORM)
 
 .installed-$(PLATFORM): $(LIBDYLIB)
 	$(MAKE) -C $(PLATFORM) install
-	mkdir -p $(PREFIX)/include/ffi
-	cp $(PREFIX)/lib/$(SOURCE)/include/* $(PREFIX)/include/ffi/
 	touch $@
 
 clean:
diff --git a/tools/depends/target/libffi/armAssembler.patch b/tools/depends/target/libffi/armAssembler.patch
deleted file mode 100644
index 1165adac18..0000000000
--- a/tools/depends/target/libffi/armAssembler.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/src/arm/sysv.S
-+++ b/src/arm/sysv.S
-@@ -360,7 +360,7 @@
- 	cmp	r0, #3
- 	sub	ip, fp, #64
- 	flddle	d0, [ip]
--	fldmiadgt	ip, {d0-d7}
-+	vldmiagt	ip, {d0-d7}
- 
- LSYM(Lbase_args):
- 	@ move first 4 parameters in registers
-@@ -396,7 +396,7 @@
- 	beq	LSYM(Lepilogue_vfp)
- 
- 	cmp	r3, #FFI_TYPE_SINT64
--	stmeqia	r2, {r0, r1}
-+	stmiaeq	r2, {r0, r1}
- 	beq	LSYM(Lepilogue_vfp)
- 
- 	cmp	r3, #FFI_TYPE_FLOAT
-@@ -409,7 +409,7 @@
- 
- 	cmp	r3, #FFI_TYPE_STRUCT_VFP_FLOAT
- 	cmpne	r3, #FFI_TYPE_STRUCT_VFP_DOUBLE
--	fstmiadeq	r2, {d0-d3}
-+	vstmiaeq	r2, {d0-d3}
- 
- LSYM(Lepilogue_vfp):
- 	RETLDM	"r0-r3,fp"
-@@ -420,7 +420,7 @@
- 
- 
- ARM_FUNC_START(ffi_closure_VFP)
--	fstmfdd	sp!, {d0-d7}
-+	vstmdb	sp!, {d0-d7}
- 	@ r0-r3, then d0-d7
- 	UNWIND .pad #80
- 	add	ip, sp, #80
-@@ -470,10 +470,10 @@
- 	ldmia	sp, {r0, r1}
- 	b	.Lclosure_epilogue_vfp
- .Lretfloat_struct_vfp:
--	fldmiad	sp, {d0-d1}
-+	vldmia	sp, {d0-d1}
- 	b	.Lclosure_epilogue_vfp
- .Lretdouble_struct_vfp:
--	fldmiad	sp, {d0-d3}
-+	vldmia	sp, {d0-d3}
- 	b	.Lclosure_epilogue_vfp
- 
- .ffi_closure_VFP_end:
diff --git a/tools/depends/target/python3/modules.setup b/tools/depends/target/python3/modules.setup
index 972fceb535..a48241752b 100644
--- a/tools/depends/target/python3/modules.setup
+++ b/tools/depends/target/python3/modules.setup
@@ -378,7 +378,7 @@ _sqlite3 _sqlite/connection.c  \
 	-I$(prefix)/include -L$(prefix)/lib -lsqlite3 $(SQLITEDEFINES)
 
 _ctypes _ctypes/callbacks.c  _ctypes/callproc.c  _ctypes/cfield.c  _ctypes/_ctypes.c  \
-        _ctypes/malloc_closure.c  _ctypes/stgdict.c -DPy_BUILD_CORE_MODULE \
+        _ctypes/stgdict.c -DPy_BUILD_CORE_MODULE \
         -I$(prefix)/include/ffi -L$(prefix)/lib -lffi
 
 _queue _queuemodule.c -DPy_BUILD_CORE_MODULE