From: Philipp Thomas <pth@suse.de>
Date: Wed, 30 Jan 2002 14:51:39 +0000 (+0000)
Subject: Unify messages in coff-arm.c and elf32-arm.h.
X-Git-Tag: binutils-2_12-branchpoint~220
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae1a89b7c442e5d7025309820c65c2d849870957;p=external%2Fbinutils.git

Unify messages in coff-arm.c and elf32-arm.h.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 093cb8d..b74c6b3 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2002-30-01  Philipp Thomas  <pthomas@suse.de>
+
+	* coff-arm.c, elf32-elf.h: Unify messages.
+
 2002-01-30  Nick Clifton <nickc@redhat.com>
 
 	* po/sv.po: Updated translation.
diff --git a/bfd/coff-arm.c b/bfd/coff-arm.c
index df2be76..0498dc5 100644
--- a/bfd/coff-arm.c
+++ b/bfd/coff-arm.c
@@ -2297,10 +2297,10 @@ coff_arm_merge_private_bfd_data (ibfd, obfd)
 
 	      if (INTERWORK_FLAG (ibfd))
 		/* xgettext: c-format */
-		msg = _("Warning: input file %s supports interworking, whereas %s does not.");
+		msg = _("Warning: %s supports interworking, whereas %s does not.");
 	      else
 		/* xgettext: c-format */
-		msg = _("Warning: input file %s does not support interworking, whereas %s does.");
+		msg = _("Warning: %s does not support interworking, whereas %s does.");
 
 	      _bfd_error_handler (msg, bfd_archive_filename (ibfd),
 				  bfd_get_filename (obfd));
@@ -2398,7 +2398,7 @@ _bfd_coff_arm_set_private_flags (abfd, flags)
     {
       if (flag)
 	/* xgettext: c-format */
-	_bfd_error_handler (_("Warning: Not setting interworking flag of %s, since it has already been specified as non-interworking"),
+	_bfd_error_handler (_("Warning: Not setting interworking flag of %s since it has already been specified as non-interworking"),
 			    bfd_archive_filename (abfd));
       else
 	/* xgettext: c-format */
@@ -2461,7 +2461,8 @@ coff_arm_copy_private_bfd_data (src, dest)
 	      if (INTERWORK_FLAG (dest))
 		{
 		  /* xgettext:c-format */
-		  _bfd_error_handler (("Warning: Clearing the interworking bit of %s, because the non-interworking code in %s has been copied into it"),
+		  _bfd_error_handler (("\
+Warning: Clearing the interworking flag of %s because non-interworking code in %s has been linked with it"),
 				      bfd_get_filename (dest),
 				      bfd_archive_filename (src));
 		}
diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h
index ab8a6b3..afedea5 100644
--- a/bfd/elf32-arm.h
+++ b/bfd/elf32-arm.h
@@ -2112,11 +2112,11 @@ elf32_arm_set_private_flags (abfd, flags)
 	{
 	  if (flags & EF_ARM_INTERWORK)
 	    (*_bfd_error_handler) (_("\
-Warning: Not setting interwork flag of %s since it has already been specified as non-interworking"),
+Warning: Not setting interworking flag of %s since it has already been specified as non-interworking"),
 				   bfd_archive_filename (abfd));
 	  else
 	    _bfd_error_handler (_("\
-Warning: Clearing the interwork flag of %s due to outside request"),
+Warning: Clearing the interworking flag of %s due to outside request"),
 				bfd_archive_filename (abfd));
 	}
     }
@@ -2164,7 +2164,7 @@ elf32_arm_copy_private_bfd_data (ibfd, obfd)
 	{
 	  if (out_flags & EF_ARM_INTERWORK)
 	    _bfd_error_handler (_("\
-Warning: Clearing the interwork flag in %s because non-interworking code in %s has been linked with it"),
+Warning: Clearing the interworking flag of %s because non-interworking code in %s has been linked with it"),
 				bfd_get_filename (obfd),
 				bfd_archive_filename (ibfd));