1 files changed, 21 insertions, 21 deletions

diff --git a/bfd/coff-arm.c b/bfd/coff-arm.c
index 713f65b..c7a2861 100644
--- a/bfd/coff-arm.c
+++ b/bfd/coff-arm.c
@@ -1742,6 +1742,7 @@ coff_arm_relocate_section (bfd *output_bfd,
 	  break;
 	case bfd_reloc_outofrange:
 	  _bfd_error_handler
+	    /* xgettext:c-format */
 	    (_("%B: bad reloc address 0x%lx in section `%A'"),
 	     input_bfd, input_section, (unsigned long) rel->r_vaddr);
 	  return FALSE;
@@ -2066,6 +2067,7 @@ bfd_arm_process_before_allocation (bfd *                   abfd,
 	  /* If the index is outside of the range of our table, something has gone wrong.  */
 	  if (symndx >= obj_conv_table_size (abfd))
 	    {
+	      /* xgettext:c-format */
 	      _bfd_error_handler (_("%B: illegal symbol index in reloc: %d"),
 				  abfd, symndx);
 	      continue;
@@ -2210,16 +2212,16 @@ coff_arm_merge_private_bfd_data (bfd * ibfd, struct bfd_link_info *info)
 
 	  if (APCS_FLOAT_FLAG (obfd) != APCS_FLOAT_FLAG (ibfd))
 	    {
-	      const char *msg;
-
 	      if (APCS_FLOAT_FLAG (ibfd))
 		/* xgettext: c-format */
-		msg = _("error: %B passes floats in float registers, whereas %B passes them in integer registers");
+		_bfd_error_handler (_("\
+error: %B passes floats in float registers, whereas %B passes them in integer registers"),
+				    ibfd, obfd);
 	      else
 		/* xgettext: c-format */
-		msg = _("error: %B passes floats in integer registers, whereas %B passes them in float registers");
-
-	      _bfd_error_handler (msg, ibfd, obfd);
+		_bfd_error_handler (_("\
+error: %B passes floats in integer registers, whereas %B passes them in float registers"),
+				    ibfd, obfd);
 
 	      bfd_set_error (bfd_error_wrong_format);
 	      return FALSE;
@@ -2227,15 +2229,16 @@ coff_arm_merge_private_bfd_data (bfd * ibfd, struct bfd_link_info *info)
 
 	  if (PIC_FLAG (obfd) != PIC_FLAG (ibfd))
 	    {
-	      const char * msg;
-
 	      if (PIC_FLAG (ibfd))
 		/* xgettext: c-format */
-		msg = _("error: %B is compiled as position independent code, whereas target %B is absolute position");
+		_bfd_error_handler (_("\
+error: %B is compiled as position independent code, whereas target %B is absolute position"),
+                                    ibfd, obfd);
 	      else
 		/* xgettext: c-format */
-		msg = _("error: %B is compiled as absolute position code, whereas target %B is position independent");
-	      _bfd_error_handler (msg, ibfd, obfd);
+		_bfd_error_handler (_("\
+error: %B is compiled as absolute position code, whereas target %B is position independent"),
+                                    ibfd, obfd);
 
 	      bfd_set_error (bfd_error_wrong_format);
 	      return FALSE;
@@ -2258,16 +2261,16 @@ coff_arm_merge_private_bfd_data (bfd * ibfd, struct bfd_link_info *info)
 	  /* If the src and dest differ in their interworking issue a warning.  */
 	  if (INTERWORK_FLAG (obfd) != INTERWORK_FLAG (ibfd))
 	    {
-	      const char * msg;
-
 	      if (INTERWORK_FLAG (ibfd))
 		/* xgettext: c-format */
-		msg = _("Warning: %B supports interworking, whereas %B does not");
+		_bfd_error_handler (_("\
+Warning: %B supports interworking, whereas %B does not"),
+				    ibfd, obfd);
 	      else
 		/* xgettext: c-format */
-		msg = _("Warning: %B does not support interworking, whereas %B does");
-
-	      _bfd_error_handler (msg, ibfd, obfd);
+		_bfd_error_handler (_("\
+Warning: %B does not support interworking, whereas %B does"),
+				    ibfd, obfd);
 	    }
 	}
       else
@@ -2288,7 +2291,6 @@ coff_arm_print_private_bfd_data (bfd * abfd, void * ptr)
 
   BFD_ASSERT (abfd != NULL && ptr != NULL);
 
-  /* xgettext:c-format */
   fprintf (file, _("private flags = %x:"), coff_data (abfd)->flags);
 
   if (APCS_SET (abfd))
@@ -2357,11 +2359,9 @@ _bfd_coff_arm_set_private_flags (bfd * abfd, flagword flags)
   if (INTERWORK_SET (abfd) && (INTERWORK_FLAG (abfd) != flag))
     {
       if (flag)
-	/* xgettext: c-format */
 	_bfd_error_handler (_("Warning: Not setting interworking flag of %B since it has already been specified as non-interworking"),
 			    abfd);
       else
-	/* xgettext: c-format */
 	_bfd_error_handler (_("Warning: Clearing the interworking flag of %B due to outside request"),
 			    abfd);
       flag = 0;
@@ -2419,7 +2419,7 @@ coff_arm_copy_private_bfd_data (bfd * src, bfd * dest)
 	      if (INTERWORK_FLAG (dest))
 		{
 		  /* xgettext:c-format */
-		  _bfd_error_handler (("\
+		  _bfd_error_handler (_("\
 Warning: Clearing the interworking flag of %B because non-interworking code in %B has been linked with it"),
 				      dest, src);
 		}