aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/unix/sysv/linux/i386/bits/a.out.h3
-rw-r--r--sysdeps/unix/sysv/linux/x86/bits/a.out.h (renamed from sysdeps/unix/sysv/linux/x86_64/bits/a.out.h)0
3 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3cab2d6e50..871e907e8b 100644
--- 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
index 0fb52c3815..0000000000
--- 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
index 0e4a7c911f..0e4a7c911f 100644
--- a/sysdeps/unix/sysv/linux/x86_64/bits/a.out.h
+++ b/sysdeps/unix/sysv/linux/x86/bits/a.out.h