d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unconditionally set e_ident[OSABI]=ELFOSABI_FREEBSD in arm binary headers.

Browse Source 
When the armv6 support was imported from a project branch, this complex
conditional logic and related #define'd values came along, but it's really
not clear what the intent of it all was.  The effect, however, was that
OSABI was always set to zero, which is "UNIX System V ABI".  Having the wrong
value there causes pkg(8) to avoid looking inside arm elf binaries to
determine shared-lib required/provides info for packaging.
This commit is contained in:
Ian Lepore 2016-02-21 14:59:24 +00:00
parent f4d6a773f8
commit e1ba387e11
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/binutils/bfd/elf32-arm.c
View File

@ -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)
{