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

diff --git a/build/make/configure.sh b/build/make/configure.sh
index 9327ce95e74c43e6b3260d2d17c96d8921415a59..47cfef22dbd2ab2535b8ff5d86aac99de88ceedb 100644 (file)
--- 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