This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] MIPS/BFD: Correct/clean up ELF FP attribute warning messages


On Wed, 21 Nov 2012, Maciej W. Rozycki wrote:

> > While you're changing the errors anyway, it might be worth replacing
> > the two quoted options with %s and using -msoft-float and -mhard-float
> > instead of "soft float" and "hard float".  Hopefully that wins on user
> > interface grounds (we consistently reference an option) and means we
> > always use the same format string.  Just a suggestion though.
> 
>  Agreed, quoting the options makes sense to me and I didn't like these 
> "soft float" messages either, I just didn't feel motivated enough to think 
> what to do about them. ;)

 Additionally the delegation of option names into substituted strings 
removed the message variations, addressing your other concern.  On the 
other hand the extra diagnostics provided for unknown attributes 
multiplied the original message into three.  I hope this is a good 
trade-off overall though.

 So here's the final version, no regressions across the usual MIPS 
targets.  OK to apply?

2012-11-29  Maciej W. Rozycki  <macro@codesourcery.com>

	bfd/
	* elf32-mips.c (bfd_elf32_mkobject): New macro.
	* elf64-mips.c (bfd_elf64_mkobject): Likewise.
	* elfn32-mips.c (bfd_elf32_mkobject): Likewise.
	* elfxx-mips.h (_bfd_mips_elf_mkobject): New prototype.
	* elfxx-mips.c (mips_elf_obj_tdata): New struct.
	(mips_elf_tdata): New macro.
	(_bfd_mips_elf_mkobject): New function.
	(mips_elf_merge_obj_attributes): Report the originating input BFD
	on attribute conflicts.

	ld/testsuite/
	* ld-mips-elf/attr-gnu-4-12.d: Update the warning message.
	* ld-mips-elf/attr-gnu-4-13.d: Likewise.
	* ld-mips-elf/attr-gnu-4-14.d: Likewise.
	* ld-mips-elf/attr-gnu-4-15.d: Likewise.
	* ld-mips-elf/attr-gnu-4-21.d: Likewise.
	* ld-mips-elf/attr-gnu-4-23.d: Likewise.
	* ld-mips-elf/attr-gnu-4-24.d: Likewise.
	* ld-mips-elf/attr-gnu-4-25.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-35.d: Likewise.
	* ld-mips-elf/attr-gnu-4-41.d: Likewise.
	* ld-mips-elf/attr-gnu-4-42.d: Likewise.
	* ld-mips-elf/attr-gnu-4-43.d: Likewise.
	* ld-mips-elf/attr-gnu-4-45.d: Likewise.
	* ld-mips-elf/attr-gnu-4-51.d: Likewise.

  Maciej

binutils-mips-bfd-attr-bfd.diff
Index: binutils-fsf-trunk-quilt/bfd/elf32-mips.c
===================================================================
--- binutils-fsf-trunk-quilt.orig/bfd/elf32-mips.c	2012-11-23 20:04:15.881080927 +0000
+++ binutils-fsf-trunk-quilt/bfd/elf32-mips.c	2012-11-23 20:04:18.020588168 +0000
@@ -2372,6 +2372,7 @@ static const struct ecoff_debug_swap mip
 #define bfd_elf32_bfd_print_private_bfd_data \
 					_bfd_mips_elf_print_private_bfd_data
 #define bfd_elf32_bfd_relax_section	_bfd_mips_elf_relax_section
+#define bfd_elf32_mkobject		_bfd_mips_elf_mkobject
 
 /* Support for SGI-ish mips targets.  */
 #define TARGET_LITTLE_SYM		bfd_elf32_littlemips_vec
Index: binutils-fsf-trunk-quilt/bfd/elf64-mips.c
===================================================================
--- binutils-fsf-trunk-quilt.orig/bfd/elf64-mips.c	2012-11-23 20:04:15.881080927 +0000
+++ binutils-fsf-trunk-quilt/bfd/elf64-mips.c	2012-11-23 20:04:18.020588168 +0000
@@ -4166,6 +4166,7 @@ const struct elf_size_info mips_elf64_si
 #define bfd_elf64_get_dynamic_reloc_upper_bound mips_elf64_get_dynamic_reloc_upper_bound
 #define bfd_elf64_canonicalize_dynamic_reloc mips_elf64_canonicalize_dynamic_reloc
 #define bfd_elf64_bfd_relax_section     _bfd_mips_relax_section
