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.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 063cd14..1b8c5c2 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-04  Maciej W. Rozycki  <macro@imgtec.com>
+
+       * elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Correct
+       an FP ABI warning.
+

 2016-01-01  Alan Modra  <amodra@gmail.com>
 
        Update year range in copyright notice of all files.
 2016-01-01  Alan Modra  <amodra@gmail.com>
 
        Update year range in copyright notice of all files.

diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index cb399cc..bfae7f4 100644 (file)
--- 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)
       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)
             ".MIPS.abiflags"), ibfd);
       if ((in_abiflags.ases & abiflags.ases) != abiflags.ases)
        (*_bfd_error_handler)