Check __x86_64__ in x86_64/bits/a.out.h

diff --git a/ChangeLog b/ChangeLog
index e0117c2d8cb845306ec236d41c58ee90a5025b11..f395055bd9a1a54a6f65d1cfaf36ec1d0e92a2a3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.

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 228a8d41af717364d92f744e2807b8f2ea797bc9..0e4a7c911f404fe13721ff1dd205749c86459e7a 100644 (file)
--- 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.  */