From 334cd8a780840d6aee86790fe2fe5f02fe56edf6 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Thu, 21 Jun 2018 21:40:56 +0100 Subject: [PATCH] MIPS/BFD: Keep EI_ABIVERSION setting together Shuffle code in `_bfd_mips_post_process_headers' so that the setting of the EI_ABIVERSION ELF file header field is complete before calling `_bfd_elf_post_process_headers'. This used to be the case, but was changed with commit 351cdf24d223 ("[MIPS] Implement O32 FPXX, FP64 and FP64A ABI extensions") for no reason. bfd/ * elfxx-mips.c (_bfd_mips_post_process_headers): Keep EI_ABIVERSION setting together. --- bfd/ChangeLog | 5 +++++ bfd/elfxx-mips.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 68db5228070..f56ddf98c55 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2018-06-21 Maciej W. Rozycki + + * elfxx-mips.c (_bfd_mips_post_process_headers): Keep + EI_ABIVERSION setting together. + 2018-06-21 Maciej W. Rozycki * elfxx-mips.c (MIPS_LIBC_ABI_DEFAULT, MIPS_LIBC_ABI_MIPS_PLT) diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index f3a2d3ba034..0b0084c6e70 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -16258,11 +16258,11 @@ _bfd_mips_post_process_headers (bfd *abfd, struct bfd_link_info *link_info) 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] = MIPS_LIBC_ABI_MIPS_O32_FP64; + + _bfd_elf_post_process_headers (abfd, link_info); } int -- 2.30.2