From 048f43edfa10eda2c1b24c34ed874c3f35a541e4 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Mon, 15 Jun 2020 07:19:33 -0700
Subject: autoupdate

---
 build-aux/config.guess | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'build-aux/config.guess')

diff --git a/build-aux/config.guess b/build-aux/config.guess
index 11fda528bc..92bfc33e29 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -1095,7 +1095,17 @@ EOF
 	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
 	exit ;;
     x86_64:Linux:*:*)
-	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+	set_cc_for_build
+	LIBCABI=$LIBC
+	if [ "$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
+	fi
+	echo "$UNAME_MACHINE"-pc-linux-"$LIBCABI"
 	exit ;;
     xtensa*:Linux:*:*)
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-- 
cgit v1.2.1