From: H.J. Lu <hjl.tools@gmail.com>
Date: Fri, 13 Apr 2012 23:17:14 +0000 (-0700)
Subject: Add __ILP32__ check when defining __WORDSIZE
X-Git-Tag: upstream/2.30~11240
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e73e17d3f34799fe3108391197198a1cd1adb08;p=external%2Fglibc.git

Add __ILP32__ check when defining __WORDSIZE
---

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