aboutsummaryrefslogtreecommitdiff
path: root/libffi
diff options
context:
space:
mode:
Diffstat (limited to 'libffi')
-rw-r--r--libffi/ChangeLog5
-rw-r--r--libffi/configure.host8
2 files changed, 12 insertions, 1 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index cbdb173..1566120 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-13 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR bootstrap/64575
+ * configure.host (TARGET): Set to X86_64 if __x86_64__ is defined.
+
2015-01-12 Richard Henderson <rth@redhat.com>
PR libffi/64572
diff --git a/libffi/configure.host b/libffi/configure.host
index 90de638..e310191 100644
--- a/libffi/configure.host
+++ b/libffi/configure.host
@@ -100,7 +100,13 @@ case "${host}" in
TARGET=X86_64
;;
*)
- TARGET=X86
+ echo 'int foo (void) { return __x86_64__; }' > conftest.c
+ if $CC $CFLAGS -Werror -S conftest.c -o conftest.s > /dev/null 2>&1; then
+ TARGET=X86_64;
+ else
+ TARGET=X86;
+ fi
+ rm -f conftest.*
;;
esac
else