Check floating-point ABI in ARM VALID_ELF_HEADER.

diff --git a/ChangeLog b/ChangeLog
index 3a5a2ccb741d5fcb19b29dac91badbfda4a56ad3..7bc3a242311c6d28b012c497422f6845e4a9cb1d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-23  Steve McIntyre  <steve.mcintyre@linaro.org>
+
+       * elf/elf.h (EF_ARM_ABI_FLOAT_SOFT): New macro.
+       (EF_ARM_ABI_FLOAT_HARD): Likewise.
+
 2012-08-23  Joseph Myers  <joseph@codesourcery.com>
 
        * sysdeps/unix/sysv/linux/dl-fxstatat64.c: Use <> instead of "" in

diff --git a/elf/elf.h b/elf/elf.h
index 1e67ef5ef73d215efdca35fa90d2f681df102be0..6c85f92196db40dc9f50fe755eb4a9ed128db5df 100644 (file)
--- a/elf/elf.h
+++ b/elf/elf.h
@@ -2250,6 +2250,9 @@ typedef Elf32_Addr Elf32_Conflict;
 #define EF_ARM_VFP_FLOAT       0x400
 #define EF_ARM_MAVERICK_FLOAT  0x800
 
+#define EF_ARM_ABI_FLOAT_SOFT  0x200   /* NB conflicts with EF_ARM_SOFT_FLOAT */
+#define EF_ARM_ABI_FLOAT_HARD  0x400   /* NB conflicts with EF_ARM_VFP_FLOAT */
+
 
 /* Other constants defined in the ARM ELF spec. version B-01.  */
 /* NB. These conflict with values defined above.  */

diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 4acc473dec055ac4b06810ec473a2b730846120d..f9f616fb0ebef8986ff266ae6f3b8fe2885987bf 100644 (file)
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,3 +1,9 @@
+2012-08-23  Steve McIntyre  <steve.mcintyre@linaro.org>
+
+       * sysdeps/unix/sysv/linux/arm/ldsodefs.h (VALID_FLOAT_ABI): Define
+       depending on __ARM_PCS_VFP.
+       (VALID_ELF_HEADER): Also check VALID_FLOAT_ABI.
+
 2012-08-20  Joseph Myers  <joseph@codesourcery.com>
 
        * sysdeps/unix/sysv/linux/arm/kernel-features.h

diff --git a/ports/sysdeps/unix/sysv/linux/arm/ldsodefs.h b/ports/sysdeps/unix/sysv/linux/arm/ldsodefs.h
index 8980bb1996ddae220d3534b12457688570cab11a..d95886222504949a2a0c1a64bd29520b79cfac84 100644 (file)
--- a/ports/sysdeps/unix/sysv/linux/arm/ldsodefs.h
+++ b/ports/sysdeps/unix/sysv/linux/arm/ldsodefs.h
@@ -27,10 +27,22 @@
 
 #define EXTRA_OSABI ELFOSABI_ARM_AEABI
 
+#ifdef __ARM_PCS_VFP
+# define VALID_FLOAT_ABI(x) \
+  ((EF_ARM_EABI_VERSION ((x)) != EF_ARM_EABI_VER5)     \
+   || !((x) & EF_ARM_ABI_FLOAT_SOFT))
+#else
+# define VALID_FLOAT_ABI(x) \
+  ((EF_ARM_EABI_VERSION ((x)) != EF_ARM_EABI_VER5)     \
+   || !((x) & EF_ARM_ABI_FLOAT_HARD))
+#endif
+
+#undef VALID_ELF_HEADER
 #define VALID_ELF_HEADER(hdr,exp,size)         \
-  (memcmp (hdr, exp, size) == 0                        \
-   || memcmp (hdr, expected2, size) == 0       \
-   || memcmp (hdr, expected3, size) == 0)
+  ((memcmp (hdr, exp, size) == 0               \
+    || memcmp (hdr, expected2, size) == 0      \
+    || 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)