From 20696deded3ddcf936795f73f53a7a702a6955b1 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Mon, 3 Dec 2012 15:57:44 +0000 Subject: [PATCH] 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. --- bfd/ChangeLog | 7 +++++++ bfd/elfxx-mips.c | 20 ++++++++++---------- ld/testsuite/ChangeLog | 10 ++++++++++ ld/testsuite/ld-mips-elf/attr-gnu-4-12.d | 2 +- ld/testsuite/ld-mips-elf/attr-gnu-4-14.d | 2 +- ld/testsuite/ld-mips-elf/attr-gnu-4-31.d | 2 +- ld/testsuite/ld-mips-elf/attr-gnu-4-32.d | 2 +- ld/testsuite/ld-mips-elf/attr-gnu-4-34.d | 2 +- ld/testsuite/ld-mips-elf/attr-gnu-4-41.d | 2 +- 9 files changed, 33 insertions(+), 16 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 199e1119330..af8d7a0907c 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2012-12-03 Maciej W. Rozycki + + * 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 * elf-nacl.c (segment_eligible_for_headers): Disallow writable segments. diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index 15a32c1434f..7b66c8acbbf 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: diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index fd49cd6d1d2..f88ff968766 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2012-12-03 Maciej W. Rozycki + + * 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. + 2012-12-03 H.J. Lu PR ld/14904 diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-12.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-12.d index 447621c37a4..77a13bc3fc2 100644 --- a/ld/testsuite/ld-mips-elf/attr-gnu-4-12.d +++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-12.d @@ -1,5 +1,5 @@ #source: attr-gnu-4-1.s #source: attr-gnu-4-2.s #ld: -r -#warning: Warning: .* uses -msingle-float, .* uses -mdouble-float +#warning: Warning: .* uses -mdouble-float, .* uses -msingle-float #target: mips*-*-* diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-14.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-14.d index b9408897ada..1b65c20d21c 100644 --- a/ld/testsuite/ld-mips-elf/attr-gnu-4-14.d +++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-14.d @@ -1,5 +1,5 @@ #source: attr-gnu-4-1.s #source: attr-gnu-4-4.s #ld: -r -#warning: Warning: .* uses -msingle-float, .* uses -mips32r2 -mfp64 +#warning: Warning: .* uses -mdouble-float, .* uses -mips32r2 -mfp64 #target: mips*-*-* diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-31.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-31.d index cac58122257..d63d537b72f 100644 --- a/ld/testsuite/ld-mips-elf/attr-gnu-4-31.d +++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-31.d @@ -1,5 +1,5 @@ #source: attr-gnu-4-3.s #source: attr-gnu-4-1.s #ld: -r -#warning: Warning: .* uses hard float, .* uses soft float +#warning: Warning: .* uses soft float, .* uses hard float #target: mips*-*-* diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-32.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-32.d index dd066dddc35..bc587a7b312 100644 --- a/ld/testsuite/ld-mips-elf/attr-gnu-4-32.d +++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-32.d @@ -1,5 +1,5 @@ #source: attr-gnu-4-3.s #source: attr-gnu-4-2.s #ld: -r -#warning: Warning: .* uses hard float, .* uses soft float +#warning: Warning: .* uses soft float, .* uses hard float #target: mips*-*-* diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-34.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-34.d index 33a987a1643..9834132400d 100644 --- a/ld/testsuite/ld-mips-elf/attr-gnu-4-34.d +++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-34.d @@ -1,5 +1,5 @@ #source: attr-gnu-4-3.s #source: attr-gnu-4-4.s #ld: -r -#warning: Warning: .* uses hard float, .* uses soft float +#warning: Warning: .* uses soft float, .* uses hard float #target: mips*-*-* diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-41.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-41.d index a00e6262046..a30a03d6443 100644 --- a/ld/testsuite/ld-mips-elf/attr-gnu-4-41.d +++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-41.d @@ -1,5 +1,5 @@ #source: attr-gnu-4-4.s #source: attr-gnu-4-1.s #ld: -r -#warning: Warning: .* uses -msingle-float, .* uses -mips32r2 -mfp64 +#warning: Warning: .* uses -mips32r2 -mfp64, .* uses -mdouble-float #target: mips*-*-* -- 2.30.2