Dmitry V. Levin wrote:
> Thanks, I agree with this approach in general, but could you rewrite the
> test to invoke the compiler just once, please?  You can use cc_set_libc
> and cc_set_vars cases as examples.

Sure. Find it attached. Tested with various GCC versions, clang, and tcc:

$ ./config.guess
x86_64-pc-linux-gnu
$ CC="gcc-version 8.5.0 -m64" ./config.guess
x86_64-pc-linux-gnu
$ CC="gcc-version 9.4.0 -m64" ./config.guess
x86_64-pc-linux-gnu
$ CC=$HOME/inst-clang/13.0.0/bin/clang ./config.guess
x86_64-pc-linux-gnu
$ CC=$HOME/inst-tcc/0.9.27/bin/tcc ./config.guess
x86_64-pc-linux-gnu

$ CC="gcc-version 8.5.0 -m32" ./config.guess
i686-pc-linux-gnu
$ CC="gcc-version 9.4.0 -m32" ./config.guess
i686-pc-linux-gnu
$ CC=i686-linux-gnu-gcc-10 ./config.guess
i686-pc-linux-gnu
$ CC="$HOME/inst-clang/13.0.0/bin/clang -m32" ./config.guess
i686-pc-linux-gnu
$ CC=$HOME/inst-tcc/0.9.27-i386/bin/tcc ./config.guess
i686-pc-linux-gnu

$ CC="gcc-version 8.5.0 -mx32" ./config.guess
x86_64-pc-linux-gnux32
$ CC="gcc-version 9.4.0 -mx32" ./config.guess
x86_64-pc-linux-gnux32
$ CC=x86_64-linux-gnux32-gcc-10 ./config.guess
x86_64-pc-linux-gnux32

From eb9dfe3a66fa1542c8b6cf6ca668b6a7857efca2 Mon Sep 17 00:00:00 2001
From: Bruno Haible <[email protected]>
Date: Sun, 8 May 2022 19:08:08 +0200
Subject: [PATCH] config.guess (x86_64:Linux:*:*): Detect 32-bit ABI.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* config.guess (x86_64:Linux:*:*): Test for the 32-bit ABI. Don't assume that
__ILP32__ is a certain indicator for the x32 ABI; for GCC ≥ 9 it no longer is.
---
 config.guess | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/config.guess b/config.guess
index 7f76b62..9f9d4d8 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2022-01-09'
+timestamp='2022-05-08'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1151,16 +1151,28 @@ EOF
 	;;
     x86_64:Linux:*:*)
 	set_cc_for_build
+	CPU=$UNAME_MACHINE
 	LIBCABI=$LIBC
 	if test "$CC_FOR_BUILD" != no_compiler_found; then
-	    if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
-		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_X32 >/dev/null
-	    then
-		LIBCABI=${LIBC}x32
-	    fi
+	    sed 's/^	    //' << EOF > "$dummy.c"
+	    #ifdef __i386__
+	    ABI=x86
+	    #else
+	    #ifdef __ILP32__
+	    ABI=x32
+	    #else
+	    ABI=64
+	    #endif
+	    #endif
+EOF
+	    cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`
+	    eval "$cc_set_abi"
+	    case "$ABI" in
+		x86) CPU=i686 ;;
+		x32) LIBCABI=${LIBC}x32 ;;
+	    esac
 	fi
-	GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI
+	GUESS=$CPU-pc-linux-$LIBCABI
 	;;
     xtensa*:Linux:*:*)
 	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-- 
2.25.1

Reply via email to