From: Jay Freeman (saurik) <saurik@saurik.com>
Date: Wed, 11 Nov 2015 00:24:16 +0000 (-0800)
Subject: Try harder to use trampoline tables (for iOS 9.0).
X-Git-Tag: v0.9.504~5
X-Git-Url: https://git.saurik.com/cycript.git/commitdiff_plain/26ff3bc237a78a791560d4872e276e9f6a0cb3ed

Try harder to use trampoline tables (for iOS 9.0).
---

diff --git a/apple-libffi.sh b/apple-libffi.sh
index 4c99e1c..c20b5ba 100755
--- a/apple-libffi.sh
+++ b/apple-libffi.sh
@@ -41,7 +41,7 @@ function arch() {
     flags=()
     flags+=(-isysroot "${isysroot}")
     flags+=(-m${os}-version-min="${min}")
-    flags+=(-no-integrated-as)
+    flags+=(-DPAGE_MAX_SIZE=16384 -DPAGE_MAX_SHIFT=14)
     flags+=(-fno-stack-protector)
     flags+=(-O3 -g3)
 
@@ -50,7 +50,7 @@ function arch() {
     fi
 
     cd "libffi.${arch}"
-    CC="clang -arch ${arch}" CFLAGS="${flags[*]}" CPPFLAGS="${flags[*]} $*" ../libffi/configure --host="${host}"
+    CC="clang -arch ${arch}" CXX="clang++ -arch ${arch}" CFLAGS="${flags[*]}" CPPFLAGS="${flags[*]} $*" ../libffi/configure --host="${host}"
     make
     cd ..
 }
diff --git a/libffi b/libffi
index 91ad74f..1d903c8 160000
--- a/libffi
+++ b/libffi
@@ -1 +1 @@
-Subproject commit 91ad74f13b186aa23c00d5fea7658e9abb243543
+Subproject commit 1d903c83f0869ba96f0e87078688ac44b6ec9d42