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.
This commit is contained in:
H.J. Lu 2021-07-05 14:15:04 -07:00
parent ddd25bd1a7
commit 506f337ad2
1 changed files with 7 additions and 14 deletions

View File

@ -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