diff options
| author | Memphiz <memphis@machzwo.de> | 2015-12-21 10:09:57 +0100 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2016-01-06 15:52:06 +0100 |
| commit | 209334357e2d2d5093ab3c6829892bce0100a68b (patch) | |
| tree | 82514e4f1469f7c787f27371517be3b6c9884b5c | |
| parent | 9f4a138dbb2d794cddb19f9814b067044f842fab (diff) | |
[depends/libffi] - version bump to 3.2.1 and fixed compilation for arm64
| -rw-r--r-- | tools/depends/target/libffi/01_ios_arm_align_fix.patch | 21 | ||||
| -rw-r--r-- | tools/depends/target/libffi/Makefile | 5 |
2 files changed, 3 insertions, 23 deletions
diff --git a/tools/depends/target/libffi/01_ios_arm_align_fix.patch b/tools/depends/target/libffi/01_ios_arm_align_fix.patch deleted file mode 100644 index 6a1aeb38d8..0000000000 --- a/tools/depends/target/libffi/01_ios_arm_align_fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru iphoneos5.1_armv7-target/src/arm/sysv.S iphoneos5.1_armv7-target.patched/src/arm/sysv.S ---- src/arm/sysv.S 2012-04-12 10:46:06.000000000 +0800 -+++ src/arm/sysv.S 2013-03-15 09:43:06.000000000 +0800 -@@ -113,7 +113,7 @@ - #if defined(__thumb__) && !defined(__THUMB_INTERWORK__) - .macro ARM_FUNC_START name - .text -- .align 0 -+ .align 2 - .thumb - .thumb_func - #ifdef __APPLE__ -@@ -136,7 +136,7 @@ - #else - .macro ARM_FUNC_START name - .text -- .align 0 -+ .align 2 - .arm - #ifdef __APPLE__ - ENTRY($0) diff --git a/tools/depends/target/libffi/Makefile b/tools/depends/target/libffi/Makefile index fa4ee815bf..1f7fcb9d6e 100644 --- a/tools/depends/target/libffi/Makefile +++ b/tools/depends/target/libffi/Makefile @@ -3,15 +3,17 @@ DEPS= ../../Makefile.include Makefile # lib name, version LIBNAME=libffi -VERSION=3.0.11 +VERSION=3.2.1 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz # configuration settings CONFIGURE= ./configure --prefix=$(PREFIX) --disable-shared --disable-builddir ifeq ($(OS), ios) +ifneq ($(CPU), arm64) CONFIGURE+=CCASFLAGS=-no-integrated-as endif +endif LIBDYLIB=$(PLATFORM)/.libs/$(LIBNAME).a @@ -24,7 +26,6 @@ $(TARBALLS_LOCATION)/$(ARCHIVE): $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) rm -rf $(PLATFORM); mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - cd $(PLATFORM); patch -p0 < ../01_ios_arm_align_fix.patch cd $(PLATFORM); $(CONFIGURE) $(LIBDYLIB): $(PLATFORM) |