From dcb1c79659056a9b762feb235815ef283725490f Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Mon, 4 Jan 2016 22:46:40 +0000 Subject: [PATCH] MIPS/BFD: Correct an FP ABI warning Correct a warning produced on any FP ABI mismatch observed. Unlike the other settings, which in the presence of `.MIPS.abiflags' are duplicated in the `e_flags' member of the ELF file header, information on the FP ABI in use is duplicated in `.gnu.attributes' rather than in the former place. Update the warning message accordingly. bfd/ * elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Correct an FP ABI warning. --- bfd/ChangeLog | 5 +++++ bfd/elfxx-mips.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 063cd143091..1b8c5c2cd24 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2016-01-04 Maciej W. Rozycki + + * elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Correct + an FP ABI warning. + 2016-01-01 Alan Modra Update year range in copyright notice of all files. diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index cb399ccbc97..bfae7f44232 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -15114,7 +15114,7 @@ _bfd_mips_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd) if (abiflags.fp_abi != Val_GNU_MIPS_ABI_FP_ANY && in_abiflags.fp_abi != abiflags.fp_abi) (*_bfd_error_handler) - (_("%B: warning: Inconsistent FP ABI between e_flags and " + (_("%B: warning: Inconsistent FP ABI between .gnu.attributes and " ".MIPS.abiflags"), ibfd); if ((in_abiflags.ases & abiflags.ases) != abiflags.ases) (*_bfd_error_handler) -- 2.30.2