aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bfd/ChangeLog7
-rw-r--r--bfd/elfxx-mips.c20
-rw-r--r--ld/testsuite/ChangeLog10
-rw-r--r--ld/testsuite/ld-mips-elf/attr-gnu-4-12.d2
-rw-r--r--ld/testsuite/ld-mips-elf/attr-gnu-4-14.d2
-rw-r--r--ld/testsuite/ld-mips-elf/attr-gnu-4-31.d2
-rw-r--r--ld/testsuite/ld-mips-elf/attr-gnu-4-32.d2
-rw-r--r--ld/testsuite/ld-mips-elf/attr-gnu-4-34.d2
-rw-r--r--ld/testsuite/ld-mips-elf/attr-gnu-4-41.d2
9 files changed, 33 insertions, 16 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:
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index fd49cd6..f88ff96 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2012-12-03 Maciej W. Rozycki <macro@codesourcery.com>
+
+ * 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 <hongjiu.lu@intel.com>
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 447621c..77a13bc 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 b940889..1b65c20 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 cac5812..d63d537 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 dd066dd..bc587a7 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 33a987a..9834132 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 a00e626..a30a03d 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*-*-*
generated by cgit v1.1 at 2024-11-25 23:43:38 +0000