diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2021-07-05 14:15:04 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2021-07-09 14:30:58 -0700 |
| commit | 506f337ad2d75c0feceaaf28fd4997c157979956 (patch) | |
| tree | 38a84cbb42c0e164ace901caa5e59cfbc8792914 /libffi | |
| parent | ddd25bd1a7c8f456bc914e34b77d43f39a1062d4 (diff) | |
libffi/x86: Always check __x86_64__ for x86 hosts
The upstream libffi has
commit cb8474368cdef3207638d047bd6c707ad8fcb339
Author: hjl-tools <hjl.tools@gmail.com>
Date: Wed Dec 2 12:52:12 2020 -0800
libffi/x86: Always check __x86_64__ for x32 hosts (#601) (#602)
Since for x86_64-*x32 and x86_64-x32-* hosts, -m32 generates ia32 codes.
We should always check __x86_64__ for x32 hosts.
Since for gnux32 hosts, -m32 generates i386 codes, always check __x86_64__
for x86 hosts.
PR libffi/101336
* configure.host: Always check __x86_64__ for x86 hosts.
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/configure.host | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/libffi/configure.host b/libffi/configure.host index 786b32c5bb0..7248acb7458 100644 --- a/libffi/configure.host +++ b/libffi/configure.host @@ -95,20 +95,13 @@ case "${host}" in i?86-*-* | x86_64-*-* | amd64-*) TARGETDIR=x86 if test $ac_cv_sizeof_size_t = 4; then - case "$host" in - *-gnux32) - TARGET=X86_64 - ;; - *) - 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 + 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.* else TARGET=X86_64; fi |