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

[cycript.git] / libffi.sh

diff --git a/libffi.sh b/libffi.sh
index 1d13f9b58c6e2fff82914f20dc6b282f54f52a56..ac980dfc143513dd499bb3fbac9f6d1dffdfba4c 100755 (executable)
--- a/libffi.sh
+++ b/libffi.sh
@@ -45,13 +45,17 @@ function arch() {
     flags+=(-fno-stack-protector)
     flags+=(-O3 -g3)
 
     flags+=(-fno-stack-protector)
     flags+=(-O3 -g3)
 

+    if [[ ${arch} == arm* && ${arch} != arm64 ]]; then
+        flags+=(-mthumb)
+    fi
+

     cd "libffi.${arch}"
     cd "libffi.${arch}"

-    CC="clang -arch ${arch}" CFLAGS="${flags[*]}" CPPFLAGS="${flags[*]}" ../libffi/configure --host="${host}"
+    CC="clang -arch ${arch}" CFLAGS="${flags[*]}" CPPFLAGS="${flags[*]} $*" ../libffi/configure --host="${host}"

     make
     cd ..
 }
 
     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-darwin11 iphoneos iphoneos 2.0
 arch armv7 arm-apple-darwin10 iphoneos iphoneos 2.0
 arch armv7s arm-apple-darwin10 iphoneos iphoneos 2.0
 arch arm64 aarch64-apple-darwin11 iphoneos iphoneos 2.0


@@ -61,7 +65,10 @@ arch x86_64 x86_64-apple-darwin11 iphonesimulator ios-simulator 4.0
 
 libffi=()
 for arch in "${archs[@]}"; do
 
 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[@]}"
 done
 
 lipo -create -output libffi.a "${libffi[@]}"