Add workaround for a linker bug (and a test case).

[cycript.git] / libffi.sh

diff --git a/libffi.sh b/libffi.sh
index ab4f50e1f719488ae1fba1b6490910dec0b31ac3..ac980dfc143513dd499bb3fbac9f6d1dffdfba4c 100755 (executable)
--- a/libffi.sh
+++ b/libffi.sh
@@ -38,25 +38,37 @@ function arch() {
     archs+=("${arch}")
     mkdir "libffi.${arch}"
 
-    flags="-isysroot ${isysroot} -m${os}-version-min=${min}"
+    flags=()
+    flags+=(-isysroot "${isysroot}")
+    flags+=(-m${os}-version-min="${min}")
+    flags+=(-no-integrated-as)
+    flags+=(-fno-stack-protector)
+    flags+=(-O3 -g3)
+
+    if [[ ${arch} == arm* && ${arch} != arm64 ]]; then
+        flags+=(-mthumb)
+    fi
 
     cd "libffi.${arch}"
-    CC="clang -arch ${arch}" CFLAGS="-no-integrated-as ${flags}" CPPFLAGS="${flags}" ../libffi/configure --host="${host}"
+    CC="clang -arch ${arch}" CFLAGS="${flags[*]}" CPPFLAGS="${flags[*]} $*" ../libffi/configure --host="${host}"
     make
     cd ..
 }
 
-arch armv6 arm-apple-darwin10 iphoneos iphoneos 2.0
+arch armv6 arm-apple-darwin10 iphoneos iphoneos 2.0 -mllvm -arm-reserve-r9
 arch armv7 arm-apple-darwin10 iphoneos iphoneos 2.0
 arch armv7s arm-apple-darwin10 iphoneos iphoneos 2.0
-arch arm64 aarch64-apple-darwin10 iphoneos iphoneos 2.0
+arch arm64 aarch64-apple-darwin11 iphoneos iphoneos 2.0
 
 arch i386 i386-apple-darwin10 iphonesimulator ios-simulator 4.0
-arch x86_64 x86_64-apple-darwin10 iphonesimulator ios-simulator 4.0
+arch x86_64 x86_64-apple-darwin11 iphonesimulator ios-simulator 4.0
 
 libffi=()
 for arch in "${archs[@]}"; do
-    libffi+=(libffi."${arch}"/.libs/libffi.a)
+    a=libffi."${arch}"/.libs/libffi.a
+    # sectionForAddress(...) address not in any section file '...' for architecture i386
+    ar m "${a}" src/prep_cif.o
+    libffi+=("${a}")
 done
 
 lipo -create -output libffi.a "${libffi[@]}"