[8/8] assorted target messages

Message ID 20180222234423.GO3812@bubble.grove.modra.org
State New
Headers show
Series
  • [1/8] ppc error/warning messages
Related show

Commit Message

Alan Modra Feb. 22, 2018, 11:44 p.m.
bfd/
	* elf-m10300.c, * elf-s390-common.c, * elf32-arc.c, * elf32-cris.c,
	* elf32-dlx.c, * elf32-frv.c, * elf32-i370.c, * elf32-lm32.c,
	* elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c,
	* elf32-microblaze.c, * elf32-msp430.c, * elf32-nds32.c,
	* elf32-nios2.c, * elf32-or1k.c, * elf32-rl78.c, * elf32-rx.c,
	* elf32-score.c, * elf32-score7.c, * elf32-sh-symbian.c,
	* elf32-sh.c, * elf32-spu.c, * elf32-v850.c, * elf32-xtensa.c,
	* elf64-alpha.c, * elf64-ia64-vms.c, * elf64-mmix.c,
	* elf64-sh64.c, * elf64-sparc.c, * elfnn-ia64.c, * elfxx-tilegx.c,
	* mmo.c, * osf-core.c, * srec.c, * vms-alpha.c: Standardize
	error/warning messages.
ld/
	* testsuite/ld-cris/pcrelcp-1.d,
	* testsuite/ld-mmix/start-2.d: Update.


-- 
Alan Modra
Australia Development Lab, IBM

Patch

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c2a097e..10dd808 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,19 @@ 
 2018-02-23  Alan Modra  <amodra@gmail.com>
 
+	* elf-m10300.c, * elf-s390-common.c, * elf32-arc.c, * elf32-cris.c,
+	* elf32-dlx.c, * elf32-frv.c, * elf32-i370.c, * elf32-lm32.c,
+	* elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c,
+	* elf32-microblaze.c, * elf32-msp430.c, * elf32-nds32.c,
+	* elf32-nios2.c, * elf32-or1k.c, * elf32-rl78.c, * elf32-rx.c,
+	* elf32-score.c, * elf32-score7.c, * elf32-sh-symbian.c,
+	* elf32-sh.c, * elf32-spu.c, * elf32-v850.c, * elf32-xtensa.c,
+	* elf64-alpha.c, * elf64-ia64-vms.c, * elf64-mmix.c,
+	* elf64-sh64.c, * elf64-sparc.c, * elfnn-ia64.c, * elfxx-tilegx.c,
+	* mmo.c, * osf-core.c, * srec.c, * vms-alpha.c: Standardize
+	error/warning messages.
+
+2018-02-23  Alan Modra  <amodra@gmail.com>
+
 	* archive.c, * bfd.c, * linker.c, * reloc.c, * stabs.c,
 	* syms.c: Standardize error/warning messages.
 
