From 6bad24a091143db9804e58a716c0a7ed55eadea2 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Thu, 31 May 2012 15:57:54 -0700
Subject: [PATCH] Use x86_64 bits/a.out.h for both i386 and x86_64

---
 ChangeLog                                            | 4 ++++
 sysdeps/unix/sysv/linux/i386/bits/a.out.h            | 3 ---
 sysdeps/unix/sysv/linux/{x86_64 => x86}/bits/a.out.h | 0
 3 files changed, 4 insertions(+), 3 deletions(-)
 delete mode 100644 sysdeps/unix/sysv/linux/i386/bits/a.out.h
 rename sysdeps/unix/sysv/linux/{x86_64 => x86}/bits/a.out.h (100%)

diff --git a/ChangeLog b/ChangeLog
index 3cab2d6e501..871e907e8ba 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 0fb52c38150..00000000000
--- 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
-- 
2.47.2