X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Felf64-sparc.c;h=5cae63aed9cd11f8ed0cc2ae1bcc89ddbb5a2b0a;hb=55c0a857d61b0e4ed4c1ee7e4afd5c1771a45859;hp=07c78bc9eba8fafeb12239695b5185d48344428b;hpb=bd5e6e7e3a8be60699e596633cd828d3446e75ee;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/elf64-sparc.c b/bfd/elf64-sparc.c
index 07c78bc9eb..5cae63aed9 100644
--- a/bfd/elf64-sparc.c
+++ b/bfd/elf64-sparc.c
@@ -1331,11 +1331,9 @@ sparc64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
       if (p->name != NULL && strcmp (p->name, *namep))
 	{
           (*_bfd_error_handler)
-            (_("Register %%g%d used incompatibly: %s in %s"),
+            (_("Register %%g%d used incompatibly: %s in %s, previously %s in %s"),
              (int) sym->st_value,
-             **namep ? *namep : "#scratch", bfd_archive_filename (abfd));
-          (*_bfd_error_handler)
-            (_("  previously %s in %s"),
+             **namep ? *namep : "#scratch", bfd_archive_filename (abfd),
              *p->name ? p->name : "#scratch", bfd_archive_filename (p->abfd));
 	  return false;
 	}
@@ -1356,10 +1354,8 @@ sparc64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 		  if (type > STT_FUNC)
 		    type = 0;
 		  (*_bfd_error_handler)
-		    (_("Symbol `%s' has differing types: %s in %s"),
-		     *namep, "REGISTER", bfd_archive_filename (abfd));
-		  (*_bfd_error_handler)
-		    (_("  previously %s in %s"),
+		    (_("Symbol `%s' has differing types: REGISTER in %s, previously %s in %s"),
+		     *namep, bfd_archive_filename (abfd),
 		     stt_types[type], bfd_archive_filename (p->abfd));
 		  return false;
 		}
@@ -1405,11 +1401,9 @@ sparc64_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
 	    if (type > STT_FUNC)
 	      type = 0;
 	    (*_bfd_error_handler)
-	      (_("Symbol `%s' has differing types: %s in %s"),
-	       *namep, stt_types[type], bfd_archive_filename (abfd));
-	    (*_bfd_error_handler)
-	      (_("  previously %s in %s"),
-	       "REGISTER", bfd_archive_filename (p->abfd));
+	      (_("Symbol `%s' has differing types: %s in %s, previously REGISTER in %s"),
+	       *namep, stt_types[type], bfd_archive_filename (abfd),
+	       bfd_archive_filename (p->abfd));
 	    return false;
 	  }
     }