* [PATCH] libffi/x86: Always check __x86_64__ for x86 hosts
@ 2021-07-06 1:00 H.J. Lu
2021-07-09 16:31 ` H.J. Lu
0 siblings, 1 reply; 2+ messages in thread
From: H.J. Lu @ 2021-07-06 1:00 UTC (permalink / raw)
To: gcc-patches
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.
---
libffi/configure.host | 21 +++++++--------------
1 file 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
--
2.31.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] libffi/x86: Always check __x86_64__ for x86 hosts
2021-07-06 1:00 [PATCH] libffi/x86: Always check __x86_64__ for x86 hosts H.J. Lu
@ 2021-07-09 16:31 ` H.J. Lu
0 siblings, 0 replies; 2+ messages in thread
From: H.J. Lu @ 2021-07-09 16:31 UTC (permalink / raw)
To: GCC Patches, Jakub Jelinek, Jeff Law
On Mon, Jul 5, 2021 at 6:00 PM H.J. Lu <hjl.tools@gmail.com> wrote:
>
> 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.
> ---
> libffi/configure.host | 21 +++++++--------------
> 1 file 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
> --
> 2.31.1
>
This has been fixed in upstream with
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.
I will check it in if there are no objections.
--
H.J.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-09 16:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-06 1:00 [PATCH] libffi/x86: Always check __x86_64__ for x86 hosts H.J. Lu
2021-07-09 16:31 ` H.J. Lu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).