diff options
| author | Maciej W. Rozycki <macro@linux-mips.org> | 2012-12-03 15:57:44 +0000 |
|---|---|---|
| committer | Maciej W. Rozycki <macro@linux-mips.org> | 2012-12-03 15:57:44 +0000 |
| commit | 20696deded3ddcf936795f73f53a7a702a6955b1 (patch) | |
| tree | fac0580e8d4e43c526932a22f1d306c701fd9437 /bfd | |
| parent | d82184d78220ce42e0f54ce9fbb0688860ff0388 (diff) | |
| download | fsf-binutils-gdb-20696deded3ddcf936795f73f53a7a702a6955b1.zip fsf-binutils-gdb-20696deded3ddcf936795f73f53a7a702a6955b1.tar.gz fsf-binutils-gdb-20696deded3ddcf936795f73f53a7a702a6955b1.tar.bz2 | |
bfd/
* elfxx-mips.c (mips_elf_merge_obj_attributes): Correct messages
for the -mdouble-float and -msingle-float cases throughout; make
all the messages report the output file consistently on the
left-hand side.
ld/testsuite/
* ld-mips-elf/attr-gnu-4-12.d: Adjust the warning expected
according to changes to BFD.
* ld-mips-elf/attr-gnu-4-14.d: Likewise.
* ld-mips-elf/attr-gnu-4-31.d: Likewise.
* ld-mips-elf/attr-gnu-4-32.d: Likewise.
* ld-mips-elf/attr-gnu-4-34.d: Likewise.
* ld-mips-elf/attr-gnu-4-41.d: Likewise.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 7 | ||||
| -rw-r--r-- | bfd/elfxx-mips.c | 20 |
2 files changed, 17 insertions, 10 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 199e111..af8d7a0 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2012-12-03 Maciej W. Rozycki <macro@codesourcery.com> + + * elfxx-mips.c (mips_elf_merge_obj_attributes): Correct messages + for the -mdouble-float and -msingle-float cases throughout; make + all the messages report the output file consistently on the + left-hand side. + 2012-11-29 Roland McGrath <mcgrathr@google.com> * elf-nacl.c (segment_eligible_for_headers): Disallow writable segments. diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index 15a32c1..7b66c8a 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -13789,7 +13789,7 @@ mips_elf_merge_obj_attributes (bfd *ibfd, bfd *obfd) { case 2: _bfd_error_handler - (_("Warning: %B uses -msingle-float, %B uses -mdouble-float"), + (_("Warning: %B uses -mdouble-float, %B uses -msingle-float"), obfd, ibfd); break; @@ -13801,7 +13801,7 @@ mips_elf_merge_obj_attributes (bfd *ibfd, bfd *obfd) case 4: _bfd_error_handler - (_("Warning: %B uses -msingle-float, %B uses -mips32r2 -mfp64"), + (_("Warning: %B uses -mdouble-float, %B uses -mips32r2 -mfp64"), obfd, ibfd); break; @@ -13816,7 +13816,7 @@ mips_elf_merge_obj_attributes (bfd *ibfd, bfd *obfd) case 1: _bfd_error_handler (_("Warning: %B uses -msingle-float, %B uses -mdouble-float"), - ibfd, obfd); + obfd, ibfd); break; case 3: @@ -13827,7 +13827,7 @@ mips_elf_merge_obj_attributes (bfd *ibfd, bfd *obfd) case 4: _bfd_error_handler - (_("Warning: %B uses -mdouble-float, %B uses -mips32r2 -mfp64"), + (_("Warning: %B uses -msingle-float, %B uses -mips32r2 -mfp64"), obfd, ibfd); break; @@ -13843,8 +13843,8 @@ mips_elf_merge_obj_attributes (bfd *ibfd, bfd *obfd) case 2: case 4: _bfd_error_handler - (_("Warning: %B uses hard float, %B uses soft float"), - ibfd, obfd); + (_("Warning: %B uses soft float, %B uses hard float"), + obfd, ibfd); break; default: @@ -13857,14 +13857,14 @@ mips_elf_merge_obj_attributes (bfd *ibfd, bfd *obfd) { case 1: _bfd_error_handler - (_("Warning: %B uses -msingle-float, %B uses -mips32r2 -mfp64"), - ibfd, obfd); + (_("Warning: %B uses -mips32r2 -mfp64, %B uses -mdouble-float"), + obfd, ibfd); break; case 2: _bfd_error_handler - (_("Warning: %B uses -mdouble-float, %B uses -mips32r2 -mfp64"), - ibfd, obfd); + (_("Warning: %B uses -mips32r2 -mfp64, %B uses -msingle-float"), + obfd, ibfd); break; case 3: |