diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2016-02-22 12:28:23 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2016-02-22 12:28:23 +0000 |
| commit | 317cec3c43aa82a60e43427c6f1382bdd9e6810f (patch) | |
| tree | 8a0600337b49dbed7acd411e862bbcfba916c0bc /contrib | |
| parent | 72c3aa02dc4d10c095de756cc767ac827596568a (diff) | |
| parent | 7758916f4401f98c1812ecbfcaf2f8eef1670177 (diff) | |
| download | src-317cec3c43aa82a60e43427c6f1382bdd9e6810f.tar.gz src-317cec3c43aa82a60e43427c6f1382bdd9e6810f.zip | |
MFH
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/projects/release-pkg/; revision=295886
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/binutils/bfd/elf32-arm.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/contrib/binutils/bfd/elf32-arm.c b/contrib/binutils/bfd/elf32-arm.c index e20ccca85162..066e17e5dae1 100644 --- a/contrib/binutils/bfd/elf32-arm.c +++ b/contrib/binutils/bfd/elf32-arm.c @@ -59,13 +59,6 @@ #define elf_info_to_howto 0 #define elf_info_to_howto_rel elf32_arm_info_to_howto -#define ARM_ELF_ABI_VERSION 0 -#ifdef __FreeBSD__ -#define ARM_ELF_OS_ABI_VERSION ELFOSABI_FREEBSD -#else -#define ARM_ELF_OS_ABI_VERSION ELFOSABI_ARM -#endif - static struct elf_backend_data elf32_arm_vxworks_bed; /* Note: code such as elf32_arm_reloc_type_lookup expect to use e.g. @@ -9377,11 +9370,8 @@ elf32_arm_post_process_headers (bfd * abfd, struct bfd_link_info * link_info ATT i_ehdrp = elf_elfheader (abfd); - if (EF_ARM_EABI_VERSION (i_ehdrp->e_flags) == EF_ARM_EABI_UNKNOWN) - i_ehdrp->e_ident[EI_OSABI] = ARM_ELF_OS_ABI_VERSION; - else - i_ehdrp->e_ident[EI_OSABI] = 0; - i_ehdrp->e_ident[EI_ABIVERSION] = ARM_ELF_ABI_VERSION; + i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_FREEBSD; + i_ehdrp->e_ident[EI_ABIVERSION] = 0; if (link_info) { |