lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-10-23 02:12:24 +03:00
Code Activity

Check floating-point ABI in ARM VALID_ELF_HEADER.

Browse Source
This commit is contained in:
Steve McIntyre
2012-08-23 20:38:25 +00:00
committed by Joseph Myers
parent 4efcc02265
commit d3bafbc98e
4 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -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> 2012-08-23 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/dl-fxstatat64.c: Use <> instead of "" in * sysdeps/unix/sysv/linux/dl-fxstatat64.c: Use <> instead of "" in

3
elf/elf.h
View File

@@ -2250,6 +2250,9 @@ typedef Elf32_Addr Elf32_Conflict;
#define EF_ARM_VFP_FLOAT 0x400 #define EF_ARM_VFP_FLOAT 0x400
#define EF_ARM_MAVERICK_FLOAT 0x800 #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. */ /* Other constants defined in the ARM ELF spec. version B-01. */
/* NB. These conflict with values defined above. */ /* NB. These conflict with values defined above. */

6
ports/ChangeLog.arm
View File

@@ -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> 2012-08-20 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/arm/kernel-features.h * sysdeps/unix/sysv/linux/arm/kernel-features.h

18
ports/sysdeps/unix/sysv/linux/arm/ldsodefs.h
View File

@@ -27,10 +27,22 @@
#define EXTRA_OSABI ELFOSABI_ARM_AEABI #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) \ #define VALID_ELF_HEADER(hdr,exp,size) \
(memcmp (hdr, exp, size) == 0 \ ((memcmp (hdr, exp, size) == 0 \
|| memcmp (hdr, expected2, size) == 0 \ || memcmp (hdr, expected2, size) == 0 \
|| memcmp (hdr, expected3, size) == 0) || memcmp (hdr, expected3, size) == 0) \
&& VALID_FLOAT_ABI (ehdr->e_flags))
#define VALID_ELF_OSABI(osabi) (osabi == ELFOSABI_SYSV \ #define VALID_ELF_OSABI(osabi) (osabi == ELFOSABI_SYSV \
|| osabi == EXTRA_OSABI \ || osabi == EXTRA_OSABI \
|| osabi == ELFOSABI_LINUX) || osabi == ELFOSABI_LINUX)