From 7e73e17d3f34799fe3108391197198a1cd1adb08 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Fri, 13 Apr 2012 16:17:14 -0700
Subject: [PATCH] Add __ILP32__ check when defining __WORDSIZE

---
 ChangeLog                      | 5 +++++
 sysdeps/x86_64/bits/wordsize.h | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 2a331e6..718824d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/x86_64/bits/wordsize.h (__WORDSIZE): Also check
+	__ILP32__.
+
 2012-04-13  Antoine Balestrat <merkil33@gmail.com>
 
 	* sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c
diff --git a/sysdeps/x86_64/bits/wordsize.h b/sysdeps/x86_64/bits/wordsize.h
index a40a0d8..9b38756 100644
--- a/sysdeps/x86_64/bits/wordsize.h
+++ b/sysdeps/x86_64/bits/wordsize.h
@@ -1,6 +1,6 @@
 /* Determine the wordsize from the preprocessor defines.  */
 
-#if defined __x86_64__
+#if defined __x86_64__ && !defined __ILP32__
 # define __WORDSIZE	64
 # define __WORDSIZE_COMPAT32	1
 #else
-- 
2.7.4