diff options
Diffstat (limited to 'bfd')
-rw-r--r-- | bfd/ChangeLog | 8 | ||||
-rw-r--r-- | bfd/elfxx-mips.c | 16 |
2 files changed, 22 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index e962822..68db522 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2018-06-21 Maciej W. Rozycki <macro@mips.com> + + * elfxx-mips.c (MIPS_LIBC_ABI_DEFAULT, MIPS_LIBC_ABI_MIPS_PLT) + (MIPS_LIBC_ABI_UNIQUE, MIPS_LIBC_ABI_MIPS_O32_FP64) + (MIPS_LIBC_ABI_MAX): New enumeration constants. + (_bfd_mips_post_process_headers): Use them in place of magic + numbers. + 2018-06-21 Jim Wilson <jimw@sifive.com> * elfnn-riscv.c (riscv_elf_finish_dynamic_symbol): Update comment. diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index 844750eb..f3a2d3b 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -16230,6 +16230,18 @@ bfd_mips_elf_get_abiflags (bfd *abfd) return tdata->abiflags_valid ? &tdata->abiflags : NULL; } +/* MIPS libc ABI versions, used with the EI_ABIVERSION ELF file header + field. Taken from `libc-abis.h' generated at GNU libc build time. + Using a MIPS_ prefix as other libc targets use different values. */ +enum +{ + MIPS_LIBC_ABI_DEFAULT = 0, + MIPS_LIBC_ABI_MIPS_PLT, + MIPS_LIBC_ABI_UNIQUE, + MIPS_LIBC_ABI_MIPS_O32_FP64, + MIPS_LIBC_ABI_MAX +}; + void _bfd_mips_post_process_headers (bfd *abfd, struct bfd_link_info *link_info) { @@ -16243,14 +16255,14 @@ _bfd_mips_post_process_headers (bfd *abfd, struct bfd_link_info *link_info) BFD_ASSERT (htab != NULL); if (htab->use_plts_and_copy_relocs && !htab->is_vxworks) - i_ehdrp->e_ident[EI_ABIVERSION] = 1; + i_ehdrp->e_ident[EI_ABIVERSION] = MIPS_LIBC_ABI_MIPS_PLT; } _bfd_elf_post_process_headers (abfd, link_info); if (mips_elf_tdata (abfd)->abiflags.fp_abi == Val_GNU_MIPS_ABI_FP_64 || mips_elf_tdata (abfd)->abiflags.fp_abi == Val_GNU_MIPS_ABI_FP_64A) - i_ehdrp->e_ident[EI_ABIVERSION] = 3; + i_ehdrp->e_ident[EI_ABIVERSION] = MIPS_LIBC_ABI_MIPS_O32_FP64; } int |