From a254b8c9cb0e2ab9d135af53e20f77512736d69f Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Thu, 31 May 2012 16:04:12 -0700
Subject: [PATCH] Use x86-64 bits/{msq,sem,shm}.h for i386 and x86-64

---
 ChangeLog                                          | 7 +++++++
 sysdeps/unix/sysv/linux/{x86_64 => x86}/bits/msq.h | 0
 sysdeps/unix/sysv/linux/{x86_64 => x86}/bits/sem.h | 0
 sysdeps/unix/sysv/linux/{x86_64 => x86}/bits/shm.h | 0
 4 files changed, 7 insertions(+)
 rename sysdeps/unix/sysv/linux/{x86_64 => x86}/bits/msq.h (100%)
 rename sysdeps/unix/sysv/linux/{x86_64 => x86}/bits/sem.h (100%)
 rename sysdeps/unix/sysv/linux/{x86_64 => x86}/bits/shm.h (100%)

diff --git a/ChangeLog b/ChangeLog
index 375b3850b2..024cc26c2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 2012-05-31  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14117]
+	* sysdeps/unix/sysv/linux/x86_64/bits/msq.h: Renamed to ...
+	* sysdeps/unix/sysv/linux/x86/bits/msq.h: This.
+	* sysdeps/unix/sysv/linux/x86_64/bits/sem.h: Renamed to ...
+	* sysdeps/unix/sysv/linux/x86/bits/sem.h: This.
+	* sysdeps/unix/sysv/linux/x86_64/bits/shm.h: Renamed to ...
+	* sysdeps/unix/sysv/linux/x86/bits/shm.h: This.
+
 	* sysdeps/unix/sysv/linux/x86_64/bits/ipctypes.h: Renamed to ...
 	* sysdeps/unix/sysv/linux/x86/bits/ipctypes.h: This.
 
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/msq.h b/sysdeps/unix/sysv/linux/x86/bits/msq.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/x86_64/bits/msq.h
rename to sysdeps/unix/sysv/linux/x86/bits/msq.h
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/sem.h b/sysdeps/unix/sysv/linux/x86/bits/sem.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/x86_64/bits/sem.h
rename to sysdeps/unix/sysv/linux/x86/bits/sem.h
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/shm.h b/sysdeps/unix/sysv/linux/x86/bits/shm.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/x86_64/bits/shm.h
rename to sysdeps/unix/sysv/linux/x86/bits/shm.h