--- build-aux/config.guess.bak	2021-01-30 14:52:55.173812459 +0100
+++ build-aux/config.guess	2021-03-04 01:34:25.961195128 +0100
@@ -1111,7 +1111,7 @@
 	set_cc_for_build
 	LIBCABI=$LIBC
 	if test "$CC_FOR_BUILD" != no_compiler_found; then
-	    if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
+	    if (echo '#if defined __ILP32__ && !defined __i386__'; echo IS_X32; echo '#endif') | \
 		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_X32 >/dev/null
 	    then