aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2012-05-16 10:35:34 -0700
committerH.J. Lu <hjl.tools@gmail.com>2012-05-16 10:35:34 -0700
commit34683bb01bd2c65e1d124bf54e13f3c54779efd0 (patch)
tree692b82055f6b522379d7f4e2089ac5789a683e04
parent84a68786746cd3f81b58f692d949df146790f3a9 (diff)
downloadglibc-34683bb01bd2c65e1d124bf54e13f3c54779efd0.tar
glibc-34683bb01bd2c65e1d124bf54e13f3c54779efd0.tar.gz
glibc-34683bb01bd2c65e1d124bf54e13f3c54779efd0.tar.bz2
glibc-34683bb01bd2c65e1d124bf54e13f3c54779efd0.zip
Check __x86_64__ in x86_64/bits/a.out.h
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/bits/a.out.h4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e0117c2d8c..f395055bd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2012-05-16 H.J. Lu <hongjiu.lu@intel.com>
+ * sysdeps/unix/sysv/linux/x86_64/bits/a.out.h: Don't include
+ <bits/wordsize.h>. Check __x86_64__ instead of __WORDSIZE.
+
+2012-05-16 H.J. Lu <hongjiu.lu@intel.com>
+
* sysdeps/unix/sysv/linux/x86_64/bits/siginfo.h: New file.
2012-05-16 H.J. Lu <hongjiu.lu@intel.com>
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/a.out.h b/sysdeps/unix/sysv/linux/x86_64/bits/a.out.h
index 228a8d41af..0e4a7c911f 100644
--- a/sysdeps/unix/sysv/linux/x86_64/bits/a.out.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/a.out.h
@@ -2,9 +2,7 @@
# error "Never use <bits/a.out.h> directly; include <a.out.h> instead."
#endif
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 64
+#ifdef __x86_64__
/* Signal to users of this header that this architecture really doesn't
support a.out binary format. */