Use the same bits/endian.h for i386/x86_64

diff --git a/ChangeLog b/ChangeLog
index 5b1346e..2f9d7a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 2012-05-30  H.J. Lu  <hongjiu.lu@intel.com>
 
        [BZ #14117]
+       * sysdeps/i386/bits/endian.h: Removed.
+       * sysdeps/x86_64/bits/endian.h: Renamed to ...
+       * sysdeps/x86/bits/endian.h: This.
+
        * sysdeps/i386/bits/byteswap.h: Removed.
        * sysdeps/i386/bits/byteswap-16.h: Likewise.
        * sysdeps/x86_64/bits/byteswap.h: Renamed to ...

diff --git a/sysdeps/i386/bits/endian.h b/sysdeps/x86/bits/endian.h
similarity index 78%
rename from sysdeps/i386/bits/endian.h
rename to sysdeps/x86/bits/endian.h
index 54bd9d1..5a56c72 100644 (file)
--- a/sysdeps/i386/bits/endian.h
+++ b/sysdeps/x86/bits/endian.h
@@ -1,4 +1,4 @@
-/* i386 is little-endian.  */
+/* i386/x86_64 are little-endian.  */
 
 #ifndef _ENDIAN_H
 # error "Never use <bits/endian.h> directly; include <endian.h> instead."

diff --git a/sysdeps/x86_64/bits/endian.h b/sysdeps/x86_64/bits/endian.h
deleted file mode 100644 (file)
index 2f59ead..0000000
--- a/sysdeps/x86_64/bits/endian.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* x86_64 is little-endian.  */
-
-#ifndef _ENDIAN_H
-# error "Never use <bits/endian.h> directly; include <endian.h> instead."
-#endif
-
-#define __BYTE_ORDER __LITTLE_ENDIAN