aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2012-04-13 16:17:14 -0700
committerH.J. Lu <hjl.tools@gmail.com>2012-04-13 16:17:14 -0700
commit7e73e17d3f34799fe3108391197198a1cd1adb08 (patch)
tree45e15f1af15ccfbed0fd2dfe919db55b50f223bd
parentc7a6ab72e920bc442896a6e33fdcd7b318539859 (diff)
downloadglibc-7e73e17d3f34799fe3108391197198a1cd1adb08.tar
glibc-7e73e17d3f34799fe3108391197198a1cd1adb08.tar.gz
glibc-7e73e17d3f34799fe3108391197198a1cd1adb08.tar.bz2
glibc-7e73e17d3f34799fe3108391197198a1cd1adb08.zip
Add __ILP32__ check when defining __WORDSIZE
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/x86_64/bits/wordsize.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a331e6485..718824dcd5 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 a40a0d816f..9b38756fd5 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