Use x86_64 bits/a.out.h for both i386 and x86_64

diff --git a/ChangeLog b/ChangeLog
index 3cab2d6e5010bb636128b3ef877a59c7e24c6526..871e907e8baaa9846cf0bebbaca95663b0df217f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 2012-05-31  H.J. Lu  <hongjiu.lu@intel.com>
 
        [BZ #14117]
+       * sysdeps/unix/sysv/linux/i386/bits/a.out.h: Removed.
+       * sysdeps/unix/sysv/linux/x86_64/bits/a.out.h: Renamed to ...
+       * sysdeps/unix/sysv/linux/x86/bits/a.out.h: This.
+
        * sysdeps/unix/sysv/linux/i386/sys/elf.h: Error when compiling
        for x86-64.
        * sysdeps/unix/sysv/linux/i386/sys/vm86.h: Likewise.

diff --git a/sysdeps/unix/sysv/linux/i386/bits/a.out.h b/sysdeps/unix/sysv/linux/i386/bits/a.out.h
deleted file mode 100644 (file)
index 0fb52c3..0000000
--- a/sysdeps/unix/sysv/linux/i386/bits/a.out.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef __A_OUT_GNU_H__
-# error "Never use <bits/a.out.h> directly; include <a.out.h> instead."
-#endif

diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/a.out.h b/sysdeps/unix/sysv/linux/x86/bits/a.out.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/x86_64/bits/a.out.h
rename to sysdeps/unix/sysv/linux/x86/bits/a.out.h