Add __ILP32__ check when defining __WORDSIZE

diff --git a/ChangeLog b/ChangeLog
index 2a331e6485a01bd1c7954db04670948fdcea8e1c..718824dcd5ceca5fdbe5eada79a91a1ea2f59194 100644 (file)
--- 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 a40a0d816fd511d06c1dfa57b009dc5d12efa30d..9b38756fd58a4f78712ac0e74b2ffe531c7b0618 100644 (file)
--- 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