+#define bfd_elf64_mkobject		_bfd_mips_elf_mkobject
 
 /* MIPS ELF64 archive functions.  */
 #define bfd_elf64_archive_functions
Index: binutils-fsf-trunk-quilt/bfd/elfn32-mips.c
===================================================================
--- binutils-fsf-trunk-quilt.orig/bfd/elfn32-mips.c	2012-11-23 20:04:15.881080927 +0000
+++ binutils-fsf-trunk-quilt/bfd/elfn32-mips.c	2012-11-23 20:04:18.020588168 +0000
@@ -3381,6 +3381,7 @@ static const struct ecoff_debug_swap mip
 #define bfd_elf32_bfd_print_private_bfd_data \
 					_bfd_mips_elf_print_private_bfd_data
 #define bfd_elf32_bfd_relax_section     _bfd_mips_relax_section
+#define bfd_elf32_mkobject		_bfd_mips_elf_mkobject
 
 /* Support for SGI-ish mips targets using n32 ABI.  */
 
Index: binutils-fsf-trunk-quilt/bfd/elfxx-mips.c
===================================================================
--- binutils-fsf-trunk-quilt.orig/bfd/elfxx-mips.c	2012-11-23 20:04:15.860664740 +0000
+++ binutils-fsf-trunk-quilt/bfd/elfxx-mips.c	2012-11-23 20:04:18.020588168 +0000
@@ -515,6 +515,22 @@ struct mips_htab_traverse_info
   bfd_boolean error;
 };
 
