From: hjl-tools <hjl.tools@gmail.com>
Date: Wed, 2 Dec 2020 20:52:12 +0000 (-0800)
Subject: libffi/x86: Always check __x86_64__ for x32 hosts (#601) (#602)
X-Git-Tag: upstream/3.4.2~53
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cb8474368cdef3207638d047bd6c707ad8fcb339;p=platform%2Fupstream%2Flibffi.git

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

diff --git a/configure.host b/configure.host
index d9623e9..257b784 100644
--- a/configure.host
+++ b/configure.host
@@ -115,22 +115,14 @@ case "${host}" in
   i?86-*-* | x86_64-*-* | amd64-*)
 	TARGETDIR=x86
 	if test $ac_cv_sizeof_size_t = 4; then
-	  case "$host" in
-	    x86_64-*x32|x86_64-x32-*)
-	      TARGET_X32=yes
-	      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_X32=yes
-		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_X32=yes
+	    TARGET=X86_64
+	  else
+	    TARGET=X86;
+	  fi
+	  rm -f conftest.*
 	else
 	  TARGET=X86_64;
 	fi