diff --git a/bfd/elf-m10300.c b/bfd/elf-m10300.c
index 7eb2eff..d578416 100644
--- a/bfd/elf-m10300.c
+++ b/bfd/elf-m10300.c
@@ -1025,7 +1025,7 @@  mn10300_do_tls_transition (bfd *	 input_bfd,
     default:
       _bfd_error_handler
 	/* xgettext:c-format */
-	(_("%pB: Unsupported transition from %s to %s"),
+	(_("%pB: unsupported transition from %s to %s"),
 	 input_bfd,
 	 elf_mn10300_howto_table[r_type].name,
 	 elf_mn10300_howto_table[tls_r_type].name);
diff --git a/bfd/elf-s390-common.c b/bfd/elf-s390-common.c
index 30695be..21195f2 100644
--- a/bfd/elf-s390-common.c
+++ b/bfd/elf-s390-common.c
@@ -286,12 +286,12 @@  elf_s390_merge_obj_attributes (bfd *ibfd, struct bfd_link_info *info)
   if (in_attr->i > 2)
     _bfd_error_handler
       /* xgettext:c-format */
-      (_("Warning: %pB uses unknown vector ABI %d"), ibfd,
+      (_("warning: %pB uses unknown vector ABI %d"), ibfd,
        in_attr->i);
   else if (out_attr->i > 2)
     _bfd_error_handler
       /* xgettext:c-format */
-      (_("Warning: %pB uses unknown vector ABI %d"), obfd,
+      (_("warning: %pB uses unknown vector ABI %d"), obfd,
        out_attr->i);
   else if (in_attr->i != out_attr->i)
     {
@@ -303,7 +303,7 @@  elf_s390_merge_obj_attributes (bfd *ibfd, struct bfd_link_info *info)
 
 	  _bfd_error_handler
 	    /* xgettext:c-format */
-	    (_("Warning: %pB uses vector %s ABI, %pB uses %s ABI"),
+	    (_("warning: %pB uses vector %s ABI, %pB uses %s ABI"),
 	     ibfd, abi_str[in_attr->i], obfd, abi_str[out_attr->i]);
 	}
       if (in_attr->i > out_attr->i)
diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c
index f6c6a8c..3bee87d 100644
--- a/bfd/elf32-arc.c
+++ b/bfd/elf32-arc.c
@@ -617,8 +617,8 @@  arc_elf_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
 	      /* It's sometimes ok to mix different configs, so this is only
 		 a warning.  */
 	      _bfd_error_handler
-		(_("Warning: %pB: Conflicting platform configuration "
-		   "%s with %s.\n"), ibfd,
+		(_("warning: %pB: conflicting platform configuration "
+		   "%s with %s"), ibfd,
 		 tagval[in_attr[i].i],
 		 tagval[out_attr[i].i]);
 	    }
@@ -637,7 +637,7 @@  arc_elf_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
 	      /* We cannot mix code for different CPUs.  */
 	      _bfd_error_handler
 		(_("error: %pB: unable to merge CPU base attributes "
-		   "%s with %s.\n"),
+		   "%s with %s"),
 		 obfd,
 		 tagval[in_attr[i].i],
 		 tagval[out_attr[i].i]);
@@ -674,7 +674,7 @@  arc_elf_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
 		  {
 		    _bfd_error_handler
 		      (_("error: %pB: unable to merge ISA extension attributes "
-			 "%s.\n"),
+			 "%s"),
 		       obfd, bfd_feature_list[j].name);
 		    result = FALSE;
 		    break;
@@ -698,7 +698,7 @@  arc_elf_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
 		      }
 		    _bfd_error_handler
 		      (_("error: %pB: conflicting ISA extension attributes "
-			 "%s with %s.\n"),
+			 "%s with %s"),
 		       obfd, p1, p2);
 		    result = FALSE;
 		    break;
@@ -732,7 +732,7 @@  arc_elf_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
 	    {
 	      /* We cannot mix code with rf16 and without.  */
 	      _bfd_error_handler
-		(_("error: %pB: cannot mix rf16 with full register set %pB.\n"),
+		(_("error: %pB: cannot mix rf16 with full register set %pB"),
 		 obfd, ibfd);
 	      result = FALSE;
 	    }
@@ -758,7 +758,7 @@  arc_elf_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
 		&& out_attr[i].i != in_attr[i].i)
 	      {
 		_bfd_error_handler
-		  (_("error: %pB: conflicting attributes %s: %s with %s.\n"),
+		  (_("error: %pB: conflicting attributes %s: %s with %s"),
 		   obfd, tagname,
 		   tagval[in_attr[i].i],
 		   tagval[out_attr[i].i]);
@@ -783,7 +783,7 @@  arc_elf_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
 	      && out_attr[i].i != in_attr[i].i)
 	    {
 	      _bfd_error_handler
-		(_("error: %pB: conflicting attributes %s.\n"),
+		(_("error: %pB: conflicting attributes %s"),
 		 obfd, tagname);
 	      result = FALSE;
 	    }
@@ -883,7 +883,7 @@  arc_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
       if (mach_ibfd != mach_obfd)
 	{
 	  /* xgettext:c-format */
-	  _bfd_error_handler (_("ERROR: Attempting to link %pB "
+	  _bfd_error_handler (_("error: attempting to link %pB "
 				"with a binary %pB of different architecture"),
 			      ibfd, obfd);
 	  return FALSE;
@@ -986,14 +986,14 @@  arc_elf_object_p (bfd * abfd)
       if (e_machine == EM_ARC)
 	{
 	  _bfd_error_handler
-	    (_("Error: The ARC4 architecture is no longer supported.\n"));
+	    (_("error: the ARC4 architecture is no longer supported"));
 	  return FALSE;
 	}
       else
 	{
 	  _bfd_error_handler
-	    (_("Warning: unset or old architecture flags. \n"
-	       "	       Use default machine.\n"));
+	    (_("warning: unset or old architecture flags; "
+	       "use default machine"));
 	}
     }
 
@@ -1828,7 +1828,7 @@  elf_arc_relocate_section (bfd *			  output_bfd,
 	  && !reloc_data.sdata_begin_symbol_vma_set)
 	{
 	  _bfd_error_handler
-	    ("Error: Linker symbol __SDATA_BEGIN__ not found");
+	    ("error: linker symbol __SDATA_BEGIN__ not found");
 	  bfd_set_error (bfd_error_bad_value);
 	  return FALSE;
 	}
@@ -1841,7 +1841,7 @@  elf_arc_relocate_section (bfd *			  output_bfd,
 	  && reloc_data.sym_section == NULL)
 	{
 	  _bfd_error_handler
-	    (_("GOT and PLT relocations cannot be fixed with a non dynamic linker."));
+	    (_("GOT and PLT relocations cannot be fixed with a non dynamic linker"));
 	  bfd_set_error (bfd_error_bad_value);
 	  return FALSE;
 	}
@@ -1973,11 +1973,11 @@  elf_arc_check_relocs (bfd *			 abfd,
 		  name = "UNKNOWN";
 		_bfd_error_handler
 		  /* xgettext:c-format */
-		  (_("\
-%pB: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"),
-		    abfd,
-		    arc_elf_howto (r_type)->name,
-		    name);
+		  (_("%pB: relocation %s against `%s' can not be used"
+		     " when making a shared object; recompile with -fPIC"),
+		   abfd,
+		   arc_elf_howto (r_type)->name,
+		   name);
 		bfd_set_error (bfd_error_bad_value);
 		return FALSE;
 	      }
@@ -2865,7 +2865,7 @@  elf32_arc_obj_attrs_handle_unknown (bfd *abfd, int tag)
   if ((tag & 127) < (Tag_ARC_ISA_mpy_option + 1))
     {
       _bfd_error_handler
-	(_("%pB: Unknown mandatory ARC object attribute %d."),
+	(_("%pB: unknown mandatory ARC object attribute %d"),
 	 abfd, tag);
       bfd_set_error (bfd_error_bad_value);
       return FALSE;
@@ -2873,7 +2873,7 @@  elf32_arc_obj_attrs_handle_unknown (bfd *abfd, int tag)
   else
     {
       _bfd_error_handler
-	(_("Warning: %pB: Unknown ARC object attribute %d."),
+	(_("warning: %pB: unknown ARC object attribute %d"),
 	 abfd, tag);
       return TRUE;
     }
diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index 4c6d4da..f47deb0 100644
--- a/bfd/elf32-cris.c
+++ b/bfd/elf32-cris.c
@@ -1179,10 +1179,10 @@  cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
 	      _bfd_error_handler
 		((h->got.offset == (bfd_vma) -1)
 		 /* xgettext:c-format */
-		 ? _("%pB, section %pA: No PLT nor GOT for relocation %s"
+		 ? _("%pB, section %pA: no PLT nor GOT for relocation %s"
 		     " against symbol `%s'")
 		 /* xgettext:c-format */
-		 : _("%pB, section %pA: No PLT for relocation %s"
+		 : _("%pB, section %pA: no PLT for relocation %s"
 		     " against symbol `%s'"),
 		 input_bfd,
 		 input_section,
@@ -3045,7 +3045,7 @@  cris_elf_check_relocs (bfd *abfd,
 		{
 		  _bfd_error_handler
 		    /* xgettext:c-format */
-		    (_("%pB, section %pA:\n  v10/v32 compatible object"
+		    (_("%pB, section %pA: v10/v32 compatible object"
 		       " must not contain a PIC relocation"),
 		     abfd, sec);
 		  return FALSE;
@@ -3317,7 +3317,7 @@  cris_elf_check_relocs (bfd *abfd,
 	      /* FIXME: How do we make this optionally a warning only?  */
 	      _bfd_error_handler
 		/* xgettext:c-format */
-		(_("%pB, section %pA:\n  relocation %s should not"
+		(_("%pB, section %pA: relocation %s should not"
 		   " be used in a shared object; recompile with -fPIC"),
 		 abfd,
 		 sec,
@@ -3742,8 +3742,8 @@  elf_cris_discard_excess_dso_dynamics (struct elf_cris_link_hash_entry *h,
 	/* FIXME: How do we make this optionally a warning only?  */
 	_bfd_error_handler
 	  /* xgettext:c-format */
-	  (_("%pB, section `%pA', to symbol `%s':\n"
-	     "  relocation %s should not be used"
+	  (_("%pB, section `%pA', to symbol `%s':"
+	     " relocation %s should not be used"
 	     " in a shared object; recompile with -fPIC"),
 	   s->section->owner,
 	   s->section,
@@ -3855,7 +3855,7 @@  cris_elf_final_write_processing (bfd *abfd,
 
     default:
       _bfd_abort (__FILE__, __LINE__,
-		  _("Unexpected machine number"));
+		  _("unexpected machine number"));
     }
 
   elf_elfheader (abfd)->e_flags = e_flags;
diff --git a/bfd/elf32-dlx.c b/bfd/elf32-dlx.c
index c89ab5c..907eddd 100644
--- a/bfd/elf32-dlx.c
+++ b/bfd/elf32-dlx.c
@@ -138,7 +138,7 @@  elf32_dlx_relocate16 (bfd *abfd,
   if (strcmp (input_section->name, symbol->section->output_section->name) != 0)
     {
       _bfd_error_handler
-	(_("BFD Link Error: branch (PC rel16) to section (%s) not supported"),
+	(_("branch (PC rel16) to section (%s) not supported"),
 	 symbol->section->output_section->name);
       return bfd_reloc_undefined;
     }
@@ -201,7 +201,7 @@  elf32_dlx_relocate26 (bfd *abfd,
   if (strcmp (input_section->name, symbol->section->output_section->name) != 0)
     {
       _bfd_error_handler
-	(_("BFD Link Error: jump (PC rel26) to section (%s) not supported"),
+	(_("jump (PC rel26) to section (%s) not supported"),
 	 symbol->section->output_section->name);
       return bfd_reloc_undefined;
     }
diff --git a/bfd/elf32-frv.c b/bfd/elf32-frv.c
index 6af2aaf..91815df 100644
--- a/bfd/elf32-frv.c
+++ b/bfd/elf32-frv.c
@@ -3530,9 +3530,10 @@  elf32_frv_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
 		    if (addend)
 		      {
 			info->callbacks->einfo
-			  (_("%H: R_FRV_FUNCDESC references dynamic symbol"
+			  (_("%H: %s references dynamic symbol"
 			     " with nonzero addend\n"),
-			   input_bfd, input_section, rel->r_offset);
+			   input_bfd, input_section, rel->r_offset,
+			   "R_FRV_FUNCDESC");
 			return FALSE;
 		      }
 		    dynindx = h->dynindx;
@@ -3651,9 +3652,10 @@  elf32_frv_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
 		if (addend && r_type == R_FRV_FUNCDESC_VALUE)
 		  {
 		    info->callbacks->einfo
-		      (_("%H: R_FRV_FUNCDESC_VALUE"
-			 " references dynamic symbol with nonzero addend\n"),
-		       input_bfd, input_section, rel->r_offset);
+		      (_("%H: %s references dynamic symbol"
+			 " with nonzero addend\n"),
+		       input_bfd, input_section, rel->r_offset,
+		       "R_FRV_FUNCDESC_VALUE");
 		    return FALSE;
 		  }
 		dynindx = h->dynindx;
diff --git a/bfd/elf32-i370.c b/bfd/elf32-i370.c
index 37e7733..79ec159 100644
--- a/bfd/elf32-i370.c
+++ b/bfd/elf32-i370.c
@@ -1068,7 +1068,6 @@  i370_elf_relocate_section (bfd *output_bfd,
       Elf_Internal_Sym *sym	     = NULL;
       asection *sec		     = NULL;
       struct elf_link_hash_entry * h = NULL;
-      const char *sym_name	     = NULL;
       reloc_howto_type *howto;
       unsigned long r_symndx;
       bfd_vma relocation;
@@ -1094,7 +1093,6 @@  i370_elf_relocate_section (bfd *output_bfd,
 	{
 	  sym = local_syms + r_symndx;
 	  sec = local_sections[r_symndx];
-	  sym_name = "<local symbol>";
 
 	  relocation = _bfd_elf_rela_local_sym (output_bfd, sym, & sec, rel);
 	  addend = rel->r_addend;
@@ -1111,7 +1109,6 @@  i370_elf_relocate_section (bfd *output_bfd,
 	  while (h->root.type == bfd_link_hash_indirect
 		 || h->root.type == bfd_link_hash_warning)
 	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
-	  sym_name = h->root.root.string;
 	  if (h->root.type == bfd_link_hash_defined
 	      || h->root.type == bfd_link_hash_defweak)
 	    {
@@ -1301,28 +1298,15 @@  i370_elf_relocate_section (bfd *output_bfd,
 
 	case (int) R_I370_COPY:
 	case (int) R_I370_RELATIVE:
-	  _bfd_error_handler
-	    /* xgettext:c-format */
-	    (_("%pB: Relocation %s is not yet supported for symbol %s."),
-	     input_bfd,
-	     i370_elf_howto_table[(int) r_type]->name,
-	     sym_name);
-
+	  /* xgettext:c-format */
+	  _bfd_error_handler (_("%pB: %s unsupported"),
+			      input_bfd,
+			      i370_elf_howto_table[(int) r_type]->name);
 	  bfd_set_error (bfd_error_invalid_operation);
 	  ret = FALSE;
 	  continue;
 	}
 
-#ifdef DEBUG
-      fprintf (stderr, "\ttype = %s (%d), name = %s, symbol index = %ld, offset = %ld, addend = %ld\n",
-	       howto->name,
-	       (int)r_type,
-	       sym_name,
-	       r_symndx,
-	       (long) offset,
-	       (long) addend);
-#endif
-
       r = _bfd_final_link_relocate (howto, input_bfd, input_section, contents,
 				    offset, relocation, addend);
 
diff --git a/bfd/elf32-lm32.c b/bfd/elf32-lm32.c
index 07279ed..0cd67b4 100644
--- a/bfd/elf32-lm32.c
+++ b/bfd/elf32-lm32.c
@@ -996,7 +996,9 @@  lm32_elf_relocate_section (bfd *output_bfd,
 
 	      /* Addend should be zero.  */
 	      if (rel->r_addend != 0)
-		_bfd_error_handler (_("internal error: addend should be zero for R_LM32_16_GOT"));
+		_bfd_error_handler
+		  (_("internal error: addend should be zero for %s"),
+		   "R_LM32_16_GOT");
 
 	      r = _bfd_final_link_relocate (howto,
 					    input_bfd,
diff --git a/bfd/elf32-m32r.c b/bfd/elf32-m32r.c
index dfbfc70..0129c29 100644
--- a/bfd/elf32-m32r.c
+++ b/bfd/elf32-m32r.c
@@ -2969,7 +2969,8 @@  m32r_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
 		  {
 		    _bfd_error_handler
 		      /* xgettext:c-format */
-		      (_("%pB: The target (%s) of an %s relocation is in the wrong section (%pA)"),
+		      (_("%pB: the target (%s) of an %s relocation"
+			 " is in the wrong section (%pA)"),
 		       input_bfd,
 		       sym_name,
 		       m32r_elf_howto_table[(int) r_type].name,
@@ -3471,7 +3472,7 @@  m32r_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
 	  || ((in_flags  & EF_M32R_ARCH) == E_M32R2_ARCH))
 	{
 	  _bfd_error_handler
-	    (_("%pB: Instruction set mismatch with previous modules"), ibfd);
+	    (_("%pB: instruction set mismatch with previous modules"), ibfd);
 
 	  bfd_set_error (bfd_error_bad_value);
 	  return FALSE;
diff --git a/bfd/elf32-m68hc1x.c b/bfd/elf32-m68hc1x.c
index dcb13d6..794663a 100644
--- a/bfd/elf32-m68hc1x.c
+++ b/bfd/elf32-m68hc1x.c
@@ -1112,7 +1112,7 @@  elf32_m68hc11_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
 	  /* Get virtual address of instruction having the relocation.  */
 	  if (is_far)
 	    {
-	      msg = _("Reference to the far symbol `%s' using a wrong "
+	      msg = _("reference to the far symbol `%s' using a wrong "
 		      "relocation may result in incorrect execution");
 	      buf = xmalloc (strlen (msg) + strlen (name) + 10);
 	      sprintf (buf, msg, name);
diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c
index 95db3a0..2718564 100644
--- a/bfd/elf32-m68k.c
+++ b/bfd/elf32-m68k.c
@@ -1656,14 +1656,14 @@  elf_m68k_add_entry_to_got (struct elf_m68k_got *got,
       if (got->n_slots[R_8] > ELF_M68K_R_8_MAX_N_SLOTS_IN_GOT (info))
 	/* xgettext:c-format */
 	_bfd_error_handler (_("%pB: GOT overflow: "
-			      "Number of relocations with 8-bit "
+			      "number of relocations with 8-bit "
 			      "offset > %d"),
 			    abfd,
 			    ELF_M68K_R_8_MAX_N_SLOTS_IN_GOT (info));
       else
 	/* xgettext:c-format */
 	_bfd_error_handler (_("%pB: GOT overflow: "
-			      "Number of relocations with 8- or 16-bit "
+			      "number of relocations with 8- or 16-bit "
 			      "offset > %d"),
 			    abfd,
 			    ELF_M68K_R_8_16_MAX_N_SLOTS_IN_GOT (info));
diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
index 388bda3..29fffb4 100644
--- a/bfd/elf32-microblaze.c
+++ b/bfd/elf32-microblaze.c
@@ -1061,7 +1061,7 @@  microblaze_elf_relocate_section (bfd *output_bfd,
 		      {
 			_bfd_error_handler
 			  /* xgettext:c-format */
-			  (_("%pB: The target (%s) of an %s relocation"
+			  (_("%pB: the target (%s) of an %s relocation"
 			     " is in the wrong section (%pA)"),
 			   input_bfd,
 			   sym_name,
@@ -1109,7 +1109,7 @@  microblaze_elf_relocate_section (bfd *output_bfd,
 		      {
 			_bfd_error_handler
 			  /* xgettext:c-format */
-			  (_("%pB: The target (%s) of an %s relocation"
+			  (_("%pB: the target (%s) of an %s relocation"
 			     " is in the wrong section (%pA)"),
 			   input_bfd,
 			   sym_name,
diff --git a/bfd/elf32-msp430.c b/bfd/elf32-msp430.c
index 1f334c4..9f2a3d0 100644
--- a/bfd/elf32-msp430.c
+++ b/bfd/elf32-msp430.c
@@ -831,7 +831,7 @@  msp430_final_link_relocate (reloc_howto_type *	   howto,
 		  {
 		    info->callbacks->warning
 		      (info,
-		       _("Try enabling relaxation to avoid relocation truncations"),
+		       _("try enabling relaxation to avoid relocation truncations"),
 		       NULL, input_bfd, input_section, relocation);
 		    warned = TRUE;
 		  }
@@ -1145,7 +1145,7 @@  msp430_final_link_relocate (reloc_howto_type *	   howto,
 		{
 		  info->callbacks->warning
 		    (info,
-		     _("Try enabling relaxation to avoid relocation truncations"),
+		     _("try enabling relaxation to avoid relocation truncations"),
 		     NULL, input_bfd, input_section, relocation);
 		  warned = TRUE;
 		}
@@ -2351,7 +2351,7 @@  elf32_msp430_obj_attrs_handle_unknown (bfd *abfd, int tag)
 {
   _bfd_error_handler
     /* xgettext:c-format */
-    (_("Warning: %pB: Unknown MSPABI object attribute %d"),
+    (_("warning: %pB: unknown MSPABI object attribute %d"),
      abfd, tag);
   return TRUE;
 }
diff --git a/bfd/elf32-nds32.c b/bfd/elf32-nds32.c
index e325db3..62e8572 100644
--- a/bfd/elf32-nds32.c
+++ b/bfd/elf32-nds32.c
@@ -3230,7 +3230,7 @@  nds32_elf_final_sda_base (bfd *output_bfd, struct bfd_link_info *info,
 	}
       else
 	{
-	  _bfd_error_handler (_("error: Can't find symbol: _SDA_BASE_."));
+	  _bfd_error_handler (_("error: can't find symbol: %s"), "_SDA_BASE_");
 	  return bfd_reloc_dangerous;
 	}
     }
@@ -4408,15 +4408,15 @@  nds32_elf_relocate_section (bfd *		   output_bfd ATTRIBUTE_UNUSED,
       /* Set the _ITB_BASE_.  */
       if (!nds32_elf_ex9_itb_base (info))
 	{
-	  _bfd_error_handler (_("%pB: error: Cannot set _ITB_BASE_"),
-			      output_bfd);
+	  _bfd_error_handler (_("%pB: error: cannot set %s"),
+			      output_bfd, "_ITB_BASE_");
 	  bfd_set_error (bfd_error_bad_value);
 	}
     }
 
   if (table->target_optimize & NDS32_RELAX_JUMP_IFC_ON)
     if (!nds32_elf_ifc_reloc ())
-      _bfd_error_handler (_("error: IFC relocation error."));
+      _bfd_error_handler (_("error: IFC relocation error"));
 
  /* Relocation for .ex9.itable.  */
   if (table->target_optimize & NDS32_RELAX_EX9_ON
@@ -4896,8 +4896,8 @@  nds32_elf_relocate_section (bfd *		   output_bfd ATTRIBUTE_UNUSED,
 	  if (bfd_link_pic (info))
 	    {
 	      _bfd_error_handler
-		(_("%pB: warning: cannot deal R_NDS32_25_ABS_RELA in shared "
-		   "mode."), input_bfd);
+		(_("%pB: warning: %s unsupported in shared mode"),
+		 input_bfd, "R_NDS32_25_ABS_RELA");
 	      return FALSE;
 	    }
 	  break;
@@ -5030,7 +5030,7 @@  nds32_elf_relocate_section (bfd *		   output_bfd ATTRIBUTE_UNUSED,
 	    {
 	      /* Incorrect alignment.  */
 	      _bfd_error_handler
-		(_("%pB: warning: unaligned access to GOT entry."), input_bfd);
+		(_("%pB: warning: unaligned access to GOT entry"), input_bfd);
 	      ret = FALSE;
 	      r = bfd_reloc_dangerous;
 	      goto check_reloc;
@@ -5072,7 +5072,7 @@  handle_sda:
 	      if (r != bfd_reloc_ok)
 		{
 		  _bfd_error_handler
-		    (_("%pB: warning: relocate SDA_BASE failed."), input_bfd);
+		    (_("%pB: warning: relocate SDA_BASE failed"), input_bfd);
 		  ret = FALSE;
 		  goto check_reloc;
 		}
@@ -5094,7 +5094,8 @@  handle_sda:
 		  /* Incorrect alignment.  */
 		  _bfd_error_handler
 		    /* xgettext:c-format */
-		    (_("%pB(%pA): warning: unaligned small data access of type %d."),
+		    (_("%pB(%pA): warning: unaligned small data access"
+		       " of type %d"),
 		     input_bfd, input_section, r_type);
 		  ret = FALSE;
 		  goto check_reloc;
@@ -5886,7 +5887,7 @@  nds32_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
   if (bfd_little_endian (ibfd) != bfd_little_endian (obfd))
     {
       _bfd_error_handler
-	(_("%pB: warning: Endian mismatch with previous modules."), ibfd);
+	(_("%pB: warning: endian mismatch with previous modules"), ibfd);
 
       bfd_set_error (bfd_error_bad_value);
       return FALSE;
@@ -5896,8 +5897,8 @@  nds32_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
   if (in_version == E_NDS32_ELF_VER_1_2)
     {
       _bfd_error_handler
-	(_("%pB: warning: Older version of object file encountered, "
-	   "Please recompile with current tool chain."), ibfd);
+	(_("%pB: warning: older version of object file encountered, "
+	   "please recompile with current tool chain"), ibfd);
     }
 
   /* We may need to merge V1 and V2 arch object files to V2.  */
@@ -5974,7 +5975,7 @@  nds32_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
   if ((in_flags & EF_NDS_ABI) != (out_flags & EF_NDS_ABI))
     {
       _bfd_error_handler
-	(_("%pB: error: ABI mismatch with previous modules."), ibfd);
+	(_("%pB: error: ABI mismatch with previous modules"), ibfd);
 
       bfd_set_error (bfd_error_bad_value);
       return FALSE;
@@ -5985,7 +5986,8 @@  nds32_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
       if (((in_flags & EF_NDS_ARCH) != E_N1_ARCH))
 	{
 	  _bfd_error_handler
-	    (_("%pB: error: Instruction set mismatch with previous modules."), ibfd);
+	    (_("%pB: error: instruction set mismatch with previous modules"),
+	     ibfd);
 
 	  bfd_set_error (bfd_error_bad_value);
 	  return FALSE;
@@ -6011,7 +6013,7 @@  nds32_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
       if (in_version != out_version)
 	_bfd_error_handler
 	  /* xgettext:c-format */
-	  (_("%pB: warning: Incompatible elf-versions %s and  %s."),
+	  (_("%pB: warning: incompatible elf-versions %s and %s"),
 	   ibfd, nds32_elfver_strtab[out_version],
 	   nds32_elfver_strtab[in_version]);
 
@@ -8533,7 +8535,8 @@  done_adjust_diff:
 		  && (blank_t2->offset > raddr
 		      || blank_t2->next->offset <= raddr))
 		_bfd_error_handler
-		  (_("%pB: Error: search_nds32_elf_blank reports wrong node\n"), abfd);
+		  (_("%pB: error: search_nds32_elf_blank reports wrong node"),
+		   abfd);
 
 	      /* Mark reloc in deleted portion as NONE.
 		 For some relocs like R_NDS32_LABEL that doesn't modify the
@@ -11652,7 +11655,7 @@  nds32_elf_pick_relax (bfd_boolean init, asection *sec, bfd_boolean *again,
 	  break;
 	case NDS32_RELAX_JUMP_IFC_ROUND:
 	  if (!nds32_elf_ifc_finish (link_info))
-	    _bfd_error_handler (_("error: Jump IFC Fail."));
+	    _bfd_error_handler (_("error: jump IFC fail"));
 	  if (table->target_optimize & NDS32_RELAX_EX9_ON)
 	    {
 	      pass++;
@@ -11669,7 +11672,7 @@  nds32_elf_pick_relax (bfd_boolean init, asection *sec, bfd_boolean *again,
 	    {
 	      /* Do jump IFC optimization again.  */
 	      if (!nds32_elf_ifc_finish (link_info))
-		_bfd_error_handler (_("error: Jump IFC Fail."));
+		_bfd_error_handler (_("error: jump IFC fail"));
 	    }
 	  break;
 	default:
@@ -11780,7 +11783,8 @@  nds32_elf_relax_section (bfd *abfd, asection *sec,
       /* Set the _ITB_BASE_.  */
       if (!nds32_elf_ex9_itb_base (link_info))
 	{
-	  _bfd_error_handler (_("%pB: error: Cannot set _ITB_BASE_"), abfd);
+	  _bfd_error_handler (_("%pB: error: cannot set %s"),
+			      abfd, "_ITB_BASE_");
 	  bfd_set_error (bfd_error_bad_value);
 	}
     }
@@ -12526,7 +12530,7 @@  nds32_relax_fp_as_gp (struct bfd_link_info *link_info,
 	  /* Begin of the region.  */
 	  if (begin_rel)
 	    /* xgettext:c-format */
-	    _bfd_error_handler (_("%pB: Nested OMIT_FP in %pA."), abfd, sec);
+	    _bfd_error_handler (_("%pB: nested OMIT_FP in %pA"), abfd, sec);
 
 	  begin_rel = irel;
 	  nds32_fag_init (&fag_head);
@@ -12545,7 +12549,8 @@  nds32_relax_fp_as_gp (struct bfd_link_info *link_info,
 	  if (begin_rel == NULL)
 	    {
 	      /* xgettext:c-format */
-	      _bfd_error_handler (_("%pB: Unmatched OMIT_FP in %pA."), abfd, sec);
+	      _bfd_error_handler (_("%pB: unmatched OMIT_FP in %pA"),
+				  abfd, sec);
 	      continue;
 	    }
 
@@ -14604,7 +14609,7 @@  nds32_elf_ex9_init (void)
 			      sizeof (struct elf_nds32_code_hash_entry),
 			      1023))
     {
-      _bfd_error_handler (_("Linker: cannot init ex9 hash table error \n"));
+      _bfd_error_handler (_("cannot init ex9 hash table error"));
       return FALSE;
     }
   return TRUE;
@@ -15013,7 +15018,7 @@  nds32_elf_ex9_reloc_jmp (struct bfd_link_info *link_info)
 					 (fix_ptr->sec->owner, fix_ptr->sec,
 					  &source_contents, TRUE))
 				    _bfd_error_handler
-				      (_("Linker: error cannot fixed ex9 relocation \n"));
+				      (_("error: cannot fix ex9 relocation"));
 				  if (temp_ptr->order < 32)
 				    insn_ex9 = INSN_EX9_IT_2;
 				  else
diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c
index 450eeed..29e1e5a 100644
--- a/bfd/elf32-nios2.c
+++ b/bfd/elf32-nios2.c
@@ -2926,7 +2926,7 @@  nios2_elf32_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
 	  if (bfd_big_endian (ibfd))
 	    {
 	      _bfd_error_handler
-		(_("error: %pB: Big-endian R2 is not supported."), ibfd);
+		(_("error: %pB: big-endian R2 is not supported"), ibfd);
 	      bfd_set_error (bfd_error_bad_value);
 	      return FALSE;
 	    }
@@ -2942,7 +2942,7 @@  nios2_elf32_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
 	 architectures.  */
       _bfd_error_handler
 	/* xgettext:c-format */
-	(_("error: %pB: Conflicting CPU architectures %d/%d"),
+	(_("error: %pB: conflicting CPU architectures %d/%d"),
 	 ibfd, new_flags, old_flags);
       bfd_set_error (bfd_error_bad_value);
       return FALSE;
@@ -3831,10 +3831,10 @@  nios2_elf32_relocate_section (bfd *output_bfd,
 		      if (h)
 			name = h->root.root.string;
 		      /* xgettext:c-format */
-		      format = _("Unable to reach %s (at 0x%08x) from the "
+		      format = _("unable to reach %s (at 0x%08x) from the "
 				 "global pointer (at 0x%08x) because the "
 				 "offset (%d) is out of the allowed range, "
-				 "-32678 to 32767.\n" );
+				 "-32678 to 32767\n" );
 		      sprintf (msgbuf, format, name, symbol_address, gp,
 			       (signed)relocation);
 		      msg = msgbuf;
diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c
index 816c796..3818df9 100644
--- a/bfd/elf32-or1k.c
+++ b/bfd/elf32-or1k.c
@@ -963,7 +963,8 @@  or1k_elf_relocate_section (bfd *output_bfd,
 	  /* Addend should be zero.  */
 	  if (rel->r_addend != 0)
 	    _bfd_error_handler
-	      (_("internal error: addend should be zero for R_OR1K_GOT16"));
+	      (_("internal error: addend should be zero for %s"),
+	       "R_OR1K_GOT16");
 
 	  break;
 
@@ -2639,7 +2640,8 @@  elf32_or1k_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
   if ((in_flags & EF_OR1K_NODELAY) != (out_flags & EF_OR1K_NODELAY))
     {
       _bfd_error_handler
-	(_("%pB: EF_OR1K_NODELAY flag mismatch with previous modules"), ibfd);
+	(_("%pB: %s flag mismatch with previous modules"),
+	 ibfd, "EF_OR1K_NODELAY");
 
       bfd_set_error (bfd_error_bad_value);
       return FALSE;
diff --git a/bfd/elf32-rl78.c b/bfd/elf32-rl78.c
index 0ca6dd1..7cfe312 100644
--- a/bfd/elf32-rl78.c
+++ b/bfd/elf32-rl78.c
@@ -368,7 +368,7 @@  static unsigned int rl78_stack_top;
       if (rl78_stack_top < NUM_STACK_ENTRIES)	\
 	rl78_stack [rl78_stack_top ++] = (val);	\
       else					\
-	_bfd_error_handler (_("Internal Error: RL78 reloc stack overflow")); \
+	_bfd_error_handler (_("internal error: RL78 reloc stack overflow")); \
     }						\
   while (0)
 
@@ -379,7 +379,7 @@  static unsigned int rl78_stack_top;
 	(dest) = rl78_stack [-- rl78_stack_top];\
       else					\
 	{					\
-	  _bfd_error_handler (_("Internal Error: RL78 reloc stack underflow")); \
+	  _bfd_error_handler (_("internal error: RL78 reloc stack underflow")); \
 	  (dest) = 0;				\
 	}					\
     }						\
@@ -1048,7 +1048,8 @@  rl78_elf_relocate_section
 	    {
 	      relocation = 0;
 	      if (h->root.type != bfd_link_hash_undefweak)
-		_bfd_error_handler (_("Warning: RL78_SYM reloc with an unknown symbol"));
+		_bfd_error_handler
+		  (_("warning: RL78_SYM reloc with an unknown symbol"));
 	    }
 	  (void) rl78_compute_complex_reloc (r_type, relocation, input_section);
 	  break;
diff --git a/bfd/elf32-rx.c b/bfd/elf32-rx.c
index 9257f79..42f5fc2 100644
--- a/bfd/elf32-rx.c
+++ b/bfd/elf32-rx.c
@@ -661,13 +661,20 @@  rx_elf_relocate_section
 
       r = bfd_reloc_ok;
 
-#define RANGE(a,b) if (a > (long) relocation || (long) relocation > b) r = bfd_reloc_overflow
-#define ALIGN(m)   if (relocation & m) r = bfd_reloc_other;
-#define OP(i)      (contents[rel->r_offset + (i)])
+#define RANGE(a,b) \
+  if (a > (long) relocation || (long) relocation > b)		\
+    r = bfd_reloc_overflow
+#define ALIGN(m) \
+  if (relocation & m)						\
+    r = bfd_reloc_other
+#define OP(i) \
+  (contents[rel->r_offset + (i)])
 #define WARN_REDHAT(type) \
-      /* xgettext:c-format */ \
-      _bfd_error_handler (_("%pB:%pA: Warning: deprecated Red Hat reloc " type " detected against: %s."), \
-      input_bfd, input_section, name)
+  /* xgettext:c-format */					\
+  _bfd_error_handler						\
+    (_("%pB:%pA: warning: deprecated Red Hat reloc "		\
+       "%s detected against: %s"),				\
+     input_bfd, input_section, #type, name)
 
       /* Check for unsafe relocs in PID mode.  These are any relocs where
 	 an absolute address is being computed.  There are special cases
@@ -1268,7 +1275,8 @@  rx_elf_relocate_section
 			       + sec->output_offset
 			       + rel->r_addend);
 	      else
-		_bfd_error_handler (_("Warning: RX_SYM reloc with an unknown symbol"));
+		_bfd_error_handler
+		  (_("warning: RX_SYM reloc with an unknown symbol"));
 	    }
 	  break;
 
@@ -3147,7 +3155,7 @@  rx_elf_merge_private_bfd_data (bfd * ibfd, struct bfd_link_info *info)
 	    }
 	  else
 	    {
-	      _bfd_error_handler (_("There is a conflict merging the"
+	      _bfd_error_handler (_("there is a conflict merging the"
 				    " ELF header flags from %pB"),
 				  ibfd);
 	      _bfd_error_handler (_("  the input  file's flags: %s"),
diff --git a/bfd/elf32-score.c b/bfd/elf32-score.c
index 66ae645..91d92cc 100644
--- a/bfd/elf32-score.c
+++ b/bfd/elf32-score.c
@@ -2741,7 +2741,7 @@  s3_bfd_score_elf_relocate_section (bfd *output_bfd,
 
 	    /* Use bfd_reloc_other to check lw48, sw48 word align.  */
 	    case bfd_reloc_other:
-	      msg = _("address not word align");
+	      msg = _("address not word aligned");
 	      goto common_error;
 
 	    default:
@@ -2822,7 +2822,7 @@  s3_bfd_score_elf_check_relocs (bfd *abfd,
 	{
 	  _bfd_error_handler
 	    /* xgettext:c-format */
-	    (_("%pB: Malformed reloc detected for section %pA"), abfd, sec);
+	    (_("%pB: malformed reloc detected for section %pA"), abfd, sec);
 	  bfd_set_error (bfd_error_bad_value);
 	  return FALSE;
 	}
diff --git a/bfd/elf32-score7.c b/bfd/elf32-score7.c
index e3f795c..b36c95e 100644
--- a/bfd/elf32-score7.c
+++ b/bfd/elf32-score7.c
@@ -2627,7 +2627,7 @@  s7_bfd_score_elf_check_relocs (bfd *abfd,
 	{
 	  _bfd_error_handler
 	    /* xgettext:c-format */
-	    (_("%pB: Malformed reloc detected for section %pA"), abfd, sec);
+	    (_("%pB: malformed reloc detected for section %pA"), abfd, sec);
 	  bfd_set_error (bfd_error_bad_value);
 	  return FALSE;
 	}
diff --git a/bfd/elf32-sh-symbian.c b/bfd/elf32-sh-symbian.c
index 625cca2..b0f519b 100644
--- a/bfd/elf32-sh-symbian.c
+++ b/bfd/elf32-sh-symbian.c
@@ -381,7 +381,7 @@  sh_symbian_process_embedded_commands (struct bfd_link_info *info, bfd * abfd,
 
 	  bfd_set_error (bfd_error_invalid_operation);
 	  /* xgettext:c-format */
-	  _bfd_error_handler (_("%pB: Unrecognised .directive command: %s"),
+	  _bfd_error_handler (_("%pB: unrecognized .directive command: %s"),
 			      abfd, directive);
 	  break;
 	}
@@ -499,7 +499,7 @@  sh_symbian_relocate_section (bfd *		    output_bfd,
 	  if (new_hash == NULL)
 	    {
 	      /* xgettext:c-format */
-	      _bfd_error_handler (_("%pB: Failed to add renamed symbol %s"),
+	      _bfd_error_handler (_("%pB: failed to add renamed symbol %s"),
 				  input_bfd, ptr->new_name);
 	      continue;
 	    }
diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c
index 91545f8..a13d60b 100644
--- a/bfd/elf32-sh.c
+++ b/bfd/elf32-sh.c
@@ -3947,7 +3947,7 @@  sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 	  if ((sym->st_other & STO_SH5_ISA32) != 0)
 	    (*info->callbacks->reloc_dangerous)
 	      (info,
-	       _("Unexpected STO_SH5_ISA32 on local symbol is not handled"),
+	       _("unexpected STO_SH5_ISA32 on local symbol is not handled"),
 	       input_bfd, input_section, rel->r_offset);
 
 	  if (sec != NULL && discarded_section (sec))
diff --git a/bfd/elf32-spu.c b/bfd/elf32-spu.c
index 8279550..d682de2 100644
--- a/bfd/elf32-spu.c
+++ b/bfd/elf32-spu.c
@@ -724,7 +724,7 @@  spu_elf_find_overlays (struct bfd_link_info *info)
 	      if ((s->vma - vma_start) & (htab->params->line_size - 1))
 		{
 		  info->callbacks->einfo (_("%X%P: overlay section %pA "
-					    "does not start on a cache line.\n"),
+					    "does not start on a cache line\n"),
 					  s);
 		  bfd_set_error (bfd_error_bad_value);
 		  return 0;
@@ -732,7 +732,7 @@  spu_elf_find_overlays (struct bfd_link_info *info)
 	      else if (s->size > htab->params->line_size)
 		{
 		  info->callbacks->einfo (_("%X%P: overlay section %pA "
-					    "is larger than a cache line.\n"),
+					    "is larger than a cache line\n"),
 					  s);
 		  bfd_set_error (bfd_error_bad_value);
 		  return 0;
@@ -752,7 +752,7 @@  spu_elf_find_overlays (struct bfd_link_info *info)
 	  if (s->vma < ovl_end)
 	    {
 	      info->callbacks->einfo (_("%X%P: overlay section %pA "
-					"is not in cache area.\n"),
+					"is not in cache area\n"),
 				      alloc_sec[i-1]);
 	      bfd_set_error (bfd_error_bad_value);
 	      return 0;
@@ -794,7 +794,7 @@  spu_elf_find_overlays (struct bfd_link_info *info)
 		      /* xgettext:c-format */
 		      info->callbacks->einfo (_("%X%P: overlay sections %pA "
 						"and %pA do not start at the "
-						"same address.\n"),
+						"same address\n"),
 					      s0, s);
 		      bfd_set_error (bfd_error_bad_value);
 		      return 0;
@@ -3321,7 +3321,7 @@  remove_cycles (struct function_info *fun,
 	      const char *f2 = func_name (call->fun);
 
 	      /* xgettext:c-format */
-	      info->callbacks->info (_("Stack analysis will ignore the call "
+	      info->callbacks->info (_("stack analysis will ignore the call "
 				       "from %s to %s\n"),
 				     f1, f2);
 	    }
diff --git a/bfd/elf32-v850.c b/bfd/elf32-v850.c
index 9a1b195..fa041e9 100644
--- a/bfd/elf32-v850.c
+++ b/bfd/elf32-v850.c
@@ -150,19 +150,19 @@  v850_elf_check_relocs (bfd *abfd,
 		  switch (h->other & V850_OTHER_MASK)
 		    {
 		    default:
-		      msg = _("Variable `%s' cannot occupy in multiple small data regions");
+		      msg = _("variable `%s' cannot occupy in multiple small data regions");
 		      break;
 		    case V850_OTHER_SDA | V850_OTHER_ZDA | V850_OTHER_TDA:
-		      msg = _("Variable `%s' can only be in one of the small, zero, and tiny data regions");
+		      msg = _("variable `%s' can only be in one of the small, zero, and tiny data regions");
 		      break;
 		    case V850_OTHER_SDA | V850_OTHER_ZDA:
-		      msg = _("Variable `%s' cannot be in both small and zero data regions simultaneously");
+		      msg = _("variable `%s' cannot be in both small and zero data regions simultaneously");
 		      break;
 		    case V850_OTHER_SDA | V850_OTHER_TDA:
-		      msg = _("Variable `%s' cannot be in both small and tiny data regions simultaneously");
+		      msg = _("variable `%s' cannot be in both small and tiny data regions simultaneously");
 		      break;
 		    case V850_OTHER_ZDA | V850_OTHER_TDA:
-		      msg = _("Variable `%s' cannot be in both zero and tiny data regions simultaneously");
+		      msg = _("variable `%s' cannot be in both zero and tiny data regions simultaneously");
 		      break;
 		    }
 
@@ -460,7 +460,7 @@  v850_elf_perform_lo16_relocation (bfd *abfd, unsigned long *insn,
 	}
       else
 	{
-	  _bfd_error_handler (_("FAILED to find previous HI16 reloc"));
+	  _bfd_error_handler (_("failed to find previous HI16 reloc"));
 	  return FALSE;
 	}
     }
@@ -2813,7 +2813,7 @@  v850_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
       if ((in_flags & EF_V800_850E3) != (out_flags & EF_V800_850E3))
 	{
 	  _bfd_error_handler
-	    (_("%pB: Architecture mismatch with previous modules"), ibfd);
+	    (_("%pB: architecture mismatch with previous modules"), ibfd);
 	  elf_elfheader (obfd)->e_flags |= EF_V800_850E3;
 	}
 
@@ -2869,7 +2869,7 @@  v850_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
 	}
 
       _bfd_error_handler
-	(_("%pB: Architecture mismatch with previous modules"), ibfd);
+	(_("%pB: architecture mismatch with previous modules"), ibfd);
     }
 
   return result;
@@ -3602,9 +3602,9 @@  v850_elf_relax_section (bfd *abfd,
 		{
 		  _bfd_error_handler
 		    /* xgettext:c-format */
-		    (_("%pB: %#" PRIx64 ": warning: R_V850_LONGCALL points to "
+		    (_("%pB: %#" PRIx64 ": warning: %s points to "
 		       "unrecognized insns"),
-		     abfd, (uint64_t) irel->r_offset);
+		     abfd, (uint64_t) irel->r_offset, "R_V850_LONGCALL");
 		  continue;
 		}
 
@@ -3612,10 +3612,11 @@  v850_elf_relax_section (bfd *abfd,
 		{
 		  _bfd_error_handler
 		    /* xgettext:c-format */
-		    (_("%pB: %#" PRIx64 ": warning: R_V850_LONGCALL points to "
+		    (_("%pB: %#" PRIx64 ": warning: %s points to "
 		       "unrecognized insn %#x"),
 		     abfd,
 		     (uint64_t) (irel->r_offset + no_match),
+		     "R_V850_LONGCALL",
 		     insn[no_match]);
 		  continue;
 		}
@@ -3657,9 +3658,9 @@  v850_elf_relax_section (bfd *abfd,
 		{
 		  _bfd_error_handler
 		    /* xgettext:c-format */
-		    (_("%pB: %#" PRIx64 ": warning: R_V850_LONGCALL points to "
+		    (_("%pB: %#" PRIx64 ": warning: %s points to "
 		       "unrecognized reloc"),
-		     abfd, (uint64_t) irel->r_offset);
+		     abfd, (uint64_t) irel->r_offset, "R_V850_LONGCALL");
 
 		  continue;
 		}
@@ -3697,9 +3698,9 @@  v850_elf_relax_section (bfd *abfd,
 		{
 		  _bfd_error_handler
 		    /* xgettext:c-format */
-		    (_("%pB: %#" PRIx64 ": warning: R_V850_LONGCALL points to "
+		    (_("%pB: %#" PRIx64 ": warning: %s points to "
 		       "unrecognized reloc %#" PRIx64),
-		     abfd, (uint64_t) irel->r_offset,
+		     abfd, (uint64_t) irel->r_offset, "R_V850_LONGCALL",
 		     (uint64_t) irelcall->r_offset);
 		  continue;
 		}
@@ -3840,9 +3841,9 @@  v850_elf_relax_section (bfd *abfd,
 		{
 		  _bfd_error_handler
 		    /* xgettext:c-format */
-		    (_("%pB: %#" PRIx64 ": warning: R_V850_LONGJUMP points to "
+		    (_("%pB: %#" PRIx64 ": warning: %s points to "
 		       "unrecognized insns"),
-		     abfd, (uint64_t) irel->r_offset);
+		     abfd, (uint64_t) irel->r_offset, "R_V850_LONGJUMP");
 		  continue;
 		}
 
@@ -3850,10 +3851,11 @@  v850_elf_relax_section (bfd *abfd,
 		{
 		  _bfd_error_handler
 		    /* xgettext:c-format */
-		    (_("%pB: %#" PRIx64 ": warning: R_V850_LONGJUMP points to "
+		    (_("%pB: %#" PRIx64 ": warning: %s points to "
 		       "unrecognized insn %#x"),
 		     abfd,
 		     (uint64_t) (irel->r_offset + no_match),
+		     "R_V850_LONGJUMP",
 		     insn[no_match]);
 		  continue;
 		}
@@ -3884,9 +3886,9 @@  v850_elf_relax_section (bfd *abfd,
 		{
 		  _bfd_error_handler
 		    /* xgettext:c-format */
-		    (_("%pB: %#" PRIx64 ": warning: R_V850_LONGJUMP points to "
+		    (_("%pB: %#" PRIx64 ": warning: %s points to "
 		       "unrecognized reloc"),
-		     abfd, (uint64_t) irel->r_offset);
+		     abfd, (uint64_t) irel->r_offset, "R_V850_LONGJUMP");
 		  continue;
 		}
 
diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
index 22f16bf..1d7a1d8 100644
--- a/bfd/elf32-xtensa.c
+++ b/bfd/elf32-xtensa.c
@@ -3351,7 +3351,7 @@  elf_xtensa_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
     {
       _bfd_error_handler
 	/* xgettext:c-format */
-	(_("%pB: incompatible machine type. Output is 0x%x. Input is 0x%x"),
+	(_("%pB: incompatible machine type; output is 0x%x; input is 0x%x"),
 	 ibfd, out_mach, in_mach);
       bfd_set_error (bfd_error_wrong_format);
       return FALSE;
@@ -4582,7 +4582,7 @@  elf_xtensa_do_asm_simplify (bfd_byte *contents,
 
   if (content_length < address)
     {
-      *error_message = _("Attempt to convert L32R/CALLX to CALL failed");
+      *error_message = _("attempt to convert L32R/CALLX to CALL failed");
       return bfd_reloc_other;
     }
 
@@ -4590,7 +4590,7 @@  elf_xtensa_do_asm_simplify (bfd_byte *contents,
   direct_call_opcode = swap_callx_for_call_opcode (opcode);
   if (direct_call_opcode == XTENSA_UNDEFINED)
     {
-      *error_message = _("Attempt to convert L32R/CALLX to CALL failed");
+      *error_message = _("attempt to convert L32R/CALLX to CALL failed");
       return bfd_reloc_other;
     }
 
diff --git a/bfd/elf64-alpha.c b/bfd/elf64-alpha.c
index 734d463..e302605 100644
--- a/bfd/elf64-alpha.c
+++ b/bfd/elf64-alpha.c
@@ -3211,8 +3211,8 @@  elf64_alpha_relax_with_lituse (struct alpha_relax_info *info,
       _bfd_error_handler
 	/* xgettext:c-format */
 	(_("%pB: %pA+%#" PRIx64 ": warning: "
-	   "LITERAL relocation against unexpected insn"),
-	 abfd, info->sec, (uint64_t) irel->r_offset);
+	   "%s relocation against unexpected insn"),
+	 abfd, info->sec, (uint64_t) irel->r_offset, "LITERAL");
       return TRUE;
     }
 
diff --git a/bfd/elf64-ia64-vms.c b/bfd/elf64-ia64-vms.c
index 2b7e63b..07597ba 100644
--- a/bfd/elf64-ia64-vms.c
+++ b/bfd/elf64-ia64-vms.c
@@ -584,8 +584,8 @@  elf64_ia64_relax_section (bfd *abfd, asection *sec,
 	    {
 	      _bfd_error_handler
 		/* xgettext:c-format */
-		(_("%pB: Can't relax br at %#" PRIx64 " in section `%pA'."
-		   " Please use brl or indirect branch."),
+		(_("%pB: can't relax br at %#" PRIx64 " in section `%pA';"
+		   " please use brl or indirect branch"),
 		 sec->owner, (uint64_t) roff, sec);
 	      bfd_set_error (bfd_error_bad_value);
 	      goto error_return;
@@ -5134,14 +5134,14 @@  error_free_dyn:
 		  if (normal_bfd == NULL)
 		    _bfd_error_handler
 		      /* xgettext:c-format */
-		      (_("Warning: alignment %u of common symbol `%s' in %pB"
+		      (_("warning: alignment %u of common symbol `%s' in %pB"
 			 " is greater than the alignment (%u) of its section %pA"),
 		       1 << common_align, name, common_bfd,
 		       1 << normal_align, h->root.u.def.section);
 		  else
 		    _bfd_error_handler
 		      /* xgettext:c-format */
-		      (_("Warning: alignment %u of symbol `%s' in %pB"
+		      (_("warning: alignment %u of symbol `%s' in %pB"
 			 " is smaller than %u in %pB"),
 		       1 << normal_align, name, normal_bfd,
 		       1 << common_align, common_bfd);
@@ -5157,7 +5157,7 @@  error_free_dyn:
 		  && ! size_change_ok)
 		_bfd_error_handler
 		  /* xgettext:c-format */
-		  (_("Warning: size of symbol `%s' changed"
+		  (_("warning: size of symbol `%s' changed"
 		     " from %" PRIu64 " in %pB to %" PRIu64 " in %pB"),
 		   name, (uint64_t) h->size, old_bfd,
 		   (uint64_t) isym->st_size, abfd);
@@ -5184,7 +5184,7 @@  error_free_dyn:
 		  if (h->type != STT_NOTYPE && ! type_change_ok)
 		    _bfd_error_handler
 		      /* xgettext:c-format */
-		      (_("Warning: type of symbol `%s' changed"
+		      (_("warning: type of symbol `%s' changed"
 			 " from %d to %d in %pB"),
 		       name, h->type, type, abfd);
 
diff --git a/bfd/elf64-mmix.c b/bfd/elf64-mmix.c
index 8e9eee1..ecef6c9 100644
--- a/bfd/elf64-mmix.c
+++ b/bfd/elf64-mmix.c
@@ -982,10 +982,10 @@  mmix_elf_perform_relocation (asection *isec, reloc_howto_type *howto,
 		     a verbose message.  */
 		  *error_message
 		    = _("invalid input relocation when producing"
-			" non-ELF, non-mmo format output."
-			"\n Please use the objcopy program to convert from"
+			" non-ELF, non-mmo format output;"
+			" please use the objcopy program to convert from"
 			" ELF or mmo,"
-			"\n or assemble using"
+			" or assemble using"
 			" \"-no-expand\" (for gcc, \"-Wa,-no-expand\"");
 		  mmix_elf_section_data (isec)->has_warned_pushj = TRUE;
 		  return bfd_reloc_dangerous;
@@ -1166,10 +1166,10 @@  mmix_elf_perform_relocation (asection *isec, reloc_howto_type *howto,
 		   a verbose message.  */
 		*error_message
 		  = _("invalid input relocation when producing"
-		      " non-ELF, non-mmo format output."
-		      "\n Please use the objcopy program to convert from"
+		      " non-ELF, non-mmo format output;"
+		      " please use the objcopy program to convert from"
 		      " ELF or mmo,"
-		      "\n or compile using the gcc-option"
+		      " or compile using the gcc-option"
 		      " \"-mno-base-addresses\".");
 		mmix_elf_section_data (isec)->has_warned_bpo = TRUE;
 		return bfd_reloc_dangerous;
@@ -1740,8 +1740,8 @@  mmix_final_link_relocate (reloc_howto_type *howto, asection *input_section,
 	    _bfd_error_handler
 	      /* xgettext:c-format */
 	      (_("%pB: LOCAL directive: "
-		 "Register $%" PRId64 " is not a local register."
-		 "  First global register is $%" PRId64 "."),
+		 "register $%" PRId64 " is not a local register;"
+		 " first global register is $%" PRId64),
 	       input_section->owner, (int64_t) srel, (int64_t) first_global);
 
 	    return bfd_reloc_overflow;
@@ -2168,8 +2168,8 @@  mmix_elf_add_symbol_hook (bfd *abfd,
 	     h->u.def.section->owner is NULL.  */
 	  _bfd_error_handler
 	    /* xgettext:c-format */
-	    (_("%pB: Error: multiple definition of `%s'; start of %s "
-	       "is set in a earlier linked file\n"),
+	    (_("%pB: error: multiple definition of `%s'; start of %s "
+	       "is set in a earlier linked file"),
 	     abfd, *namep,
 	     *namep + strlen (MMIX_LOC_SECTION_START_SYMBOL_PREFIX));
 	   bfd_set_error (bfd_error_bad_value);
@@ -2223,7 +2223,7 @@  mmix_elf_final_link (bfd *abfd, struct bfd_link_info *info)
     {
       /* FIXME: Pass error state gracefully.  */
       if (bfd_get_section_flags (abfd, reg_section) & SEC_HAS_CONTENTS)
-	_bfd_abort (__FILE__, __LINE__, _("Register section has contents\n"));
+	_bfd_abort (__FILE__, __LINE__, _("register section has contents\n"));
 
       /* Really remove the section, if it hasn't already been done.  */
       if (!bfd_section_removed_from_list (abfd, reg_section))
@@ -2413,8 +2413,8 @@  _bfd_mmix_after_linker_allocation (bfd *abfd ATTRIBUTE_UNUSED,
     {
       _bfd_error_handler
 	/* xgettext:c-format */
-	(_("Internal inconsistency: remaining %lu != max %lu.\n\
-  Please report this bug."),
+	(_("internal inconsistency: remaining %lu != max %lu;"
+	   " please report this bug"),
 	 (unsigned long) gregdata->n_remaining_bpo_relocs_this_relaxation_round,
 	 (unsigned long) gregdata->n_bpo_relocs);
       return FALSE;
diff --git a/bfd/elf64-sh64.c b/bfd/elf64-sh64.c
index 5c8c2e8..cb0e0ff 100644
--- a/bfd/elf64-sh64.c
+++ b/bfd/elf64-sh64.c
@@ -1505,7 +1505,7 @@  sh_elf64_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
 	  if ((sym->st_other & STO_SH5_ISA32) != 0)
 	    (*info->callbacks->reloc_dangerous)
 	      (info,
-	       _("Unexpected STO_SH5_ISA32 on local symbol is not handled"),
+	       _("unexpected STO_SH5_ISA32 on local symbol is not handled"),
 	       input_bfd, input_section, rel->r_offset);
 
 	  if (sec != NULL && discarded_section (sec))
diff --git a/bfd/elf64-sparc.c b/bfd/elf64-sparc.c
index cc03fa1..8018f6a 100644
--- a/bfd/elf64-sparc.c
+++ b/bfd/elf64-sparc.c
@@ -457,7 +457,7 @@  elf64_sparc_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
 	case 6: reg -= 4; break;
 	default:
 	  _bfd_error_handler
-	    (_("%pB: Only registers %%g[2367] can be declared using STT_REGISTER"),
+	    (_("%pB: only registers %%g[2367] can be declared using STT_REGISTER"),
 	     abfd);
 	  return FALSE;
 	}
@@ -478,7 +478,7 @@  elf64_sparc_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
 	{
 	  _bfd_error_handler
 	    /* xgettext:c-format */
-	    (_("Register %%g%d used incompatibly: %s in %pB,"
+	    (_("register %%g%d used incompatibly: %s in %pB,"
 	       " previously %s in %pB"),
 	     (int) sym->st_value, **namep ? *namep : "#scratch", abfd,
 	     *p->name ? p->name : "#scratch", p->abfd);
@@ -502,7 +502,7 @@  elf64_sparc_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
 		    type = 0;
 		  _bfd_error_handler
 		    /* xgettext:c-format */
-		    (_("Symbol `%s' has differing types: REGISTER in %pB,"
+		    (_("symbol `%s' has differing types: REGISTER in %pB,"
 		       " previously %s in %pB"),
 		     *namep, abfd, stt_types[type], p->abfd);
 		  return FALSE;
diff --git a/bfd/elfnn-ia64.c b/bfd/elfnn-ia64.c
index 824652a..595316d 100644
--- a/bfd/elfnn-ia64.c
+++ b/bfd/elfnn-ia64.c
@@ -617,8 +617,8 @@  elfNN_ia64_relax_section (bfd *abfd, asection *sec,
 	    {
 	      _bfd_error_handler
 		/* xgettext:c-format */
-		(_("%pB: Can't relax br at %#" PRIx64 " in section `%pA'."
-		   " Please use brl or indirect branch."),
+		(_("%pB: can't relax br at %#" PRIx64 " in section `%pA';"
+		   " please use brl or indirect branch"),
 		 sec->owner, (uint64_t) roff, sec);
 	      bfd_set_error (bfd_error_bad_value);
 	      goto error_return;
diff --git a/bfd/elfxx-tilegx.c b/bfd/elfxx-tilegx.c
index 04cf932..43d8121 100644
--- a/bfd/elfxx-tilegx.c
+++ b/bfd/elfxx-tilegx.c
@@ -4239,7 +4239,7 @@  _bfd_tilegx_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
     {
       _bfd_error_handler
 	/* xgettext:c-format */
-	(_("%pB: Cannot link together %s and %s objects."),
+	(_("%pB: cannot link together %s and %s objects"),
 	 ibfd, targ1, targ2);
       bfd_set_error (bfd_error_bad_value);
       return FALSE;
diff --git a/bfd/mmo.c b/bfd/mmo.c
index 7671646..4b969c2 100644
--- a/bfd/mmo.c
+++ b/bfd/mmo.c
@@ -465,7 +465,7 @@  mmo_make_section (bfd *abfd, const char *secname)
 	{
 	  _bfd_error_handler
 	    /* xgettext:c-format */
-	    (_("%pB: No core to allocate section name %s\n"),
+	    (_("%pB: no core to allocate section name %s"),
 	     abfd, secname);
 	  bfd_set_error (bfd_error_system_call);
 	  return NULL;
@@ -541,7 +541,7 @@  mmo_object_p (bfd *abfd)
     {
       _bfd_error_handler
 	/* xgettext:c-format */
-	(_("%pB: No core to allocate a symbol %d bytes long\n"),
+	(_("%pB: no core to allocate a symbol %d bytes long"),
 	 abfd, abfd->tdata.mmo_data->max_symbol_length);
       goto bad_final;
     }
@@ -2983,7 +2983,7 @@  mmo_write_symbols_and_terminator (bfd *abfd)
 
 	    _bfd_error_handler
 	      /* xgettext:c-format */
-	      (_("%pB: Bad symbol definition: `Main' set to %s rather"
+	      (_("%pB: bad symbol definition: `Main' set to %s rather"
 		 " than the start address %s\n"),
 	       abfd, vmas_main, vmas_start);
 	    bfd_set_error (bfd_error_bad_value);
diff --git a/bfd/osf-core.c b/bfd/osf-core.c
index 798c4b8..83d729f 100644
--- a/bfd/osf-core.c
+++ b/bfd/osf-core.c
@@ -124,7 +124,7 @@  osf_core_core_file_p (bfd *abfd)
 	  flags = SEC_HAS_CONTENTS;
 	  break;
 	default:
-	  _bfd_error_handler (_("Unhandled OSF/1 core file section type %d\n"),
+	  _bfd_error_handler (_("unhandled OSF/1 core file section type %d"),
 			      core_scnhdr.scntype);
 	  continue;
 	}
diff --git a/bfd/srec.c b/bfd/srec.c
index ac438e8..4996109 100644
--- a/bfd/srec.c
+++ b/bfd/srec.c
@@ -257,7 +257,7 @@  srec_bad_byte (bfd *abfd,
 	}
       _bfd_error_handler
 	/* xgettext:c-format */
-	(_("%pB:%d: Unexpected character `%s' in S-record file\n"),
+	(_("%pB:%d: unexpected character `%s' in S-record file"),
 	 abfd, lineno, buf);
       bfd_set_error (bfd_error_bad_value);
     }
@@ -485,7 +485,7 @@  srec_scan (bfd *abfd)
 	    if (bytes < min_bytes)
 	      {
 		/* xgettext:c-format */
-		_bfd_error_handler (_("%pB:%d: byte count %d too small\n"),
+		_bfd_error_handler (_("%pB:%d: byte count %d too small"),
 				    abfd, lineno, bytes);
 		bfd_set_error (bfd_error_bad_value);
 		goto error_return;
@@ -578,7 +578,7 @@  srec_scan (bfd *abfd)
 		  {
 		    _bfd_error_handler
 		      /* xgettext:c-format */
-		      (_("%pB:%d: Bad checksum in S-record file\n"),
+		      (_("%pB:%d: bad checksum in S-record file"),
 		       abfd, lineno);
 		    bfd_set_error (bfd_error_bad_value);
 		    goto error_return;
@@ -612,7 +612,7 @@  srec_scan (bfd *abfd)
 		  {
 		    _bfd_error_handler
 		      /* xgettext:c-format */
-		      (_("%pB:%d: Bad checksum in S-record file\n"),
+		      (_("%pB:%d: bad checksum in S-record file"),
 		       abfd, lineno);
 		    bfd_set_error (bfd_error_bad_value);
 		    goto error_return;
diff --git a/bfd/vms-alpha.c b/bfd/vms-alpha.c
index 6d2eb45..b52f580 100644
--- a/bfd/vms-alpha.c
+++ b/bfd/vms-alpha.c
@@ -476,7 +476,7 @@  _bfd_vms_slurp_eihd (bfd *abfd, unsigned int *eisd_offset,
   /* PR 21813: Check for an undersized record.  */
   if (PRIV (recrd.buf_size) < sizeof (* eihd))
     {
-      _bfd_error_handler (_("Corrupt EIHD record - size is too small"));
+      _bfd_error_handler (_("corrupt EIHD record - size is too small"));
       bfd_set_error (bfd_error_bad_value);
       return FALSE;
     }
@@ -657,7 +657,8 @@  _bfd_vms_slurp_eihs (bfd *abfd, unsigned int offset)
   /* PR 21611: Check that offset is valid.  */
   if (offset > PRIV (recrd.rec_size) - (EIHS__L_DMTBYTES + 4))
     {
-      _bfd_error_handler (_("Unable to read EIHS record at offset %#x"), offset);
+      _bfd_error_handler (_("unable to read EIHS record at offset %#x"),
+			  offset);
       bfd_set_error (bfd_error_file_truncated);
       return FALSE;
     }
@@ -1169,7 +1170,7 @@  _bfd_vms_slurp_egsd (bfd *abfd)
 
   if (PRIV (recrd.rec_size) < 8)
     {
-      _bfd_error_handler (_("Corrupt EGSD record: its size (%#x) is too small"),
+      _bfd_error_handler (_("corrupt EGSD record: its size (%#x) is too small"),
 			  PRIV (recrd.rec_size));
       bfd_set_error (bfd_error_bad_value);
       return FALSE;
@@ -1193,7 +1194,7 @@  _bfd_vms_slurp_egsd (bfd *abfd)
       /* PR 21615: Check for size overflow.  */
       if (PRIV (recrd.rec_size) < gsd_size)
 	{
-	  _bfd_error_handler (_("Corrupt EGSD record: size (%#x) is larger than remaining space (%#x)"),
+	  _bfd_error_handler (_("corrupt EGSD record: size (%#x) is larger than remaining space (%#x)"),
 			      gsd_size, PRIV (recrd.rec_size));
 	  bfd_set_error (bfd_error_bad_value);
 	  return FALSE;
@@ -1201,7 +1202,7 @@  _bfd_vms_slurp_egsd (bfd *abfd)
 
       if (gsd_size < 4)
 	{
-	  _bfd_error_handler (_("Corrupt EGSD record: size (%#x) is too small"),
+	  _bfd_error_handler (_("corrupt EGSD record: size (%#x) is too small"),
 			      gsd_size);
 	  bfd_set_error (bfd_error_bad_value);
 	  return FALSE;
@@ -1330,7 +1331,7 @@  _bfd_vms_slurp_egsd (bfd *abfd)
 		/* PR 21813: Check for an out of range index.  */
 		if (psindx < 0 || psindx >= (int) PRIV (section_count))
 		  {
-		    _bfd_error_handler (_("Corrupt EGSD record: its psindx field is too big (%#lx)"),
+		    _bfd_error_handler (_("corrupt EGSD record: its psindx field is too big (%#lx)"),
 					psindx);
 		    bfd_set_error (bfd_error_bad_value);
 		    return FALSE;
@@ -1346,7 +1347,7 @@  _bfd_vms_slurp_egsd (bfd *abfd)
 		/* PR 21813: Check for an out of range index.  */
 		    if (psindx < 0 || psindx >= (int) PRIV (section_count))
 		      {
-			_bfd_error_handler (_("Corrupt EGSD record: its psindx field is too big (%#lx)"),
+			_bfd_error_handler (_("corrupt EGSD record: its psindx field is too big (%#lx)"),
 					    psindx);
 			bfd_set_error (bfd_error_bad_value);
 			return FALSE;
@@ -1386,7 +1387,7 @@  _bfd_vms_slurp_egsd (bfd *abfd)
 		/* PR 21813: Check for an out of range index.  */
 		if (psindx < 0 || psindx >= (int) PRIV (section_count))
 		  {
-		    _bfd_error_handler (_("Corrupt EGSD record: its psindx field is too big (%#lx)"),
+		    _bfd_error_handler (_("corrupt EGSD record: its psindx field is too big (%#lx)"),
 					psindx);
 		    bfd_set_error (bfd_error_bad_value);
 		    return FALSE;
@@ -1415,7 +1416,7 @@  _bfd_vms_slurp_egsd (bfd *abfd)
 	case EGSD__C_SYMM:
 	case EGSD__C_SYMV:
 	default:
-	  _bfd_error_handler (_("Unknown EGSD subtype %d"), gsd_type);
+	  _bfd_error_handler (_("unknown EGSD subtype %d"), gsd_type);
 	  bfd_set_error (bfd_error_bad_value);
 	  return FALSE;
 	}
@@ -1448,7 +1449,7 @@  _bfd_vms_push (bfd *abfd, bfd_vma val, unsigned int reloc)
   if (PRIV (stackptr) >= STACKSIZE)
     {
       bfd_set_error (bfd_error_bad_value);
-      _bfd_error_handler (_("Stack overflow (%d) in _bfd_vms_push"), PRIV (stackptr));
+      _bfd_error_handler (_("stack overflow (%d) in _bfd_vms_push"), PRIV (stackptr));
       exit (1);
     }
 }
@@ -1461,7 +1462,7 @@  _bfd_vms_pop (bfd *abfd, bfd_vma *val, unsigned int *rel)
   if (PRIV (stackptr) == 0)
     {
       bfd_set_error (bfd_error_bad_value);
-      _bfd_error_handler (_("Stack underflow in _bfd_vms_pop"));
+      _bfd_error_handler (_("stack underflow in _bfd_vms_pop"));
       exit (1);
     }
   PRIV (stackptr)--;
@@ -1734,7 +1735,7 @@  _bfd_vms_get_value (bfd *abfd,
   len = *ascic;
   if (ascic + len >= max_ascic)
     {
-      _bfd_error_handler (_("Corrupt vms value"));
+      _bfd_error_handler (_("corrupt vms value"));
       *vma = 0;
       *hp = NULL;
       return;
@@ -1862,7 +1863,7 @@  _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info)
       if (cmd_length < 4 || (ptr + cmd_length > maxptr + 4))
 	{
 	corrupt_etir:
-	  _bfd_error_handler (_("Corrupt ETIR record encountered"));
+	  _bfd_error_handler (_("corrupt ETIR record encountered"));
 	  bfd_set_error (bfd_error_bad_value);
 	  return FALSE;
 	}
@@ -2494,7 +2495,7 @@  _bfd_vms_slurp_eeom (bfd *abfd)
   /* PR 21813: Check for an undersized record.  */
   if (PRIV (recrd.buf_size) < sizeof (* eeom))
     {
-      _bfd_error_handler (_("Corrupt EEOM record - size is too small"));
+      _bfd_error_handler (_("corrupt EEOM record - size is too small"));
       bfd_set_error (bfd_error_bad_value);
       return FALSE;
     }
@@ -2503,7 +2504,7 @@  _bfd_vms_slurp_eeom (bfd *abfd)
   PRIV (eom_data).eom_w_comcod = bfd_getl16 (eeom->comcod);
   if (PRIV (eom_data).eom_w_comcod > 1)
     {
-      _bfd_error_handler (_("Object module NOT error-free !\n"));
+      _bfd_error_handler (_("object module not error-free !"));
       bfd_set_error (bfd_error_bad_value);
       return FALSE;
     }
@@ -3879,7 +3880,7 @@  _bfd_vms_write_etir (bfd * abfd, int objtype ATTRIBUTE_UNUSED)
 
 		  /* Regular relocs are intertwined with binary data.  */
 		  if (curr_addr > addr)
-		    _bfd_error_handler (_("Size error in section %pA"),
+		    _bfd_error_handler (_("size error in section %pA"),
 					section);
 		  size = addr - curr_addr;
 		  sto_imm (abfd, section, size, curr_data, curr_addr);
@@ -4038,7 +4039,7 @@  _bfd_vms_write_etir (bfd * abfd, int objtype ATTRIBUTE_UNUSED)
 		  break;
 
 		case ALPHA_R_BSR:
-		  _bfd_error_handler (_("Spurious ALPHA_R_BSR reloc"));
+		  _bfd_error_handler (_("spurious ALPHA_R_BSR reloc"));
 		  break;
 
 		case ALPHA_R_LDA:
@@ -4079,7 +4080,7 @@  _bfd_vms_write_etir (bfd * abfd, int objtype ATTRIBUTE_UNUSED)
 		  break;
 
 		default:
-		  _bfd_error_handler (_("Unhandled relocation %s"),
+		  _bfd_error_handler (_("unhandled relocation %s"),
 				      rptr->howto->name);
 		  break;
 		}
@@ -4092,7 +4093,7 @@  _bfd_vms_write_etir (bfd * abfd, int objtype ATTRIBUTE_UNUSED)
 	    {
 	      /* Output rest of section.  */
 	      if (curr_addr > section->size)
-		_bfd_error_handler (_("Size error in section %pA"), section);
+		_bfd_error_handler (_("size error in section %pA"), section);
 	      size = section->size - curr_addr;
 	      sto_imm (abfd, section, size, curr_data, curr_addr);
 	      curr_data += size;
@@ -4433,31 +4434,31 @@  parse_module (bfd *abfd, struct module *module, unsigned char *ptr,
 
 		case DST__K_SET_LINUM_INCR:
 		  _bfd_error_handler
-		    (_("DST__K_SET_LINUM_INCR not implemented"));
+		    (_("%s not implemented"), "DST__K_SET_LINUM_INCR");
 		  cmd_length = 2;
 		  break;
 
 		case DST__K_SET_LINUM_INCR_W:
 		  _bfd_error_handler
-		    (_("DST__K_SET_LINUM_INCR_W not implemented"));
+		    (_("%s not implemented"), "DST__K_SET_LINUM_INCR_W");
 		  cmd_length = 3;
 		  break;
 
 		case DST__K_RESET_LINUM_INCR:
 		  _bfd_error_handler
-		    (_("DST__K_RESET_LINUM_INCR not implemented"));
+		    (_("%s not implemented"), "DST__K_RESET_LINUM_INCR");
 		  cmd_length = 1;
 		  break;
 
 		case DST__K_BEG_STMT_MODE:
 		  _bfd_error_handler
-		    (_("DST__K_BEG_STMT_MODE not implemented"));
+		    (_("%s not implemented"), "DST__K_BEG_STMT_MODE");
 		  cmd_length = 1;
 		  break;
 
 		case DST__K_END_STMT_MODE:
 		  _bfd_error_handler
-		    (_("DST__K_END_STMT_MODE not implemented"));
+		    (_("%s not implemented"), "DST__K_END_STMT_MODE");
 		  cmd_length = 1;
 		  break;
 
@@ -4484,25 +4485,25 @@  parse_module (bfd *abfd, struct module *module, unsigned char *ptr,
 
 		case DST__K_SET_PC:
 		  _bfd_error_handler
-		    (_("DST__K_SET_PC not implemented"));
+		    (_("%s not implemented"), "DST__K_SET_PC");
 		  cmd_length = 2;
 		  break;
 
 		case DST__K_SET_PC_W:
 		  _bfd_error_handler
-		    (_("DST__K_SET_PC_W not implemented"));
+		    (_("%s not implemented"), "DST__K_SET_PC_W");
 		  cmd_length = 3;
 		  break;
 
 		case DST__K_SET_PC_L:
 		  _bfd_error_handler
-		    (_("DST__K_SET_PC_L not implemented"));
+		    (_("%s not implemented"), "DST__K_SET_PC_L");
 		  cmd_length = 5;
 		  break;
 
 		case DST__K_SET_STMTNUM:
 		  _bfd_error_handler
-		    (_("DST__K_SET_STMTNUM not implemented"));
+		    (_("%s not implemented"), "DST__K_SET_STMTNUM");
 		  cmd_length = 2;
 		  break;
 
@@ -5005,7 +5006,7 @@  alpha_vms_slurp_relocs (bfd *abfd)
 		{
 		  _bfd_error_handler
 		    /* xgettext:c-format */
-		    (_("Unknown reloc %s + %s"), _bfd_vms_etir_name (prev_cmd),
+		    (_("unknown reloc %s + %s"), _bfd_vms_etir_name (prev_cmd),
 		     _bfd_vms_etir_name (cmd));
 		  return FALSE;
 		}
@@ -5023,7 +5024,7 @@  alpha_vms_slurp_relocs (bfd *abfd)
 		    {
 		      _bfd_error_handler
 			/* xgettext:c-format */
-			(_("Unknown reloc %s + %s"), _bfd_vms_etir_name (cmd),
+			(_("unknown reloc %s + %s"), _bfd_vms_etir_name (cmd),
 			 _bfd_vms_etir_name (ETIR__C_STA_LW));
 		      return FALSE;
 		    }
@@ -5038,7 +5039,7 @@  alpha_vms_slurp_relocs (bfd *abfd)
 		{
 		  _bfd_error_handler
 		    /* xgettext:c-format */
-		    (_("Unknown reloc %s + %s"), _bfd_vms_etir_name (cmd),
+		    (_("unknown reloc %s + %s"), _bfd_vms_etir_name (cmd),
 		     _bfd_vms_etir_name (ETIR__C_STA_QW));
 		  return FALSE;
 		}
@@ -5054,7 +5055,7 @@  alpha_vms_slurp_relocs (bfd *abfd)
 		  && prev_cmd != ETIR__C_STA_PQ)
 		{
 		  /* xgettext:c-format */
-		  _bfd_error_handler (_("Unknown reloc %s + %s"),
+		  _bfd_error_handler (_("unknown reloc %s + %s"),
 				      _bfd_vms_etir_name (prev_cmd),
 				      _bfd_vms_etir_name (ETIR__C_STO_LW));
 		  return FALSE;
@@ -5067,7 +5068,7 @@  alpha_vms_slurp_relocs (bfd *abfd)
 	      if (prev_cmd != ETIR__C_OPR_ADD && prev_cmd != ETIR__C_STA_QW)
 		{
 		  /* xgettext:c-format */
-		  _bfd_error_handler (_("Unknown reloc %s + %s"),
+		  _bfd_error_handler (_("unknown reloc %s + %s"),
 				      _bfd_vms_etir_name (prev_cmd),
 				      _bfd_vms_etir_name (ETIR__C_STO_QW));
 		  return FALSE;
@@ -5079,7 +5080,7 @@  alpha_vms_slurp_relocs (bfd *abfd)
 	      if (prev_cmd != ETIR__C_STA_PQ)
 		{
 		  /* xgettext:c-format */
-		  _bfd_error_handler (_("Unknown reloc %s + %s"),
+		  _bfd_error_handler (_("unknown reloc %s + %s"),
 				      _bfd_vms_etir_name (prev_cmd),
 				      _bfd_vms_etir_name (ETIR__C_STO_OFF));
 		  return FALSE;
@@ -5092,7 +5093,7 @@  alpha_vms_slurp_relocs (bfd *abfd)
 	      if (prev_cmd != ETIR__C_STA_LW && prev_cmd != ETIR__C_STA_QW)
 		{
 		  /* xgettext:c-format */
-		  _bfd_error_handler (_("Unknown reloc %s + %s"),
+		  _bfd_error_handler (_("unknown reloc %s + %s"),
 				      _bfd_vms_etir_name (prev_cmd),
 				      _bfd_vms_etir_name (ETIR__C_OPR_ADD));
 		  return FALSE;
@@ -5147,7 +5148,7 @@  alpha_vms_slurp_relocs (bfd *abfd)
 	      continue;
 
 	    default:
-	      _bfd_error_handler (_("Unknown reloc %s"),
+	      _bfd_error_handler (_("unknown reloc %s"),
 				  _bfd_vms_etir_name (cmd));
 	      return FALSE;
 	    }
@@ -5160,7 +5161,7 @@  alpha_vms_slurp_relocs (bfd *abfd)
 	    /* Get section to which the relocation applies.  */
 	    if (cur_psect < 0 || cur_psect > (int)PRIV (section_count))
 	      {
-		_bfd_error_handler (_("Invalid section index in ETIR"));
+		_bfd_error_handler (_("invalid section index in ETIR"));
 		return FALSE;
 	      }
 
@@ -5169,7 +5170,7 @@  alpha_vms_slurp_relocs (bfd *abfd)
 	    sec = PRIV (sections)[cur_psect];
 	    if (sec == bfd_abs_section_ptr)
 	      {
-		_bfd_error_handler (_("Relocation for non-REL psect"));
+		_bfd_error_handler (_("relocation for non-REL psect"));
 		return FALSE;
 	      }
 
@@ -5216,7 +5217,7 @@  alpha_vms_slurp_relocs (bfd *abfd)
 		    }
 		if (sym == NULL)
 		  {
-		    _bfd_error_handler (_("Unknown symbol in command %s"),
+		    _bfd_error_handler (_("unknown symbol in command %s"),
 					_bfd_vms_etir_name (cmd));
 		    reloc->sym_ptr_ptr = NULL;
 		  }
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 79179c0..2ba39d4 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,10 @@ 
 2018-02-23  Alan Modra  <amodra@gmail.com>
 
+	* testsuite/ld-cris/pcrelcp-1.d,
+	* testsuite/ld-mmix/start-2.d: Update.
+
+2018-02-23  Alan Modra  <amodra@gmail.com>
+
 	* testsuite/ld-arm/cmse-implib-errors.out,
 	* testsuite/ld-arm/cmse-new-earlier-later-implib.out,
 	* testsuite/ld-arm/cmse-new-implib-not-sg-in-implib.out,
diff --git a/ld/testsuite/ld-cris/pcrelcp-1.d b/ld/testsuite/ld-cris/pcrelcp-1.d
index 95fb235..0d5f6b8 100644
--- a/ld/testsuite/ld-cris/pcrelcp-1.d
+++ b/ld/testsuite/ld-cris/pcrelcp-1.d
@@ -1,8 +1,7 @@ 
 #as: --no-underscore --em=criself
 #ld: -shared -m crislinux -z nocombreloc
 #ld_after_inputfiles: tmpdir/libdso-1b.so
-#warning: \A[^\n]*\.o, section `.text', to symbol `expfn@@TST2':\n
-#warning: [^\n]*recompile with -fPIC\Z
+#warning: \A[^\n]*\.o, section `.text', to symbol `expfn@@TST2':[^\n]*recompile with -fPIC\Z
 #readelf: -a
 
 # Building a DSO with (unrecommended) non-pic pc-relative references
diff --git a/ld/testsuite/ld-mmix/start-2.d b/ld/testsuite/ld-mmix/start-2.d
index e380dc0..13bd35f 100644
--- a/ld/testsuite/ld-mmix/start-2.d
+++ b/ld/testsuite/ld-mmix/start-2.d
@@ -1,4 +1,4 @@ 
 #source: main1.s
 #source: a.s
 #ld: -m mmo -e a
-#error: Bad symbol definition: `Main' set to
+#error: bad symbol definition: `Main' set to