From 134384dd809f76d4b5d4af404e48d8064af1a963 Mon Sep 17 00:00:00 2001
From: Dim Temp <dimtemp0@gmail.com>
Date: Wed, 3 Dec 2014 22:06:46 +0100
Subject: [PATCH] Extend x32 check by also checking for __x86_64__.

Currently, the configure script checks for x32 by testing just the
__ILP32__ define.  However, on "plain" i386, __ILP32__ can also be
defined, for example by clang 3.5.0 and higher.  (That gcc does not
define it there, is another issue, but not for this tracker.)

Therefore, extend the check by also checking for __x86_64__, which will
also be defined for x32.

BUG=887

Change-Id: I90ac1d6843caff0416e1dd360c0be3dbaa85c2ae
---
 build/make/configure.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/make/configure.sh b/build/make/configure.sh
index 9327ce95e..47cfef22d 100644
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -1118,7 +1118,7 @@ EOF
       bits=32
       enabled x86_64 && bits=64
       check_cpp <<EOF && bits=x32
-#ifndef __ILP32__
+#if !defined(__ILP32__) || !defined(__x86_64__)
 #error "not x32"
 #endif
 EOF