Use ELFOSABI_GNU instead of ELFOSABI_LINUX.

diff --git a/ChangeLog b/ChangeLog
index 7c1625e87a9fbb366ec327deb2e39ae02b702e35..a45e2e2dbb2881b185f19142d6ad08a24887e601 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-08-29  Thomas Schwinge  <thomas@codesourcery.com>
 
+       * sysdeps/unix/sysv/linux/ldsodefs.h (VALID_ELF_OSABI)
+       (VALID_ELF_ABIVERSION, MORE_ELF_HEADER_DATA): Use ELFOSABI_GNU
+       instead of ELFOSABI_LINUX.
+
        [BZ #15522] strtod ("nan(N)") returning a sNaN in some cases
 
        * stdlib/strtof_l.c (SET_MANTISSA): Rewrite.

diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 52f7c0f726ffef7d55ba960b47dd88ed15a252bd..6dad08da30a8ebf61428a86aa7cfe79b1ab8fccd 100644 (file)
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,3 +1,9 @@
+2013-08-29  Thomas Schwinge  <thomas@codesourcery.com>
+
+       * sysdeps/unix/sysv/linux/arm/ldsodefs.h (VALID_ELF_OSABI)
+       (MORE_ELF_HEADER_DATA): Use ELFOSABI_GNU instead of
+       ELFOSABI_LINUX.
+
 2013-08-28  Kyle McMartin  <kyle@redhat.com>
            Carlos O'Donell  <carlos@redhat.com>
 

diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips
index e61b022ebd99f55a7b7fae850abc739336af06d7..7509c774de1ca60d4b3af0597312e48162338c91 100644 (file)
--- a/ports/ChangeLog.mips
+++ b/ports/ChangeLog.mips
@@ -1,3 +1,8 @@
+2013-08-29  Thomas Schwinge  <thomas@codesourcery.com>
+
+       * sysdeps/unix/sysv/linux/mips/ldsodefs.h (VALID_ELF_ABIVERSION):
+       Use ELFOSABI_GNU instead of ELFOSABI_LINUX.
+
 2013-08-29   Ondřej Bílka  <neleai@seznam.cz>
 
        * sysdeps/mips/sys/asm.h: Fix typos.

diff --git a/ports/sysdeps/unix/sysv/linux/arm/ldsodefs.h b/ports/sysdeps/unix/sysv/linux/arm/ldsodefs.h
index 50a8bb7644c541372a314714e17335e28b85588f..3821bf33b33af5d01b7aa1c4d8e1615ad1e605cc 100644 (file)
--- a/ports/sysdeps/unix/sysv/linux/arm/ldsodefs.h
+++ b/ports/sysdeps/unix/sysv/linux/arm/ldsodefs.h
@@ -44,8 +44,8 @@
     || memcmp (hdr, expected3, size) == 0)     \
    && VALID_FLOAT_ABI (ehdr->e_flags))
 #define VALID_ELF_OSABI(osabi)         (osabi == ELFOSABI_SYSV         \
-                                        || osabi == EXTRA_OSABI        \
-                                        || osabi == ELFOSABI_LINUX)
+                                        || osabi == ELFOSABI_GNU       \
+                                        || osabi == EXTRA_OSABI)
 #define MORE_ELF_HEADER_DATA                           \
   static const unsigned char expected2[EI_PAD] =       \
   {                                                    \
@@ -56,7 +56,7 @@
     [EI_CLASS] = ELFW(CLASS),                          \
     [EI_DATA] = byteorder,                             \
     [EI_VERSION] = EV_CURRENT,                         \
-    [EI_OSABI] = ELFOSABI_LINUX                                \
+    [EI_OSABI] = ELFOSABI_GNU                          \
   };                                                   \
   static const unsigned char expected3[EI_PAD] =       \
   {                                                    \

diff --git a/ports/sysdeps/unix/sysv/linux/mips/ldsodefs.h b/ports/sysdeps/unix/sysv/linux/mips/ldsodefs.h
index eb45f7229a9ff946f591ecf0147d7d8bfd1f08da..76c38c8d29edb22759a2350fb8489e87d9aec0e7 100644 (file)
--- a/ports/sysdeps/unix/sysv/linux/mips/ldsodefs.h
+++ b/ports/sysdeps/unix/sysv/linux/mips/ldsodefs.h
@@ -30,11 +30,11 @@ extern void _dl_static_init (struct link_map *map);
 #define DL_STATIC_INIT(map) _dl_static_init (map)
 
 /* Allow ABIVERSION == 1, meaning PLTs and copy relocations are
-   required, with ELFOSABI_SYSV.  */
+   required, with ELFOSABI_SYSV, and ELFOSABI_GNU.  */
 #undef VALID_ELF_ABIVERSION
 #define VALID_ELF_ABIVERSION(osabi,ver)                        \
   (ver == 0                                            \
    || (osabi == ELFOSABI_SYSV && ver < 2)              \
-   || (osabi == ELFOSABI_LINUX && ver < LIBC_ABI_MAX))
+   || (osabi == ELFOSABI_GNU && ver < LIBC_ABI_MAX))
 
 #endif /* ldsodefs.h */

diff --git a/sysdeps/unix/sysv/linux/ldsodefs.h b/sysdeps/unix/sysv/linux/ldsodefs.h
index 18ff8528c2de0ad2d9524ba977ceee00ec5d146c..c1b1543ab2d8ac21972772e77d4ea085dfb9b5c8 100644 (file)
--- a/sysdeps/unix/sysv/linux/ldsodefs.h
+++ b/sysdeps/unix/sysv/linux/ldsodefs.h
@@ -41,13 +41,13 @@
    up the page size information.  */
 #define HAVE_AUX_PAGESIZE
 
-/* Accept binaries which identify the binary as using Linux extensions.  */
+/* Accept binaries which identify the binary as using GNU extensions.  */
 #define VALID_ELF_HEADER(hdr,exp,size) (memcmp (hdr, exp, size) == 0   \
                                         || memcmp (hdr, expected2, size) == 0)
 #define VALID_ELF_OSABI(osabi)         (osabi == ELFOSABI_SYSV \
-                                        || osabi == ELFOSABI_LINUX)
+                                        || osabi == ELFOSABI_GNU)
 #define VALID_ELF_ABIVERSION(osabi,ver) \
-  (ver == 0 || (osabi == ELFOSABI_LINUX && ver < LIBC_ABI_MAX))
+  (ver == 0 || (osabi == ELFOSABI_GNU && ver < LIBC_ABI_MAX))
 #define MORE_ELF_HEADER_DATA \
   static const unsigned char expected2[EI_PAD] =       \
   {                                                    \
@@ -58,7 +58,7 @@
     [EI_CLASS] = ELFW(CLASS),                          \
     [EI_DATA] = byteorder,                             \
     [EI_VERSION] = EV_CURRENT,                         \
-    [EI_OSABI] = ELFOSABI_LINUX                                \
+    [EI_OSABI] = ELFOSABI_GNU                          \
   }
 
 #endif /* ldsodefs.h */