rc3
This commit is contained in:
Anthony Green
162
patches/ios
162
patches/ios
@@ -327,168 +327,6 @@ Index: libffi/Makefile.in
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@src/avr32/$(DEPDIR)/ffi.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@src/avr32/$(DEPDIR)/sysv.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@src/cris/$(DEPDIR)/ffi.Plo@am__quote@
|
||||
Index: libffi/configure
|
||||
===================================================================
|
||||
--- libffi.orig/configure
|
||||
+++ libffi/configure
|
||||
@@ -795,6 +795,9 @@ FFI_DEBUG_FALSE
|
||||
FFI_DEBUG_TRUE
|
||||
TARGETDIR
|
||||
TARGET
|
||||
+FFI_EXEC_TRAMPOLINE_TABLE
|
||||
+FFI_EXEC_TRAMPOLINE_TABLE_FALSE
|
||||
+FFI_EXEC_TRAMPOLINE_TABLE_TRUE
|
||||
sys_symbol_underscore
|
||||
HAVE_LONG_DOUBLE
|
||||
ALLOCA
|
||||
@@ -4783,13 +4786,13 @@ if test "${lt_cv_nm_interface+set}" = se
|
||||
else
|
||||
lt_cv_nm_interface="BSD nm"
|
||||
echo "int some_variable = 0;" > conftest.$ac_ext
|
||||
- (eval echo "\"\$as_me:4786: $ac_compile\"" >&5)
|
||||
+ (eval echo "\"\$as_me:4789: $ac_compile\"" >&5)
|
||||
(eval "$ac_compile" 2>conftest.err)
|
||||
cat conftest.err >&5
|
||||
- (eval echo "\"\$as_me:4789: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
||||
+ (eval echo "\"\$as_me:4792: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
||||
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
|
||||
cat conftest.err >&5
|
||||
- (eval echo "\"\$as_me:4792: output\"" >&5)
|
||||
+ (eval echo "\"\$as_me:4795: output\"" >&5)
|
||||
cat conftest.out >&5
|
||||
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
|
||||
lt_cv_nm_interface="MS dumpbin"
|
||||
@@ -5995,7 +5998,7 @@ ia64-*-hpux*)
|
||||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
- echo '#line 5998 "configure"' > conftest.$ac_ext
|
||||
+ echo '#line 6001 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@@ -7852,11 +7855,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
- (eval echo "\"\$as_me:7855: $lt_compile\"" >&5)
|
||||
+ (eval echo "\"\$as_me:7858: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
- echo "$as_me:7859: \$? = $ac_status" >&5
|
||||
+ echo "$as_me:7862: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@@ -8191,11 +8194,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
- (eval echo "\"\$as_me:8194: $lt_compile\"" >&5)
|
||||
+ (eval echo "\"\$as_me:8197: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
- echo "$as_me:8198: \$? = $ac_status" >&5
|
||||
+ echo "$as_me:8201: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@@ -8296,11 +8299,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
- (eval echo "\"\$as_me:8299: $lt_compile\"" >&5)
|
||||
+ (eval echo "\"\$as_me:8302: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
- echo "$as_me:8303: \$? = $ac_status" >&5
|
||||
+ echo "$as_me:8306: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@@ -8351,11 +8354,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
- (eval echo "\"\$as_me:8354: $lt_compile\"" >&5)
|
||||
+ (eval echo "\"\$as_me:8357: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
- echo "$as_me:8358: \$? = $ac_status" >&5
|
||||
+ echo "$as_me:8361: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@@ -11154,7 +11157,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
-#line 11157 "configure"
|
||||
+#line 11160 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@@ -11250,7 +11253,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
-#line 11253 "configure"
|
||||
+#line 11256 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@@ -14716,7 +14719,17 @@ _ACEOF
|
||||
fi
|
||||
fi
|
||||
|
||||
+
|
||||
+FFI_EXEC_TRAMPOLINE_TABLE=0
|
||||
case "$target" in
|
||||
+ *arm*-apple-darwin*)
|
||||
+ FFI_EXEC_TRAMPOLINE_TABLE=1
|
||||
+
|
||||
+cat >>confdefs.h <<\_ACEOF
|
||||
+#define FFI_EXEC_TRAMPOLINE_TABLE 1
|
||||
+_ACEOF
|
||||
+
|
||||
+ ;;
|
||||
*-apple-darwin10* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*)
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
@@ -14725,6 +14738,15 @@ _ACEOF
|
||||
|
||||
;;
|
||||
esac
|
||||
+ if test x$FFI_EXEC_TRAMPOLINE_TABLE = x1; then
|
||||
+ FFI_EXEC_TRAMPOLINE_TABLE_TRUE=
|
||||
+ FFI_EXEC_TRAMPOLINE_TABLE_FALSE='#'
|
||||
+else
|
||||
+ FFI_EXEC_TRAMPOLINE_TABLE_TRUE='#'
|
||||
+ FFI_EXEC_TRAMPOLINE_TABLE_FALSE=
|
||||
+fi
|
||||
+
|
||||
+
|
||||
|
||||
if test x$TARGET = xX86_64; then
|
||||
{ $as_echo "$as_me:$LINENO: checking assembler supports unwind section type" >&5
|
||||
@@ -15249,6 +15271,13 @@ Usually this means the macro was only in
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
+if test -z "${FFI_EXEC_TRAMPOLINE_TABLE_TRUE}" && test -z "${FFI_EXEC_TRAMPOLINE_TABLE_FALSE}"; then
|
||||
+ { { $as_echo "$as_me:$LINENO: error: conditional \"FFI_EXEC_TRAMPOLINE_TABLE\" was never defined.
|
||||
+Usually this means the macro was only invoked conditionally." >&5
|
||||
+$as_echo "$as_me: error: conditional \"FFI_EXEC_TRAMPOLINE_TABLE\" was never defined.
|
||||
+Usually this means the macro was only invoked conditionally." >&2;}
|
||||
+ { (exit 1); exit 1; }; }
|
||||
+fi
|
||||
if test -z "${FFI_DEBUG_TRUE}" && test -z "${FFI_DEBUG_FALSE}"; then
|
||||
{ { $as_echo "$as_me:$LINENO: error: conditional \"FFI_DEBUG\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." >&5
|
||||
Index: libffi/configure.ac
|
||||
===================================================================
|
||||
--- libffi.orig/configure.ac
|
||||
|
||||
Reference in New Issue
Block a user