+/* MIPS ELF private object data.  */
+
+struct mips_elf_obj_tdata
+{
+  /* Generic ELF private object data.  */
+  struct elf_obj_tdata root;
+
+  /* Input BFD providing Tag_GNU_MIPS_ABI_FP attribute for output.  */
+  bfd *abi_fp_bfd;
+};
+
+/* Get MIPS ELF private object data from BFD's tdata.  */
+
+#define mips_elf_tdata(bfd) \
+  ((struct mips_elf_obj_tdata *) (bfd)->tdata.any)
+
 #define TLS_RELOC_P(r_type) \
   (r_type == R_MIPS_TLS_DTPMOD32		\
    || r_type == R_MIPS_TLS_DTPMOD64		\
@@ -1115,6 +1131,15 @@ mips_elf_link_hash_newfunc (struct bfd_h
   return (struct bfd_hash_entry *) ret;
 }
 
+/* Allocate MIPS ELF private object data.  */
+
+bfd_boolean
+_bfd_mips_elf_mkobject (bfd *abfd)
+{
+  return bfd_elf_allocate_object (abfd, sizeof (struct mips_elf_obj_tdata),
+				  MIPS_ELF_DATA);
+}
+
 bfd_boolean
 _bfd_mips_elf_new_section_hook (bfd *abfd, asection *sec)
 {
@@ -13749,6 +13774,12 @@ mips_elf_merge_obj_attributes (bfd *ibfd
 {
   obj_attribute *in_attr;
   obj_attribute *out_attr;
+  bfd *abi_fp_bfd;
+
+  abi_fp_bfd = mips_elf_tdata (obfd)->abi_fp_bfd;
+  in_attr = elf_known_obj_attributes (ibfd)[OBJ_ATTR_GNU];
+  if (!abi_fp_bfd && in_attr[Tag_GNU_MIPS_ABI_FP].i != 0)
+    mips_elf_tdata (obfd)->abi_fp_bfd = ibfd;
 
   if (!elf_known_obj_attributes_proc (obfd)[0].i)
     {
@@ -13764,24 +13795,13 @@ mips_elf_merge_obj_attributes (bfd *ibfd
 
   /* Check for conflicting Tag_GNU_MIPS_ABI_FP attributes and merge
      non-conflicting ones.  */
-  in_attr = elf_known_obj_attributes (ibfd)[OBJ_ATTR_GNU];
   out_attr = elf_known_obj_attributes (obfd)[OBJ_ATTR_GNU];
   if (in_attr[Tag_GNU_MIPS_ABI_FP].i != out_attr[Tag_GNU_MIPS_ABI_FP].i)
     {
       out_attr[Tag_GNU_MIPS_ABI_FP].type = 1;
       if (out_attr[Tag_GNU_MIPS_ABI_FP].i == 0)
 	out_attr[Tag_GNU_MIPS_ABI_FP].i = in_attr[Tag_GNU_MIPS_ABI_FP].i;
-      else if (in_attr[Tag_GNU_MIPS_ABI_FP].i == 0)
-	;
-      else if (in_attr[Tag_GNU_MIPS_ABI_FP].i > 4)
-	_bfd_error_handler
-	  (_("Warning: %B uses unknown floating point ABI %d"), ibfd,
-	   in_attr[Tag_GNU_MIPS_ABI_FP].i);
-      else if (out_attr[Tag_GNU_MIPS_ABI_FP].i > 4)
-	_bfd_error_handler
-	  (_("Warning: %B uses unknown floating point ABI %d"), obfd,
-	   out_attr[Tag_GNU_MIPS_ABI_FP].i);
-      else
+      else if (in_attr[Tag_GNU_MIPS_ABI_FP].i != 0)
 	switch (out_attr[Tag_GNU_MIPS_ABI_FP].i)
 	  {
 	  case 1:
@@ -13789,24 +13809,30 @@ mips_elf_merge_obj_attributes (bfd *ibfd
 	      {
 	      case 2:
 		_bfd_error_handler
-		  (_("Warning: %B uses -mdouble-float, %B uses -msingle-float"),
-		   obfd, ibfd);
+		  (_("Warning: %B uses %s (set by %B), %B uses %s"),
+		   obfd, abi_fp_bfd, ibfd, "-mdouble-float", "-msingle-float");
 		break;
 
 	      case 3:
 		_bfd_error_handler
-		  (_("Warning: %B uses hard float, %B uses soft float"),
-		   obfd, ibfd);
+		  (_("Warning: %B uses %s (set by %B), %B uses %s"),
+		   obfd, abi_fp_bfd, ibfd, "-mhard-float", "-msoft-float");
 		break;
 
 	      case 4:
 		_bfd_error_handler
-		  (_("Warning: %B uses -mdouble-float, %B uses -mips32r2 -mfp64"),
-		   obfd, ibfd);
+		  (_("Warning: %B uses %s (set by %B), %B uses %s"),
+		   obfd, abi_fp_bfd, ibfd,
+		   "-mdouble-float", "-mips32r2 -mfp64");
 		break;
 
 	      default:
-		abort ();
+		_bfd_error_handler
+		  (_("Warning: %B uses %s (set by %B), "
+		     "%B uses unknown floating point ABI %d"),
+		   obfd, abi_fp_bfd, ibfd,
+		   "-mdouble-float", in_attr[Tag_GNU_MIPS_ABI_FP].i);
+		break;
 	      }
 	    break;
 
@@ -13815,24 +13841,30 @@ mips_elf_merge_obj_attributes (bfd *ibfd
 	      {
 	      case 1:
 		_bfd_error_handler
-		  (_("Warning: %B uses -msingle-float, %B uses -mdouble-float"),
-		   obfd, ibfd);
+		  (_("Warning: %B uses %s (set by %B), %B uses %s"),
+		   obfd, abi_fp_bfd, ibfd, "-msingle-float", "-mdouble-float");
 		break;
 
 	      case 3:
 		_bfd_error_handler
-		  (_("Warning: %B uses hard float, %B uses soft float"),
-		   obfd, ibfd);
+		  (_("Warning: %B uses %s (set by %B), %B uses %s"),
+		   obfd, abi_fp_bfd, ibfd, "-mhard-float", "-msoft-float");
 		break;
 
 	      case 4:
 		_bfd_error_handler
-		  (_("Warning: %B uses -msingle-float, %B uses -mips32r2 -mfp64"),
-		   obfd, ibfd);
+		  (_("Warning: %B uses %s (set by %B), %B uses %s"),
+		   obfd, abi_fp_bfd, ibfd,
+		   "-msingle-float", "-mips32r2 -mfp64");
 		break;
 
 	      default:
-		abort ();
+		_bfd_error_handler
+		  (_("Warning: %B uses %s (set by %B), "
+		     "%B uses unknown floating point ABI %d"),
+		   obfd, abi_fp_bfd, ibfd,
+		   "-msingle-float", in_attr[Tag_GNU_MIPS_ABI_FP].i);
+		break;
 	      }
 	    break;
 
@@ -13843,12 +13875,17 @@ mips_elf_merge_obj_attributes (bfd *ibfd
 	      case 2:
 	      case 4:
 		_bfd_error_handler
-		  (_("Warning: %B uses soft float, %B uses hard float"),
-		   obfd, ibfd);
+		  (_("Warning: %B uses %s (set by %B), %B uses %s"),
+		   obfd, abi_fp_bfd, ibfd, "-msoft-float", "-mhard-float");
 		break;
 
 	      default:
-		abort ();
+		_bfd_error_handler
+		  (_("Warning: %B uses %s (set by %B), "
+		     "%B uses unknown floating point ABI %d"),
+		   obfd, abi_fp_bfd, ibfd,
+		   "-msoft-float", in_attr[Tag_GNU_MIPS_ABI_FP].i);
+		break;
 	      }
 	    break;
 
@@ -13857,29 +13894,79 @@ mips_elf_merge_obj_attributes (bfd *ibfd
 	      {
 	      case 1:
 		_bfd_error_handler
-		  (_("Warning: %B uses -mips32r2 -mfp64, %B uses -mdouble-float"),
-		   obfd, ibfd);
+		  (_("Warning: %B uses %s (set by %B), %B uses %s"),
+		   obfd, abi_fp_bfd, ibfd,
+		   "-mips32r2 -mfp64", "-mdouble-float");
 		break;
 
 	      case 2:
 		_bfd_error_handler
-		  (_("Warning: %B uses -mips32r2 -mfp64, %B uses -msingle-float"),
-		   obfd, ibfd);
+		  (_("Warning: %B uses %s (set by %B), %B uses %s"),
+		   obfd, abi_fp_bfd, ibfd,
+		   "-mips32r2 -mfp64", "-msingle-float");
 		break;
 
 	      case 3:
 		_bfd_error_handler
-		  (_("Warning: %B uses hard float, %B uses soft float"),
-		   obfd, ibfd);
+		  (_("Warning: %B uses %s (set by %B), %B uses %s"),
+		   obfd, abi_fp_bfd, ibfd, "-mhard-float", "-msoft-float");
 		break;
 
 	      default:
-		abort ();
+		_bfd_error_handler
+		  (_("Warning: %B uses %s (set by %B), "
+		     "%B uses unknown floating point ABI %d"),
+		   obfd, abi_fp_bfd, ibfd,
+		   "-mips32r2 -mfp64", in_attr[Tag_GNU_MIPS_ABI_FP].i);
+		break;
 	      }
 	    break;
 
 	  default:
-	    abort ();
+	    switch (in_attr[Tag_GNU_MIPS_ABI_FP].i)
+	      {
+	      case 1:
+		_bfd_error_handler
+		  (_("Warning: %B uses unknown floating point ABI %d "
+		     "(set by %B), %B uses %s"),
+		   obfd, abi_fp_bfd, ibfd,
+		   out_attr[Tag_GNU_MIPS_ABI_FP].i, "-mdouble-float");
+		break;
+
+	      case 2:
+		_bfd_error_handler
+		  (_("Warning: %B uses unknown floating point ABI %d "
+		     "(set by %B), %B uses %s"),
+		   obfd, abi_fp_bfd, ibfd,
+		   out_attr[Tag_GNU_MIPS_ABI_FP].i, "-msingle-float");
+		break;
+
+	      case 3:
+		_bfd_error_handler
+		  (_("Warning: %B uses unknown floating point ABI %d "
+		     "(set by %B), %B uses %s"),
+		   obfd, abi_fp_bfd, ibfd,
+		   out_attr[Tag_GNU_MIPS_ABI_FP].i, "-msoft-float");
+		break;
+
+	      case 4:
+		_bfd_error_handler
+		  (_("Warning: %B uses unknown floating point ABI %d "
+		     "(set by %B), %B uses %s"),
+		   obfd, abi_fp_bfd, ibfd,
+		   out_attr[Tag_GNU_MIPS_ABI_FP].i, "-mips32r2 -mfp64");
+		break;
+
+	      default:
+		_bfd_error_handler
+		  (_("Warning: %B uses unknown floating point ABI %d "
+		     "(set by %B), %B uses unknown floating point ABI %d"),
+		   obfd, abi_fp_bfd, ibfd,
+		   out_attr[Tag_GNU_MIPS_ABI_FP].i,
+		   in_attr[Tag_GNU_MIPS_ABI_FP].i);
+		break;
+	      }
+	    break;
 	  }
     }
 
Index: binutils-fsf-trunk-quilt/bfd/elfxx-mips.h
===================================================================
--- binutils-fsf-trunk-quilt.orig/bfd/elfxx-mips.h	2012-11-23 20:04:15.870979669 +0000
+++ binutils-fsf-trunk-quilt/bfd/elfxx-mips.h	2012-11-23 20:04:18.020588168 +0000
@@ -23,6 +23,8 @@
 #include "elf/internal.h"
 #include "elf/mips.h"
 
+extern bfd_boolean _bfd_mips_elf_mkobject
+  (bfd *);
 extern bfd_boolean _bfd_mips_elf_new_section_hook
   (bfd *, asection *);
 extern void _bfd_mips_elf_symbol_processing
Index: binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-12.d
===================================================================
--- binutils-fsf-trunk-quilt.orig/ld/testsuite/ld-mips-elf/attr-gnu-4-12.d	2012-11-23 20:04:15.851586738 +0000
+++ binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-12.d	2012-11-23 20:04:18.020588168 +0000
@@ -1,5 +1,5 @@
 #source: attr-gnu-4-1.s
 #source: attr-gnu-4-2.s
 #ld: -r
-#warning: Warning: .* uses -mdouble-float, .* uses -msingle-float
+#warning: Warning: .* uses -mdouble-float \(set by .*\), .* uses -msingle-float
 #target: mips*-*-*
Index: binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-13.d
===================================================================
--- binutils-fsf-trunk-quilt.orig/ld/testsuite/ld-mips-elf/attr-gnu-4-13.d	2012-11-23 20:04:15.851586738 +0000
+++ binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-13.d	2012-11-23 20:04:18.020588168 +0000
@@ -1,5 +1,5 @@
 #source: attr-gnu-4-1.s
 #source: attr-gnu-4-3.s
 #ld: -r
-#warning: Warning: .* uses hard float, .* uses soft float
+#warning: Warning: .* uses -mhard-float \(set by .*\), .* uses -msoft-float
 #target: mips*-*-*
Index: binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-14.d
===================================================================
--- binutils-fsf-trunk-quilt.orig/ld/testsuite/ld-mips-elf/attr-gnu-4-14.d	2012-11-23 20:04:15.851586738 +0000
+++ binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-14.d	2012-11-23 20:04:18.020588168 +0000
@@ -1,5 +1,5 @@
 #source: attr-gnu-4-1.s
 #source: attr-gnu-4-4.s
 #ld: -r
-#warning: Warning: .* uses -mdouble-float, .* uses -mips32r2 -mfp64
+#warning: Warning: .* uses -mdouble-float \(set by .*\), .* uses -mips32r2 -mfp64
 #target: mips*-*-*
Index: binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-15.d
===================================================================
--- binutils-fsf-trunk-quilt.orig/ld/testsuite/ld-mips-elf/attr-gnu-4-15.d	2012-11-23 20:04:15.851586738 +0000
+++ binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-15.d	2012-11-23 20:04:18.020588168 +0000
@@ -2,7 +2,7 @@
 #source: attr-gnu-4-5.s
 #ld: -r
 #readelf: -A
-#warning: Warning: .* uses unknown floating point ABI 5
+#warning: Warning: .* uses -mdouble-float \(set by .*\), .* uses unknown floating point ABI 5
 #target: mips*-*-*
 
 Attribute Section: gnu
Index: binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-21.d
===================================================================
--- binutils-fsf-trunk-quilt.orig/ld/testsuite/ld-mips-elf/attr-gnu-4-21.d	2012-11-23 20:04:15.851586738 +0000
+++ binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-21.d	2012-11-23 20:04:18.020588168 +0000
@@ -1,5 +1,5 @@
 #source: attr-gnu-4-2.s
 #source: attr-gnu-4-1.s
 #ld: -r
-#warning: Warning: .* uses -msingle-float, .* uses -mdouble-float
+#warning: Warning: .* uses -msingle-float \(set by .*\), .* uses -mdouble-float
 #target: mips*-*-*
Index: binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-23.d
===================================================================
--- binutils-fsf-trunk-quilt.orig/ld/testsuite/ld-mips-elf/attr-gnu-4-23.d	2012-11-23 20:04:15.851586738 +0000
+++ binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-23.d	2012-11-23 20:04:18.020588168 +0000
@@ -1,5 +1,5 @@
 #source: attr-gnu-4-2.s
 #source: attr-gnu-4-3.s
 #ld: -r
-#warning: Warning: .* uses hard float, .* uses soft float
+#warning: Warning: .* uses -mhard-float \(set by .*\), .* uses -msoft-float
 #target: mips*-*-*
Index: binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-24.d
===================================================================
--- binutils-fsf-trunk-quilt.orig/ld/testsuite/ld-mips-elf/attr-gnu-4-24.d	2012-11-23 20:04:15.851586738 +0000
+++ binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-24.d	2012-11-23 20:04:18.020588168 +0000
@@ -1,5 +1,5 @@
 #source: attr-gnu-4-2.s
 #source: attr-gnu-4-4.s
 #ld: -r
-#warning: Warning: .* uses -mips32r2 -mfp64
+#warning: Warning: .* uses -msingle-float \(set by .*\), .* uses -mips32r2 -mfp64
 #target: mips*-*-*
Index: binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-25.d
===================================================================
--- binutils-fsf-trunk-quilt.orig/ld/testsuite/ld-mips-elf/attr-gnu-4-25.d	2012-11-23 20:04:15.851586738 +0000
+++ binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-25.d	2012-11-23 20:04:18.020588168 +0000
@@ -2,7 +2,7 @@
 #source: attr-gnu-4-5.s
 #ld: -r
 #readelf: -A
-#warning: Warning: .* uses unknown floating point ABI 5
+#warning: Warning: .* uses -msingle-float \(set by .*\), .* uses unknown floating point ABI 5
 #target: mips*-*-*
 
 Attribute Section: gnu
Index: binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-31.d
===================================================================
--- binutils-fsf-trunk-quilt.orig/ld/testsuite/ld-mips-elf/attr-gnu-4-31.d	2012-11-23 20:04:15.851586738 +0000
+++ binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-31.d	2012-11-23 20:04:18.020588168 +0000
@@ -1,5 +1,5 @@
 #source: attr-gnu-4-3.s
 #source: attr-gnu-4-1.s
 #ld: -r
-#warning: Warning: .* uses soft float, .* uses hard float
+#warning: Warning: .* uses -msoft-float \(set by .*\), .* uses -mhard-float
 #target: mips*-*-*
Index: binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-32.d
===================================================================
--- binutils-fsf-trunk-quilt.orig/ld/testsuite/ld-mips-elf/attr-gnu-4-32.d	2012-11-23 20:04:15.851586738 +0000
+++ binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-32.d	2012-11-23 20:04:18.020588168 +0000
@@ -1,5 +1,5 @@
 #source: attr-gnu-4-3.s
 #source: attr-gnu-4-2.s
 #ld: -r
-#warning: Warning: .* uses soft float, .* uses hard float
+#warning: Warning: .* uses -msoft-float \(set by .*\), .* uses -mhard-float
 #target: mips*-*-*
Index: binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-34.d
===================================================================
--- binutils-fsf-trunk-quilt.orig/ld/testsuite/ld-mips-elf/attr-gnu-4-34.d	2012-11-23 20:04:15.851586738 +0000
+++ binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-34.d	2012-11-23 20:04:18.020588168 +0000
@@ -1,5 +1,5 @@
 #source: attr-gnu-4-3.s
 #source: attr-gnu-4-4.s
 #ld: -r
-#warning: Warning: .* uses soft float, .* uses hard float
+#warning: Warning: .* uses -msoft-float \(set by .*\), .* uses -mhard-float
 #target: mips*-*-*
Index: binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-35.d
===================================================================
--- binutils-fsf-trunk-quilt.orig/ld/testsuite/ld-mips-elf/attr-gnu-4-35.d	2012-11-23 20:04:15.851586738 +0000
+++ binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-35.d	2012-11-23 20:04:18.020588168 +0000
@@ -2,7 +2,7 @@
 #source: attr-gnu-4-5.s
 #ld: -r
 #readelf: -A
-#warning: Warning: .* uses unknown floating point ABI 5
+#warning: Warning: .* uses -msoft-float \(set by .*\), .* uses unknown floating point ABI 5
 #target: mips*-*-*
 
 Attribute Section: gnu
Index: binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-41.d
===================================================================
--- binutils-fsf-trunk-quilt.orig/ld/testsuite/ld-mips-elf/attr-gnu-4-41.d	2012-11-23 20:04:15.851586738 +0000
+++ binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-41.d	2012-11-23 20:04:18.020588168 +0000
@@ -1,5 +1,5 @@
 #source: attr-gnu-4-4.s
 #source: attr-gnu-4-1.s
 #ld: -r
-#warning: Warning: .* uses -mips32r2 -mfp64, .* uses -mdouble-float
+#warning: Warning: .* uses -mips32r2 -mfp64 \(set by .*\), .* uses -mdouble-float
 #target: mips*-*-*
Index: binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-42.d
===================================================================
--- binutils-fsf-trunk-quilt.orig/ld/testsuite/ld-mips-elf/attr-gnu-4-42.d	2012-11-23 20:04:15.851586738 +0000
+++ binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-42.d	2012-11-23 20:04:18.020588168 +0000
@@ -1,5 +1,5 @@
 #source: attr-gnu-4-4.s
 #source: attr-gnu-4-2.s
 #ld: -r
-#warning: Warning: .* uses -mips32r2 -mfp64
+#warning: Warning: .* uses -mips32r2 -mfp64 \(set by .*\), .* uses -msingle-float
 #target: mips*-*-*
Index: binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-43.d
===================================================================
--- binutils-fsf-trunk-quilt.orig/ld/testsuite/ld-mips-elf/attr-gnu-4-43.d	2012-11-23 20:04:15.851586738 +0000
+++ binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-43.d	2012-11-23 20:04:18.020588168 +0000
@@ -1,5 +1,5 @@
 #source: attr-gnu-4-4.s
 #source: attr-gnu-4-3.s
 #ld: -r
-#warning: Warning: .* uses hard float, .* uses soft float
+#warning: Warning: .* uses -mhard-float \(set by .*\), .* uses -msoft-float
 #target: mips*-*-*
Index: binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-45.d
===================================================================
--- binutils-fsf-trunk-quilt.orig/ld/testsuite/ld-mips-elf/attr-gnu-4-45.d	2012-11-23 20:04:15.851586738 +0000
+++ binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-45.d	2012-11-23 20:04:18.020588168 +0000
@@ -1,7 +1,7 @@
 #source: attr-gnu-4-4.s
 #source: attr-gnu-4-5.s
 #ld: -r
-#warning: Warning: .* uses unknown floating point ABI 5
+#warning: Warning: .* uses -mips32r2 -mfp64 \(set by .*\), .* uses unknown floating point ABI 5
 #target: mips*-*-*
 
 Attribute Section: gnu
Index: binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-51.d
===================================================================
--- binutils-fsf-trunk-quilt.orig/ld/testsuite/ld-mips-elf/attr-gnu-4-51.d	2012-11-23 20:04:15.851586738 +0000
+++ binutils-fsf-trunk-quilt/ld/testsuite/ld-mips-elf/attr-gnu-4-51.d	2012-11-23 20:04:18.020588168 +0000
@@ -1,5 +1,5 @@
 #source: attr-gnu-4-5.s
 #source: attr-gnu-4-1.s
 #ld: -r
-#warning: Warning: .* uses unknown floating point ABI 5
+#warning: Warning: .* uses unknown floating point ABI 5 \(set by .*\), .* uses -mdouble-float
 #target: mips*-*-*


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]