[4/8] mips messages

Message ID 20180222234201.GK3812@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:42 p.m.
More standardization of messages.

bfd/
	* elfxx-mips.c: Standardize error/warning messages.
binutils/
	* testsuite/binutils-all/mips/mips-reginfo-n32.d,
	* testsuite/binutils-all/mips/mips-reginfo.d: Update.
gas/
	* testsuite/gas/mips/reginfo-2.l: Update.
ld/
	* testsuite/ld-mips-elf/attr-gnu-4-12.d,
	* testsuite/ld-mips-elf/attr-gnu-4-13.d,
	* testsuite/ld-mips-elf/attr-gnu-4-14.d,
	* testsuite/ld-mips-elf/attr-gnu-4-16.d,
	* testsuite/ld-mips-elf/attr-gnu-4-17.d,
	* testsuite/ld-mips-elf/attr-gnu-4-18.d,
	* testsuite/ld-mips-elf/attr-gnu-4-19.d,
	* testsuite/ld-mips-elf/attr-gnu-4-21.d,
	* testsuite/ld-mips-elf/attr-gnu-4-23.d,
	* testsuite/ld-mips-elf/attr-gnu-4-24.d,
	* testsuite/ld-mips-elf/attr-gnu-4-25.d,
	* testsuite/ld-mips-elf/attr-gnu-4-26.d,
	* testsuite/ld-mips-elf/attr-gnu-4-27.d,
	* testsuite/ld-mips-elf/attr-gnu-4-28.d,
	* testsuite/ld-mips-elf/attr-gnu-4-29.d,
	* testsuite/ld-mips-elf/attr-gnu-4-31.d,
	* testsuite/ld-mips-elf/attr-gnu-4-32.d,
	* testsuite/ld-mips-elf/attr-gnu-4-34.d,
	* testsuite/ld-mips-elf/attr-gnu-4-35.d,
	* testsuite/ld-mips-elf/attr-gnu-4-36.d,
	* testsuite/ld-mips-elf/attr-gnu-4-37.d,
	* testsuite/ld-mips-elf/attr-gnu-4-38.d,
	* testsuite/ld-mips-elf/attr-gnu-4-39.d,
	* testsuite/ld-mips-elf/attr-gnu-4-41.d,
	* testsuite/ld-mips-elf/attr-gnu-4-42.d,
	* testsuite/ld-mips-elf/attr-gnu-4-43.d,
	* testsuite/ld-mips-elf/attr-gnu-4-45.d,
	* testsuite/ld-mips-elf/attr-gnu-4-46.d,
	* testsuite/ld-mips-elf/attr-gnu-4-47.d,
	* testsuite/ld-mips-elf/attr-gnu-4-48.d,
	* testsuite/ld-mips-elf/attr-gnu-4-49.d,
	* testsuite/ld-mips-elf/attr-gnu-4-52.d,
	* testsuite/ld-mips-elf/attr-gnu-4-53.d,
	* testsuite/ld-mips-elf/attr-gnu-4-54.d,
	* testsuite/ld-mips-elf/attr-gnu-4-58.d,
	* testsuite/ld-mips-elf/attr-gnu-4-59.d,
	* testsuite/ld-mips-elf/attr-gnu-4-61.d,
	* testsuite/ld-mips-elf/attr-gnu-4-62.d,
	* testsuite/ld-mips-elf/attr-gnu-4-63.d,
	* testsuite/ld-mips-elf/attr-gnu-4-64.d,
	* testsuite/ld-mips-elf/attr-gnu-4-68.d,
	* testsuite/ld-mips-elf/attr-gnu-4-69.d,
	* testsuite/ld-mips-elf/attr-gnu-4-71.d,
	* testsuite/ld-mips-elf/attr-gnu-4-72.d,
	* testsuite/ld-mips-elf/attr-gnu-4-73.d,
	* testsuite/ld-mips-elf/attr-gnu-4-74.d,
	* testsuite/ld-mips-elf/attr-gnu-4-78.d,
	* testsuite/ld-mips-elf/attr-gnu-4-79.d,
	* testsuite/ld-mips-elf/attr-gnu-4-81.d,
	* testsuite/ld-mips-elf/attr-gnu-4-89.d,
	* testsuite/ld-mips-elf/attr-gnu-8-12.d,
	* testsuite/ld-mips-elf/attr-gnu-8-21.d,
	* testsuite/ld-mips-elf/bal-jalx-pic-micromips-n32.d,
	* testsuite/ld-mips-elf/bal-jalx-pic-micromips-n64.d,
	* testsuite/ld-mips-elf/bal-jalx-pic-micromips.d,
	* testsuite/ld-mips-elf/bal-jalx-pic-n32.d,
	* testsuite/ld-mips-elf/bal-jalx-pic-n64.d,
	* testsuite/ld-mips-elf/bal-jalx-pic.d,
	* testsuite/ld-mips-elf/mode-change-error-1.d,
	* testsuite/ld-mips-elf/unaligned-branch-2.d,
	* testsuite/ld-mips-elf/unaligned-branch-ignore-2.d,
	* testsuite/ld-mips-elf/unaligned-branch-ignore-micromips.d,
	* testsuite/ld-mips-elf/unaligned-branch-ignore-mips16.d,
	* testsuite/ld-mips-elf/unaligned-branch-ignore-r6-1.d,
	* testsuite/ld-mips-elf/unaligned-branch-micromips.d,
	* testsuite/ld-mips-elf/unaligned-branch-mips16.d,
	* testsuite/ld-mips-elf/unaligned-branch-r6-1.d,
	* testsuite/ld-mips-elf/unaligned-branch-r6-2.d,
	* testsuite/ld-mips-elf/unaligned-branch.d,
	* testsuite/ld-mips-elf/unaligned-jalx-1.d,
	* testsuite/ld-mips-elf/unaligned-jalx-3.d,
	* testsuite/ld-mips-elf/unaligned-jalx-addend-1.d,
	* testsuite/ld-mips-elf/unaligned-jalx-addend-3.d,
	* testsuite/ld-mips-elf/unaligned-jalx-addend-micromips-1.d,
	* testsuite/ld-mips-elf/unaligned-jalx-addend-mips16-1.d,
	* testsuite/ld-mips-elf/unaligned-jalx-micromips-1.d,
	* testsuite/ld-mips-elf/unaligned-jalx-mips16-1.d,
	* testsuite/ld-mips-elf/unaligned-jump-micromips.d,
	* testsuite/ld-mips-elf/unaligned-jump-mips16.d,
	* testsuite/ld-mips-elf/unaligned-jump.d: Update.


-- 
Alan Modra
Australia Development Lab, IBM

Patch

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 7540b69..bfc6633 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,9 @@ 
 2018-02-23  Alan Modra  <amodra@gmail.com>
 
+	* elfxx-mips.c: Standardize error/warning messages.
+
+2018-02-23  Alan Modra  <amodra@gmail.com>
+
 	* dwarf2.c, * elf-attrs.c, * elf-eh-frame.c, * elf.c, * elf32-gen.c,
 	* elflink.c: Standardize error/warning messages.  Replace use of
 	linker callback einfo with _bfd_error_handler when possible.
diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index 6d81dc6..32b93fe 100644
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -6373,7 +6373,7 @@  mips_elf_perform_relocation (struct bfd_link_info *info,
 	  : opcode == 0x1d)
 	{
 	  info->callbacks->einfo
-	    (_("%X%H: Unsupported JALX to the same ISA mode\n"),
+	    (_("%X%H: unsupported JALX to the same ISA mode\n"),
 	     input_bfd, input_section, relocation->r_offset);
 	  return TRUE;
 	}
@@ -6406,7 +6406,7 @@  mips_elf_perform_relocation (struct bfd_link_info *info,
       if (!ok)
 	{
 	  info->callbacks->einfo
-	    (_("%X%H: Unsupported jump between ISA modes; "
+	    (_("%X%H: unsupported jump between ISA modes; "
 	       "consider recompiling with interlinking enabled\n"),
 	     input_bfd, input_section, relocation->r_offset);
 	  return TRUE;
@@ -6451,7 +6451,7 @@  mips_elf_perform_relocation (struct bfd_link_info *info,
 	  if ((addr >> 28) << 28 != (dest >> 28) << 28)
 	    {
 	      info->callbacks->einfo
-		(_("%X%H: Cannot convert branch between ISA modes "
+		(_("%X%H: cannot convert branch between ISA modes "
 		   "to JALX: relocation out of range\n"),
 		 input_bfd, input_section, relocation->r_offset);
 	      return TRUE;
@@ -6463,7 +6463,7 @@  mips_elf_perform_relocation (struct bfd_link_info *info,
       else if (!mips_elf_hash_table (info)->ignore_branch_isa)
 	{
 	  info->callbacks->einfo
-	    (_("%X%H: Unsupported branch between ISA modes\n"),
+	    (_("%X%H: unsupported branch between ISA modes\n"),
 	     input_bfd, input_section, relocation->r_offset);
 	  return TRUE;
 	}
@@ -7107,7 +7107,7 @@  _bfd_mips_elf_section_processing (bfd *abfd, Elf_Internal_Shdr *hdr)
       if (hdr->sh_size != sizeof (Elf32_External_RegInfo))
 	{
 	  _bfd_error_handler
-	    (_("%pB: Incorrect `.reginfo' section size; "
+	    (_("%pB: incorrect `.reginfo' section size; "
 	       "expected %" PRIu64 ", got %" PRIu64),
 	     abfd, (uint64_t) sizeof (Elf32_External_RegInfo),
 	     (uint64_t) hdr->sh_size);
@@ -7151,7 +7151,7 @@  _bfd_mips_elf_section_processing (bfd *abfd, Elf_Internal_Shdr *hdr)
 	    {
 	      _bfd_error_handler
 		/* xgettext:c-format */
-		(_("%pB: Warning: bad `%s' option size %u smaller than"
+		(_("%pB: warning: bad `%s' option size %u smaller than"
 		   " its header"),
 		abfd, MIPS_ELF_OPTIONS_SECTION_NAME (abfd), intopt.size);
 	      break;
@@ -7386,7 +7386,7 @@  _bfd_mips_elf_section_from_shdr (bfd *abfd,
 	    {
 	      _bfd_error_handler
 		/* xgettext:c-format */
-		(_("%pB: Warning: bad `%s' option size %u smaller than"
+		(_("%pB: warning: bad `%s' option size %u smaller than"
 		   " its header"),
 		abfd, MIPS_ELF_OPTIONS_SECTION_NAME (abfd), intopt.size);
 	      break;
@@ -8142,7 +8142,7 @@  _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
 	{
 	  _bfd_error_handler
 	    /* xgettext:c-format */
-	    (_("%pB: Warning: cannot determine the target function for"
+	    (_("%pB: warning: cannot determine the target function for"
 	       " stub section `%s'"),
 	     abfd, name);
 	  bfd_set_error (bfd_error_bad_value);
@@ -8268,7 +8268,7 @@  _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
 	{
 	  _bfd_error_handler
 	    /* xgettext:c-format */
-	    (_("%pB: Warning: cannot determine the target function for"
+	    (_("%pB: warning: cannot determine the target function for"
 	       " stub section `%s'"),
 	     abfd, name);
 	  bfd_set_error (bfd_error_bad_value);
@@ -8400,7 +8400,7 @@  _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
 	{
 	  _bfd_error_handler
 	    /* xgettext:c-format */
-	    (_("%pB: Malformed reloc detected for section %s"),
+	    (_("%pB: malformed reloc detected for section %s"),
 	     abfd, name);
 	  bfd_set_error (bfd_error_bad_value);
 	  return FALSE;
@@ -10160,7 +10160,7 @@  _bfd_mips_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 						 sec);
 		      _bfd_error_handler
 			/* xgettext:c-format */
-			(_("%pB: Can't find matching LO16 reloc against `%s'"
+			(_("%pB: can't find matching LO16 reloc against `%s'"
 			   " for %s at %#" PRIx64 " in section `%pA'"),
 			 input_bfd, name,
 			 howto->name, (uint64_t) rel->r_offset, input_section);
@@ -10319,16 +10319,16 @@  _bfd_mips_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 	  msg = NULL;
 	  if (jal_reloc_p (howto->type))
 	    msg = (cross_mode_jump_p
-		   ? _("Cannot convert a jump to JALX "
+		   ? _("cannot convert a jump to JALX "
 		       "for a non-word-aligned address")
 		   : (howto->type == R_MIPS16_26
-		      ? _("Jump to a non-word-aligned address")
-		      : _("Jump to a non-instruction-aligned address")));
+		      ? _("jump to a non-word-aligned address")
+		      : _("jump to a non-instruction-aligned address")));
 	  else if (b_reloc_p (howto->type))
 	    msg = (cross_mode_jump_p
-		   ? _("Cannot convert a branch to JALX "
+		   ? _("cannot convert a branch to JALX "
 		       "for a non-word-aligned address")
-		   : _("Branch to a non-instruction-aligned address"));
+		   : _("branch to a non-instruction-aligned address"));
 	  else if (aligned_pcrel_reloc_p (howto->type))
 	    msg = _("PC-relative load from unaligned address");
 	  if (msg)
@@ -14152,7 +14152,7 @@  update_mips_abiflags_isa (bfd *abfd, Elf_Internal_ABIFlags_v0 *abiflags)
     default:
       _bfd_error_handler
 	/* xgettext:c-format */
-	(_("%pB: Unknown architecture %s"),
+	(_("%pB: unknown architecture %s"),
 	 abfd, bfd_printable_name (abfd));
     }
 
@@ -15195,19 +15195,19 @@  mips_elf_merge_obj_attributes (bfd *ibfd, struct bfd_link_info *info)
 	  if (!out_string && !in_string)
 	    /* xgettext:c-format */
 	    _bfd_error_handler
-	      (_("Warning: %pB uses unknown floating point ABI %d "
+	      (_("warning: %pB uses unknown floating point ABI %d "
 		 "(set by %pB), %pB uses unknown floating point ABI %d"),
 	       obfd, out_fp, abi_fp_bfd, ibfd, in_fp);
 	  else if (!out_string)
 	    _bfd_error_handler
 	      /* xgettext:c-format */
-	      (_("Warning: %pB uses unknown floating point ABI %d "
+	      (_("warning: %pB uses unknown floating point ABI %d "
 		 "(set by %pB), %pB uses %s"),
 	       obfd, out_fp, abi_fp_bfd, ibfd, in_string);
 	  else if (!in_string)
 	    _bfd_error_handler
 	      /* xgettext:c-format */
-	      (_("Warning: %pB uses %s (set by %pB), "
+	      (_("warning: %pB uses %s (set by %pB), "
 		 "%pB uses unknown floating point ABI %d"),
 	       obfd, out_string, abi_fp_bfd, ibfd, in_fp);
 	  else
@@ -15221,7 +15221,7 @@  mips_elf_merge_obj_attributes (bfd *ibfd, struct bfd_link_info *info)
 		in_string = "-mhard-float";
 	      _bfd_error_handler
 		/* xgettext:c-format */
-		(_("Warning: %pB uses %s (set by %pB), %pB uses %s"),
+		(_("warning: %pB uses %s (set by %pB), %pB uses %s"),
 		 obfd, out_string, abi_fp_bfd, ibfd, in_string);
 	    }
 	}
@@ -15240,7 +15240,7 @@  mips_elf_merge_obj_attributes (bfd *ibfd, struct bfd_link_info *info)
 	  case Val_GNU_MIPS_ABI_MSA_128:
 	    _bfd_error_handler
 	      /* xgettext:c-format */
-	      (_("Warning: %pB uses %s (set by %pB), "
+	      (_("warning: %pB uses %s (set by %pB), "
 		 "%pB uses unknown MSA ABI %d"),
 	       obfd, "-mmsa", abi_msa_bfd,
 	       ibfd, in_attr[Tag_GNU_MIPS_ABI_MSA].i);
@@ -15252,7 +15252,7 @@  mips_elf_merge_obj_attributes (bfd *ibfd, struct bfd_link_info *info)
 	      case Val_GNU_MIPS_ABI_MSA_128:
 		_bfd_error_handler
 		  /* xgettext:c-format */
-		  (_("Warning: %pB uses unknown MSA ABI %d "
+		  (_("warning: %pB uses unknown MSA ABI %d "
 		     "(set by %pB), %pB uses %s"),
 		     obfd, out_attr[Tag_GNU_MIPS_ABI_MSA].i,
 		   abi_msa_bfd, ibfd, "-mmsa");
@@ -15261,7 +15261,7 @@  mips_elf_merge_obj_attributes (bfd *ibfd, struct bfd_link_info *info)
 	      default:
 		_bfd_error_handler
 		  /* xgettext:c-format */
-		  (_("Warning: %pB uses unknown MSA ABI %d "
+		  (_("warning: %pB uses unknown MSA ABI %d "
 		     "(set by %pB), %pB uses unknown MSA ABI %d"),
 		   obfd, out_attr[Tag_GNU_MIPS_ABI_MSA].i,
 		   abi_msa_bfd, ibfd, in_attr[Tag_GNU_MIPS_ABI_MSA].i);
@@ -15389,27 +15389,27 @@  _bfd_mips_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
       if (LEVEL_REV (in_abiflags.isa_level, in_abiflags.isa_rev)
 	  < LEVEL_REV (abiflags.isa_level, abiflags.isa_rev))
 	_bfd_error_handler
-	  (_("%pB: warning: Inconsistent ISA between e_flags and "
+	  (_("%pB: warning: inconsistent ISA between e_flags and "
 	     ".MIPS.abiflags"), ibfd);
       if (abiflags.fp_abi != Val_GNU_MIPS_ABI_FP_ANY
 	  && in_abiflags.fp_abi != abiflags.fp_abi)
 	_bfd_error_handler
-	  (_("%pB: warning: Inconsistent FP ABI between .gnu.attributes and "
+	  (_("%pB: warning: inconsistent FP ABI between .gnu.attributes and "
 	     ".MIPS.abiflags"), ibfd);
       if ((in_abiflags.ases & abiflags.ases) != abiflags.ases)
 	_bfd_error_handler
-	  (_("%pB: warning: Inconsistent ASEs between e_flags and "
+	  (_("%pB: warning: inconsistent ASEs between e_flags and "
 	     ".MIPS.abiflags"), ibfd);
       /* The isa_ext is allowed to be an extension of what can be inferred
 	 from e_flags.  */
       if (!mips_mach_extends_p (bfd_mips_isa_ext_mach (abiflags.isa_ext),
 				bfd_mips_isa_ext_mach (in_abiflags.isa_ext)))
 	_bfd_error_handler
-	  (_("%pB: warning: Inconsistent ISA extensions between e_flags and "
+	  (_("%pB: warning: inconsistent ISA extensions between e_flags and "
 	     ".MIPS.abiflags"), ibfd);
       if (in_abiflags.flags2 != 0)
 	_bfd_error_handler
-	  (_("%pB: warning: Unexpected flag in the flags2 field of "
+	  (_("%pB: warning: unexpected flag in the flags2 field of "
 	     ".MIPS.abiflags (0x%lx)"), ibfd,
 	   in_abiflags.flags2);
     }
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 9d1128f..7934107 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@ 
+2018-02-23  Alan Modra  <amodra@gmail.com>
+
+	* testsuite/binutils-all/mips/mips-reginfo-n32.d,
+	* testsuite/binutils-all/mips/mips-reginfo.d: Update.
+
 2018-02-20  Ronald Hoogenboom  <hoogenboom30@zonnet.nl>
 
 	* doc/binutils.texi (objcopy): Add missing closing square
diff --git a/binutils/testsuite/binutils-all/mips/mips-reginfo-n32.d b/binutils/testsuite/binutils-all/mips/mips-reginfo-n32.d
index fe55e95..1576092 100644
--- a/binutils/testsuite/binutils-all/mips/mips-reginfo-n32.d
+++ b/binutils/testsuite/binutils-all/mips/mips-reginfo-n32.d
@@ -3,5 +3,5 @@ 
 #as: -n32 -mips3
 #objcopy: --rename-section .foo=.reginfo
 #source: mips-reginfo.s
-#error: \A[^\n]*: Incorrect `\.reginfo' section size; expected 24, got 4\n
+#error: \A[^\n]*: incorrect `\.reginfo' section size; expected 24, got 4\n
 #error:   [^\n]*: Bad value\Z
diff --git a/binutils/testsuite/binutils-all/mips/mips-reginfo.d b/binutils/testsuite/binutils-all/mips/mips-reginfo.d
index 7a8c1ca..2f96127 100644
--- a/binutils/testsuite/binutils-all/mips/mips-reginfo.d
+++ b/binutils/testsuite/binutils-all/mips/mips-reginfo.d
@@ -2,5 +2,5 @@ 
 #name: MIPS objcopy .reginfo section size
 #as: -32
 #objcopy: --rename-section .foo=.reginfo
-#error: \A[^\n]*: Incorrect `\.reginfo' section size; expected 24, got 4\n
+#error: \A[^\n]*: incorrect `\.reginfo' section size; expected 24, got 4\n
 #error:   [^\n]*: Bad value\Z
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 20ea246..9f2c5dd 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@ 
+2018-02-23  Alan Modra  <amodra@gmail.com>
+
+	* testsuite/gas/mips/reginfo-2.l: Update.
+
 2018-02-22  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* config/tc-i386.c (_i386_insn): Add rex_encoding.
diff --git a/gas/testsuite/gas/mips/reginfo-2.l b/gas/testsuite/gas/mips/reginfo-2.l
index ea9fef9..279dd6e 100644
--- a/gas/testsuite/gas/mips/reginfo-2.l
+++ b/gas/testsuite/gas/mips/reginfo-2.l
@@ -1,3 +1,3 @@ 
-.*: Incorrect `\.reginfo' section size; expected 24, got 28
+.*: incorrect `\.reginfo' section size; expected 24, got 28
 .*: Assembler messages:
 .*: Fatal error: can't close .*: Bad value
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 04aa2c9..5e30d25 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,88 @@ 
 2018-02-23  Alan Modra  <amodra@gmail.com>
 
+	* testsuite/ld-mips-elf/attr-gnu-4-12.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-13.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-14.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-16.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-17.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-18.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-19.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-21.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-23.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-24.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-25.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-26.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-27.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-28.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-29.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-31.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-32.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-34.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-35.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-36.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-37.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-38.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-39.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-41.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-42.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-43.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-45.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-46.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-47.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-48.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-49.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-52.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-53.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-54.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-58.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-59.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-61.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-62.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-63.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-64.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-68.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-69.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-71.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-72.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-73.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-74.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-78.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-79.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-81.d,
+	* testsuite/ld-mips-elf/attr-gnu-4-89.d,
+	* testsuite/ld-mips-elf/attr-gnu-8-12.d,
+	* testsuite/ld-mips-elf/attr-gnu-8-21.d,
+	* testsuite/ld-mips-elf/bal-jalx-pic-micromips-n32.d,
+	* testsuite/ld-mips-elf/bal-jalx-pic-micromips-n64.d,
+	* testsuite/ld-mips-elf/bal-jalx-pic-micromips.d,
+	* testsuite/ld-mips-elf/bal-jalx-pic-n32.d,
+	* testsuite/ld-mips-elf/bal-jalx-pic-n64.d,
+	* testsuite/ld-mips-elf/bal-jalx-pic.d,
+	* testsuite/ld-mips-elf/mode-change-error-1.d,
+	* testsuite/ld-mips-elf/unaligned-branch-2.d,
+	* testsuite/ld-mips-elf/unaligned-branch-ignore-2.d,
+	* testsuite/ld-mips-elf/unaligned-branch-ignore-micromips.d,
+	* testsuite/ld-mips-elf/unaligned-branch-ignore-mips16.d,
+	* testsuite/ld-mips-elf/unaligned-branch-ignore-r6-1.d,
+	* testsuite/ld-mips-elf/unaligned-branch-micromips.d,
+	* testsuite/ld-mips-elf/unaligned-branch-mips16.d,
+	* testsuite/ld-mips-elf/unaligned-branch-r6-1.d,
+	* testsuite/ld-mips-elf/unaligned-branch-r6-2.d,
+	* testsuite/ld-mips-elf/unaligned-branch.d,
+	* testsuite/ld-mips-elf/unaligned-jalx-1.d,
+	* testsuite/ld-mips-elf/unaligned-jalx-3.d,
+	* testsuite/ld-mips-elf/unaligned-jalx-addend-1.d,
+	* testsuite/ld-mips-elf/unaligned-jalx-addend-3.d,
+	* testsuite/ld-mips-elf/unaligned-jalx-addend-micromips-1.d,
+	* testsuite/ld-mips-elf/unaligned-jalx-addend-mips16-1.d,
+	* testsuite/ld-mips-elf/unaligned-jalx-micromips-1.d,
+	* testsuite/ld-mips-elf/unaligned-jalx-mips16-1.d,
+	* testsuite/ld-mips-elf/unaligned-jump-micromips.d,
+	* testsuite/ld-mips-elf/unaligned-jump-mips16.d,
+	* testsuite/ld-mips-elf/unaligned-jump.d: Update.
+
+2018-02-23  Alan Modra  <amodra@gmail.com>
+
 	* testsuite/ld-elf/indirect.exp,
 	* testsuite/ld-elf/pr22649-2ab-mips.msg,
 	* testsuite/ld-elf/pr22649-2cd-mips.msg,
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-12.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-12.d
index b1b0760..aeab83e 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-12.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-12.d
@@ -1,4 +1,4 @@ 
 #source: attr-gnu-4-1.s
 #source: attr-gnu-4-2.s
 #ld: -r
-#warning: Warning: .* uses -mdouble-float \(set by .*\), .* uses -msingle-float
+#warning: warning: .* uses -mdouble-float \(set by .*\), .* uses -msingle-float
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-13.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-13.d
index c9bf544..a416955 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-13.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-13.d
@@ -1,4 +1,4 @@ 
 #source: attr-gnu-4-1.s
 #source: attr-gnu-4-3.s
 #ld: -r
-#warning: Warning: .* uses -mhard-float \(set by .*\), .* uses -msoft-float
+#warning: warning: .* uses -mhard-float \(set by .*\), .* uses -msoft-float
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-14.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-14.d
index 417ad0a..117a36d 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-14.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-14.d
@@ -2,5 +2,5 @@ 
 #source: attr-gnu-4-4.s -W
 #ld: -r
 #error: \A[^\n]*: [^\n]* linking -mfp64 module with previous -mfp32 modules\n
-#error:   [^\n]*: Warning: .* uses -mdouble-float \(set by .*\), .* uses -mips32r2 -mfp64 \(12 callee-saved\)\n
+#error:   [^\n]*: warning: .* uses -mdouble-float \(set by .*\), .* uses -mips32r2 -mfp64 \(12 callee-saved\)\n
 #error:   [^\n]*: failed to merge target specific data of file [^\n]*\.o\Z
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-16.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-16.d
index 73a6fd8..ec4a4fd 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-16.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-16.d
@@ -2,7 +2,7 @@ 
 #source: attr-gnu-4-6.s
 #ld: -r
 #readelf: -A
-#warning: Warning: .* uses -mdouble-float \(set by .*\), .* uses -mgp32 -mfp64
+#warning: warning: .* uses -mdouble-float \(set by .*\), .* uses -mgp32 -mfp64
 
 Attribute Section: gnu
 File Attributes
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-17.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-17.d
index 68c9617..06b1366 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-17.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-17.d
@@ -2,7 +2,7 @@ 
 #source: attr-gnu-4-7.s
 #ld: -r
 #readelf: -A
-#warning: Warning: .* uses -mdouble-float \(set by .*\), .* uses -mgp32 -mfp64 -mno-odd-spreg
+#warning: warning: .* uses -mdouble-float \(set by .*\), .* uses -mgp32 -mfp64 -mno-odd-spreg
 
 Attribute Section: gnu
 File Attributes
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-18.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-18.d
index c600871..4da922a 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-18.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-18.d
@@ -2,7 +2,7 @@ 
 #source: attr-gnu-4-8.s -W
 #ld: -r
 #readelf: -A
-#warning: Warning: .* uses -mdouble-float \(set by .*\), .* uses unknown floating point ABI 8
+#warning: warning: .* uses -mdouble-float \(set by .*\), .* uses unknown floating point ABI 8
 
 Attribute Section: gnu
 File Attributes
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-19.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-19.d
index 008dcc1..9344dfa 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-19.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-19.d
@@ -2,7 +2,7 @@ 
 #source: attr-gnu-4-9.s -W
 #ld: -r
 #readelf: -A
-#warning: Warning: .* uses -mdouble-float \(set by .*\), .* uses unknown floating point ABI 9
+#warning: warning: .* uses -mdouble-float \(set by .*\), .* uses unknown floating point ABI 9
 
 Attribute Section: gnu
 File Attributes
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-21.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-21.d
index 0081c72..986b46a 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-21.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-21.d
@@ -1,4 +1,4 @@ 
 #source: attr-gnu-4-2.s
 #source: attr-gnu-4-1.s
 #ld: -r
-#warning: Warning: .* uses -msingle-float \(set by .*\), .* uses -mdouble-float
+#warning: warning: .* uses -msingle-float \(set by .*\), .* uses -mdouble-float
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-23.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-23.d
index 0b8a6fc..0805f19 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-23.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-23.d
@@ -1,4 +1,4 @@ 
 #source: attr-gnu-4-2.s
 #source: attr-gnu-4-3.s
 #ld: -r
-#warning: Warning: .* uses -mhard-float \(set by .*\), .* uses -msoft-float
+#warning: warning: .* uses -mhard-float \(set by .*\), .* uses -msoft-float
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-24.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-24.d
index 608ef0e..5204d11 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-24.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-24.d
@@ -2,5 +2,5 @@ 
 #source: attr-gnu-4-4.s -W
 #ld: -r
 #error: \A[^\n]*: [^\n]* linking -mfp64 module with previous -mfp32 modules\n
-#error:   [^\n]*: Warning: .* uses -msingle-float \(set by .*\), .* uses -mips32r2 -mfp64 \(12 callee-saved\)\n
+#error:   [^\n]*: warning: .* uses -msingle-float \(set by .*\), .* uses -mips32r2 -mfp64 \(12 callee-saved\)\n
 #error:   [^\n]*: failed to merge target specific data of file [^\n]*\.o\Z
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-25.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-25.d
index c32f5b4..640c3c2 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-25.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-25.d
@@ -2,7 +2,7 @@ 
 #source: attr-gnu-4-5.s
 #ld: -r
 #readelf: -A
-#warning: Warning: .* uses -msingle-float \(set by .*\), .* uses -mfpxx
+#warning: warning: .* uses -msingle-float \(set by .*\), .* uses -mfpxx
 
 Attribute Section: gnu
 File Attributes
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-26.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-26.d
index 43fe4cb..1a035b1 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-26.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-26.d
@@ -2,7 +2,7 @@ 
 #source: attr-gnu-4-6.s
 #ld: -r
 #readelf: -A
-#warning: Warning: .* uses -msingle-float \(set by .*\), .* uses -mgp32 -mfp64
+#warning: warning: .* uses -msingle-float \(set by .*\), .* uses -mgp32 -mfp64
 
 Attribute Section: gnu
 File Attributes
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-27.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-27.d
index 9af8eac..30782f1 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-27.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-27.d
@@ -2,7 +2,7 @@ 
 #source: attr-gnu-4-7.s
 #ld: -r
 #readelf: -A
-#warning: Warning: .* uses -msingle-float \(set by .*\), .* uses -mgp32 -mfp64 -mno-odd-spreg
+#warning: warning: .* uses -msingle-float \(set by .*\), .* uses -mgp32 -mfp64 -mno-odd-spreg
 
 Attribute Section: gnu
 File Attributes
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-28.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-28.d
index 9b36566..1b7e8e7 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-28.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-28.d
@@ -2,7 +2,7 @@ 
 #source: attr-gnu-4-8.s -W
 #ld: -r
 #readelf: -A
-#warning: Warning: .* uses -msingle-float \(set by .*\), .* uses unknown floating point ABI 8
+#warning: warning: .* uses -msingle-float \(set by .*\), .* uses unknown floating point ABI 8
 
 Attribute Section: gnu
 File Attributes
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-29.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-29.d
index dd460e5..e1f21de 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-29.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-29.d
@@ -2,7 +2,7 @@ 
 #source: attr-gnu-4-9.s -W
 #ld: -r
 #readelf: -A
-#warning: Warning: .* uses -msingle-float \(set by .*\), .* uses unknown floating point ABI 9
+#warning: warning: .* uses -msingle-float \(set by .*\), .* uses unknown floating point ABI 9
 
 Attribute Section: gnu
 File Attributes
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-31.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-31.d
index 4fcf76f..4314a30 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-31.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-31.d
@@ -1,4 +1,4 @@ 
 #source: attr-gnu-4-3.s
 #source: attr-gnu-4-1.s
 #ld: -r
-#warning: Warning: .* uses -msoft-float \(set by .*\), .* uses -mhard-float
+#warning: warning: .* uses -msoft-float \(set by .*\), .* uses -mhard-float
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-32.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-32.d
index 0d663c2..9386a63 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-32.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-32.d
@@ -1,4 +1,4 @@ 
 #source: attr-gnu-4-3.s
 #source: attr-gnu-4-2.s
 #ld: -r
-#warning: Warning: .* uses -msoft-float \(set by .*\), .* uses -mhard-float
+#warning: warning: .* uses -msoft-float \(set by .*\), .* uses -mhard-float
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-34.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-34.d
index f8328b5..6f3a2aa 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-34.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-34.d
@@ -2,5 +2,5 @@ 
 #source: attr-gnu-4-4.s -W
 #ld: -r
 #error: \A[^\n]*: [^\n]* linking -mfp64 module with previous -mfp32 modules\n
-#error:   [^\n]*: Warning: .* uses -msoft-float \(set by .*\), .* uses -mhard-float\n
+#error:   [^\n]*: warning: .* uses -msoft-float \(set by .*\), .* uses -mhard-float\n
 #error:   [^\n]*: failed to merge target specific data of file [^\n]*\.o\Z
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-35.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-35.d
index 131f44b..3ab8f16 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-35.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-35.d
@@ -2,7 +2,7 @@ 
 #source: attr-gnu-4-5.s
 #ld: -r
 #readelf: -A
-#warning: Warning: .* uses -msoft-float \(set by .*\), .* uses -mhard-float
+#warning: warning: .* uses -msoft-float \(set by .*\), .* uses -mhard-float
 
 Attribute Section: gnu
 File Attributes
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-36.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-36.d
index 2762696..15113ed 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-36.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-36.d
@@ -2,7 +2,7 @@ 
 #source: attr-gnu-4-6.s
 #ld: -r
 #readelf: -A
-#warning: Warning: .* uses -msoft-float \(set by .*\), .* uses -mhard-float
+#warning: warning: .* uses -msoft-float \(set by .*\), .* uses -mhard-float
 
 Attribute Section: gnu
 File Attributes
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-37.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-37.d
index 06f37c5..63f6235 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-37.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-37.d
@@ -2,7 +2,7 @@ 
 #source: attr-gnu-4-7.s
 #ld: -r
 #readelf: -A
-#warning: Warning: .* uses -msoft-float \(set by .*\), .* uses -mhard-float
+#warning: warning: .* uses -msoft-float \(set by .*\), .* uses -mhard-float
 
 Attribute Section: gnu
 File Attributes
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-38.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-38.d
index 70c1b96..e4bb557 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-38.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-38.d
@@ -2,7 +2,7 @@ 
 #source: attr-gnu-4-8.s -W
 #ld: -r
 #readelf: -A
-#warning: Warning: .* uses -msoft-float \(set by .*\), .* uses unknown floating point ABI 8
+#warning: warning: .* uses -msoft-float \(set by .*\), .* uses unknown floating point ABI 8
 
 Attribute Section: gnu
 File Attributes
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-39.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-39.d
index 458c129..1946857 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-39.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-39.d
@@ -2,7 +2,7 @@ 
 #source: attr-gnu-4-9.s -W
 #ld: -r
 #readelf: -A
-#warning: Warning: .* uses -msoft-float \(set by .*\), .* uses unknown floating point ABI 9
+#warning: warning: .* uses -msoft-float \(set by .*\), .* uses unknown floating point ABI 9
 
 Attribute Section: gnu
 File Attributes
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-41.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-41.d
index ff6e6e4..49f2137 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-41.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-41.d
@@ -2,5 +2,5 @@ 
 #source: attr-gnu-4-1.s
 #ld: -r
 #error: \A[^\n]*: [^\n]* linking -mfp32 module with previous -mfp64 modules\n
-#error:   [^\n]*: Warning: .* uses -mips32r2 -mfp64 \(12 callee-saved\) \(set by .*\), .* uses -mdouble-float\n
+#error:   [^\n]*: warning: .* uses -mips32r2 -mfp64 \(12 callee-saved\) \(set by .*\), .* uses -mdouble-float\n
 #error:   [^\n]*: failed to merge target specific data of file [^\n]*\.o\Z
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-42.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-42.d
index aa17693..7af44e2 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-42.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-42.d
@@ -2,5 +2,5 @@ 
 #source: attr-gnu-4-2.s
 #ld: -r
 #error: \A[^\n]*: [^\n]* linking -mfp32 module with previous -mfp64 modules\n
-#error:   [^\n]*: Warning: .* uses -mips32r2 -mfp64 \(12 callee-saved\) \(set by .*\), .* uses -msingle-float\n
+#error:   [^\n]*: warning: .* uses -mips32r2 -mfp64 \(12 callee-saved\) \(set by .*\), .* uses -msingle-float\n
 #error:   [^\n]*: failed to merge target specific data of file [^\n]*\.o\Z
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-43.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-43.d
index ddc0199..83e88a7 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-43.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-43.d
@@ -2,5 +2,5 @@ 
 #source: attr-gnu-4-3.s
 #ld: -r
 #error: \A[^\n]*: [^\n]* linking -mfp32 module with previous -mfp64 modules\n
-#error:   [^\n]*: Warning: .* uses -mhard-float \(set by .*\), .* uses -msoft-float\n
+#error:   [^\n]*: warning: .* uses -mhard-float \(set by .*\), .* uses -msoft-float\n
 #error:   [^\n]*: failed to merge target specific data of file [^\n]*\.o\Z
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-45.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-45.d
index b60b983..b256768 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-45.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-45.d
@@ -2,5 +2,5 @@ 
 #source: attr-gnu-4-5.s
 #ld: -r
 #error: \A[^\n]*: [^\n]* linking -mfp32 module with previous -mfp64 modules\n
-#error:   [^\n]*: Warning: .* uses -mips32r2 -mfp64 \(12 callee-saved\) \(set by .*\), .* uses -mfpxx\n
+#error:   [^\n]*: warning: .* uses -mips32r2 -mfp64 \(12 callee-saved\) \(set by .*\), .* uses -mfpxx\n
 #error:   [^\n]*: failed to merge target specific data of file [^\n]*\.o\Z
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-46.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-46.d
index 82dd22b..40ef049 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-46.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-46.d
@@ -2,5 +2,5 @@ 
 #source: attr-gnu-4-6.s
 #ld: -r
 #error: \A[^\n]*: [^\n]* linking -mfp32 module with previous -mfp64 modules\n
-#error:   [^\n]*: Warning: .* uses -mips32r2 -mfp64 \(12 callee-saved\) \(set by .*\), .* uses -mgp32 -mfp64\n
+#error:   [^\n]*: warning: .* uses -mips32r2 -mfp64 \(12 callee-saved\) \(set by .*\), .* uses -mgp32 -mfp64\n
 #error:   [^\n]*: failed to merge target specific data of file [^\n]*\.o\Z
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-47.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-47.d
index eda8a27..9d01269 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-47.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-47.d
@@ -2,5 +2,5 @@ 
 #source: attr-gnu-4-7.s
 #ld: -r
 #error: \A[^\n]*: [^\n]* linking -mfp32 module with previous -mfp64 modules\n
-#error:   [^\n]*: Warning: .* uses -mips32r2 -mfp64 \(12 callee-saved\) \(set by .*\), .* uses -mgp32 -mfp64 -mno-odd-spreg\n
+#error:   [^\n]*: warning: .* uses -mips32r2 -mfp64 \(12 callee-saved\) \(set by .*\), .* uses -mgp32 -mfp64 -mno-odd-spreg\n
 #error:   [^\n]*: failed to merge target specific data of file [^\n]*\.o\Z
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-48.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-48.d
index 084922b..a1631d8 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-48.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-48.d
@@ -2,5 +2,5 @@ 
 #source: attr-gnu-4-8.s -W
 #ld: -r
 #error: \A[^\n]*: [^\n]* linking -mfp32 module with previous -mfp64 modules\n
-#error:   [^\n]*: Warning: .* uses -mips32r2 -mfp64 \(12 callee-saved\) \(set by .*\), .* uses unknown floating point ABI 8\n
+#error:   [^\n]*: warning: .* uses -mips32r2 -mfp64 \(12 callee-saved\) \(set by .*\), .* uses unknown floating point ABI 8\n
 #error:   [^\n]*: failed to merge target specific data of file [^\n]*\.o\Z
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-49.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-49.d
index 24e5145..3b82bac 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-49.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-49.d
@@ -2,5 +2,5 @@ 
 #source: attr-gnu-4-9.s -W
 #ld: -r
 #error: \A[^\n]*: [^\n]* linking -mfp32 module with previous -mfp64 modules\n
-#error:   [^\n]*: Warning: .* uses -mips32r2 -mfp64 \(12 callee-saved\) \(set by .*\), .* uses unknown floating point ABI 9\n
+#error:   [^\n]*: warning: .* uses -mips32r2 -mfp64 \(12 callee-saved\) \(set by .*\), .* uses unknown floating point ABI 9\n
 #error:   [^\n]*: failed to merge target specific data of file [^\n]*\.o\Z
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-52.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-52.d
index 4ea6033..fb75d1d 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-52.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-52.d
@@ -1,4 +1,4 @@ 
 #source: attr-gnu-4-5.s
 #source: attr-gnu-4-2.s -mips32r2
 #ld: -r
-#warning: Warning: .* uses -mfpxx \(set by .*\), .* uses -msingle-float
+#warning: warning: .* uses -mfpxx \(set by .*\), .* uses -msingle-float
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-53.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-53.d
index 4fbe58d..48d2e2c 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-53.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-53.d
@@ -1,4 +1,4 @@ 
 #source: attr-gnu-4-5.s
 #source: attr-gnu-4-3.s -mips32r2
 #ld: -r
-#warning: Warning: .* uses -mhard-float \(set by .*\), .* uses -msoft-float
+#warning: warning: .* uses -mhard-float \(set by .*\), .* uses -msoft-float
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-54.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-54.d
index 70d6b94..92faeb4 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-54.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-54.d
@@ -2,5 +2,5 @@ 
 #source: attr-gnu-4-4.s -W -mips32r2
 #ld: -r
 #error: \A[^\n]*: [^\n]* linking -mfp64 module with previous -mfp32 modules\n
-#error:   [^\n]*: Warning: .* uses -mfpxx \(set by .*\), .* uses -mips32r2 -mfp64 \(12 callee-saved\)\n
+#error:   [^\n]*: warning: .* uses -mfpxx \(set by .*\), .* uses -mips32r2 -mfp64 \(12 callee-saved\)\n
 #error:   [^\n]*: failed to merge target specific data of file [^\n]*\.o\Z
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-58.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-58.d
index 77470c8..056919e 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-58.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-58.d
@@ -1,4 +1,4 @@ 
 #source: attr-gnu-4-5.s
 #source: attr-gnu-4-8.s -W -mips32r2
 #ld: -r
-#warning: Warning: .* uses -mfpxx \(set by .*\), .* uses unknown floating point ABI 8
+#warning: warning: .* uses -mfpxx \(set by .*\), .* uses unknown floating point ABI 8
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-59.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-59.d
index 59516ce..8f24958 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-59.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-59.d
@@ -1,4 +1,4 @@ 
 #source: attr-gnu-4-5.s
 #source: attr-gnu-4-9.s -W -mips32r2
 #ld: -r
-#warning: Warning: .* uses -mfpxx \(set by .*\), .* uses unknown floating point ABI 9 
+#warning: warning: .* uses -mfpxx \(set by .*\), .* uses unknown floating point ABI 9 
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-61.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-61.d
index 4505516..acdf783 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-61.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-61.d
@@ -1,4 +1,4 @@ 
 #source: attr-gnu-4-6.s
 #source: attr-gnu-4-1.s -mips32r2
 #ld: -r
-#warning: Warning: .* uses -mgp32 -mfp64 \(set by .*\), .* uses -mdouble-float
+#warning: warning: .* uses -mgp32 -mfp64 \(set by .*\), .* uses -mdouble-float
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-62.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-62.d
index 9aa789d..f7d10b6 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-62.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-62.d
@@ -1,4 +1,4 @@ 
 #source: attr-gnu-4-6.s
 #source: attr-gnu-4-2.s -mips32r2
 #ld: -r
-#warning: Warning: .* uses -mgp32 -mfp64 \(set by .*\), .* uses -msingle-float
+#warning: warning: .* uses -mgp32 -mfp64 \(set by .*\), .* uses -msingle-float
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-63.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-63.d
index 4f9f737..0934393 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-63.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-63.d
@@ -1,4 +1,4 @@ 
 #source: attr-gnu-4-6.s
 #source: attr-gnu-4-3.s -mips32r2
 #ld: -r
-#warning: Warning: .* uses -mhard-float \(set by .*\), .* uses -msoft-float
+#warning: warning: .* uses -mhard-float \(set by .*\), .* uses -msoft-float
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-64.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-64.d
index 9b4fbd8..41ff658 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-64.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-64.d
@@ -2,5 +2,5 @@ 
 #source: attr-gnu-4-4.s -W -mips32r2
 #ld: -r
 #error: \A[^\n]*: [^\n]* linking -mfp64 module with previous -mfp32 modules\n
-#error:   [^\n]*: Warning: .* uses -mgp32 -mfp64 \(set by .*\), .* uses -mips32r2 -mfp64 \(12 callee-saved\)\n
+#error:   [^\n]*: warning: .* uses -mgp32 -mfp64 \(set by .*\), .* uses -mips32r2 -mfp64 \(12 callee-saved\)\n
 #error:   [^\n]*: failed to merge target specific data of file [^\n]*\.o\Z
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-68.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-68.d
index f696dee..4ed22c8 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-68.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-68.d
@@ -1,4 +1,4 @@ 
 #source: attr-gnu-4-6.s
 #source: attr-gnu-4-8.s -W -mips32r2
 #ld: -r
-#warning: Warning: .* uses -mgp32 -mfp64 \(set by .*\), .* uses unknown floating point ABI 8
+#warning: warning: .* uses -mgp32 -mfp64 \(set by .*\), .* uses unknown floating point ABI 8
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-69.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-69.d
index abf8e3e..1cfcb69 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-69.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-69.d
@@ -1,4 +1,4 @@ 
 #source: attr-gnu-4-6.s
 #source: attr-gnu-4-9.s -W -mips32r2
 #ld: -r
-#warning: Warning: .* uses -mgp32 -mfp64 \(set by .*\), .* uses unknown floating point ABI 9
+#warning: warning: .* uses -mgp32 -mfp64 \(set by .*\), .* uses unknown floating point ABI 9
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-71.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-71.d
index d2d8b60..86a0864 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-71.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-71.d
@@ -1,4 +1,4 @@ 
 #source: attr-gnu-4-7.s
 #source: attr-gnu-4-1.s -mips32r2
 #ld: -r
-#warning: Warning: .* uses -mgp32 -mfp64 -mno-odd-spreg \(set by .*\), .* uses -mdouble-float
+#warning: warning: .* uses -mgp32 -mfp64 -mno-odd-spreg \(set by .*\), .* uses -mdouble-float
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-72.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-72.d
index 4ede98f..7733f82 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-72.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-72.d
@@ -1,4 +1,4 @@ 
 #source: attr-gnu-4-7.s
 #source: attr-gnu-4-2.s -mips32r2
 #ld: -r
-#warning: Warning: .* uses -mgp32 -mfp64 -mno-odd-spreg \(set by .*\), .* uses -msingle-float
+#warning: warning: .* uses -mgp32 -mfp64 -mno-odd-spreg \(set by .*\), .* uses -msingle-float
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-73.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-73.d
index cb87839..3449084 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-73.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-73.d
@@ -1,4 +1,4 @@ 
 #source: attr-gnu-4-7.s
 #source: attr-gnu-4-3.s -mips32r2
 #ld: -r
-#warning: Warning: .* uses -mhard-float \(set by .*\), .* uses -msoft-float
+#warning: warning: .* uses -mhard-float \(set by .*\), .* uses -msoft-float
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-74.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-74.d
index e281ae5..5042b4b 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-74.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-74.d
@@ -2,5 +2,5 @@ 
 #source: attr-gnu-4-4.s -W -mips32r2
 #ld: -r
 #error: \A[^\n]*: [^\n]* linking -mfp64 module with previous -mfp32 modules\n
-#error:   [^\n]*: Warning: .* uses -mgp32 -mfp64 -mno-odd-spreg \(set by .*\), .* uses -mips32r2 -mfp64 \(12 callee-saved\)\n
+#error:   [^\n]*: warning: .* uses -mgp32 -mfp64 -mno-odd-spreg \(set by .*\), .* uses -mips32r2 -mfp64 \(12 callee-saved\)\n
 #error:   [^\n]*: failed to merge target specific data of file [^\n]*\.o\Z
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-78.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-78.d
index 1a9012d..4017af3 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-78.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-78.d
@@ -1,4 +1,4 @@ 
 #source: attr-gnu-4-7.s
 #source: attr-gnu-4-8.s -W -mips32r2
 #ld: -r
-#warning: Warning: .* uses -mgp32 -mfp64 -mno-odd-spreg \(set by .*\), .* uses unknown floating point ABI 8
+#warning: warning: .* uses -mgp32 -mfp64 -mno-odd-spreg \(set by .*\), .* uses unknown floating point ABI 8
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-79.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-79.d
index a70a22f..95e8fde 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-79.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-79.d
@@ -1,4 +1,4 @@ 
 #source: attr-gnu-4-7.s
 #source: attr-gnu-4-9.s -W -mips32r2
 #ld: -r
-#warning: Warning: .* uses -mgp32 -mfp64 -mno-odd-spreg \(set by .*\), .* uses unknown floating point ABI 9
+#warning: warning: .* uses -mgp32 -mfp64 -mno-odd-spreg \(set by .*\), .* uses unknown floating point ABI 9
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-81.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-81.d
index fd44915..54f8842 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-81.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-81.d
@@ -1,4 +1,4 @@ 
 #source: attr-gnu-4-8.s -W
 #source: attr-gnu-4-1.s
 #ld: -r
-#warning: Warning: .* uses unknown floating point ABI 8 \(set by .*\), .* uses -mdouble-float
+#warning: warning: .* uses unknown floating point ABI 8 \(set by .*\), .* uses -mdouble-float
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-89.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-89.d
index 331a3ef..00996dc 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-89.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-89.d
@@ -1,4 +1,4 @@ 
 #source: attr-gnu-4-8.s
 #source: attr-gnu-4-9.s -W -mips32r2
 #ld: -r
-#warning: Warning: .* uses -mgp32 -mfp64 -mno-odd-spreg \(set by .*\), .* uses unknown floating point ABI 8
+#warning: warning: .* uses -mgp32 -mfp64 -mno-odd-spreg \(set by .*\), .* uses unknown floating point ABI 8
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-8-12.d b/ld/testsuite/ld-mips-elf/attr-gnu-8-12.d
index 10249d0..24cf9dd 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-8-12.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-8-12.d
@@ -1,4 +1,4 @@ 
 #source: attr-gnu-8-1.s
 #source: attr-gnu-8-2.s
 #ld: -r
-#warning: Warning: .* uses -mmsa \(set by .*\), .* uses unknown MSA ABI 2
+#warning: warning: .* uses -mmsa \(set by .*\), .* uses unknown MSA ABI 2
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-8-21.d b/ld/testsuite/ld-mips-elf/attr-gnu-8-21.d
index b8f0e7c..bde0992 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-8-21.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-8-21.d
@@ -1,4 +1,4 @@ 
 #source: attr-gnu-8-2.s
 #source: attr-gnu-8-1.s
 #ld: -r
-#warning: Warning: .* uses unknown MSA ABI 2 \(set by .*\), .* uses -mmsa
+#warning: warning: .* uses unknown MSA ABI 2 \(set by .*\), .* uses -mmsa
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips-n32.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips-n32.d
index 3b25dc7..32734b9 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips-n32.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips-n32.d
@@ -3,4 +3,4 @@ 
 #as: -EB -n32 -march=from-abi
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared
 #error: \A[^\n]*: In function `bar':\n
-#error:   \(\.text\+0x1014\): Unsupported branch between ISA modes\Z
+#error:   \(\.text\+0x1014\): unsupported branch between ISA modes\Z
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips-n64.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips-n64.d
index d39f114..b05c608 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips-n64.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips-n64.d
@@ -3,4 +3,4 @@ 
 #as: -EB -64 -march=from-abi
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared
 #error: \A[^\n]*: In function `bar':\n
-#error:   \(\.text\+0x1014\): Unsupported branch between ISA modes\Z
+#error:   \(\.text\+0x1014\): unsupported branch between ISA modes\Z
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips.d
index 7404d25..f9df557 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips.d
@@ -3,4 +3,4 @@ 
 #as: -EB -32
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared
 #error: \A[^\n]*: In function `bar':\n
-#error:   \(\.text\+0x1014\): Unsupported branch between ISA modes\Z
+#error:   \(\.text\+0x1014\): unsupported branch between ISA modes\Z
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-n32.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-n32.d
index 39d5a38..bf3f3ff 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-n32.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-n32.d
@@ -3,4 +3,4 @@ 
 #as: -EB -n32 -march=from-abi
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared
 #error: \A[^\n]*: In function `bar':\n
-#error:   \(\.text\+0x1014\): Unsupported branch between ISA modes\Z
+#error:   \(\.text\+0x1014\): unsupported branch between ISA modes\Z
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-n64.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-n64.d
index 2a09149..9d9bf4a 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-n64.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-n64.d
@@ -3,4 +3,4 @@ 
 #as: -EB -64 -march=from-abi
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared
 #error: \A[^\n]*: In function `bar':\n
-#error:   \(\.text\+0x1014\): Unsupported branch between ISA modes\Z
+#error:   \(\.text\+0x1014\): unsupported branch between ISA modes\Z
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic.d
index daf6211..0cd4f09 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-pic.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic.d
@@ -3,4 +3,4 @@ 
 #as: -EB -32
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared
 #error: \A[^\n]*: In function `bar':\n
-#error:   \(\.text\+0x1014\): Unsupported branch between ISA modes\Z
+#error:   \(\.text\+0x1014\): unsupported branch between ISA modes\Z
diff --git a/ld/testsuite/ld-mips-elf/mode-change-error-1.d b/ld/testsuite/ld-mips-elf/mode-change-error-1.d
index 340d087..c81b401 100644
--- a/ld/testsuite/ld-mips-elf/mode-change-error-1.d
+++ b/ld/testsuite/ld-mips-elf/mode-change-error-1.d
@@ -3,5 +3,5 @@ 
 #source: mode-change-error-1b.s
 #ld: -e 0x8000000
 #error: \A[^\n]*: In function `main':\n
-#error:   \(\.text\+0x0\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x8\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\Z
+#error:   \(\.text\+0x0\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x8\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\Z
diff --git a/ld/testsuite/ld-mips-elf/unaligned-branch-2.d b/ld/testsuite/ld-mips-elf/unaligned-branch-2.d
index c4103ae..8f81cba 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-branch-2.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-branch-2.d
@@ -3,47 +3,47 @@ 
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000
 #source: ../../../gas/testsuite/gas/mips/unaligned-branch-2.s
 #error: \A[^\n]*: In function `foo':\n
-#error:   \(\.text\+0x101c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1024\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x102c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1034\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x103c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1044\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x104c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1054\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x105c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x107c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1084\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x108c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1094\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x109c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10a4\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10ac\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10b4\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10bc\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10e4\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x10ec\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x10f4\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10fc\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10fc\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1104\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1104\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1114\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x111c\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1124\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x112c\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x112c\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1134\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1134\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x113c\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1144\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1144\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x114c\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x114c\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1154\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x115c\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x115c\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1164\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1164\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1174\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x117c\): Unsupported branch between ISA modes\Z
+#error:   \(\.text\+0x101c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1024\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x102c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1034\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x103c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1044\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x104c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1054\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x105c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x107c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1084\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x108c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1094\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x109c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10a4\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10ac\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10b4\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10bc\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10e4\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x10ec\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x10f4\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10fc\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10fc\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1104\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1104\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1114\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x111c\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1124\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x112c\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x112c\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1134\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1134\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x113c\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1144\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1144\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x114c\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x114c\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1154\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x115c\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x115c\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1164\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1164\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1174\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x117c\): unsupported branch between ISA modes\Z
diff --git a/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-2.d b/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-2.d
index d032705..2881be3 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-2.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-2.d
@@ -3,33 +3,33 @@ 
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000 --ignore-branch-isa
 #source: ../../../gas/testsuite/gas/mips/unaligned-branch-2.s
 #error: \A[^\n]*: In function `foo':\n
-#error:   \(\.text\+0x101c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1024\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x102c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1034\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x103c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1044\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x104c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1054\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x105c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x107c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1084\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x108c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1094\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x109c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10a4\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10ac\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10b4\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10bc\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10f4\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10fc\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1104\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1124\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x112c\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1134\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x113c\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1144\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x114c\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1154\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x115c\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1164\): Cannot convert a branch to JALX for a non-word-aligned address\Z
+#error:   \(\.text\+0x101c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1024\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x102c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1034\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x103c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1044\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x104c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1054\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x105c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x107c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1084\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x108c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1094\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x109c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10a4\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10ac\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10b4\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10bc\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10f4\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10fc\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1104\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1124\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x112c\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1134\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x113c\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1144\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x114c\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1154\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x115c\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1164\): cannot convert a branch to JALX for a non-word-aligned address\Z
diff --git a/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-micromips.d b/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-micromips.d
index 92cb3fa..21e2c3e 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-micromips.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-micromips.d
@@ -3,43 +3,43 @@ 
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000 --ignore-branch-isa
 #source: ../../../gas/testsuite/gas/mips/unaligned-branch-micromips-2.s
 #error: \A[^\n]*: In function `foo':\n
-#error:   \(\.text\+0x100a\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1012\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x101a\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x102a\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1032\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x103a\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1062\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1072\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1088\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x108e\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1094\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10a0\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10a6\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10ac\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10ca\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10d6\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10e8\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10ee\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10f4\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1100\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1106\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x110c\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x112a\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1136\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1146\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x114a\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x114e\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1156\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x115a\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x115e\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1172\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x117a\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1186\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x118a\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x118e\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1196\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x119a\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x119e\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x11b2\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x11ba\): Branch to a non-instruction-aligned address\Z
+#error:   \(\.text\+0x100a\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1012\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x101a\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x102a\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1032\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x103a\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1062\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1072\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1088\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x108e\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1094\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10a0\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10a6\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10ac\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10ca\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10d6\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10e8\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10ee\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10f4\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1100\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1106\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x110c\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x112a\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1136\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1146\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x114a\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x114e\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1156\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x115a\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x115e\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1172\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x117a\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1186\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x118a\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x118e\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1196\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x119a\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x119e\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x11b2\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x11ba\): branch to a non-instruction-aligned address\Z
diff --git a/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-mips16.d b/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-mips16.d
index 8981030..a2b62dd 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-mips16.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-mips16.d
@@ -3,19 +3,19 @@ 
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000 --ignore-branch-isa
 #source: ../../../gas/testsuite/gas/mips/unaligned-branch-mips16-2.s
 #error:   [^\n]*: In function `foo':\n
-#error:   \(\.text\+0x1008\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x100e\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1014\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1020\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1026\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x102c\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x104a\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1056\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1068\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x106e\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1074\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1080\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1086\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x108c\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10aa\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10b6\): Branch to a non-instruction-aligned address\Z
+#error:   \(\.text\+0x1008\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x100e\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1014\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1020\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1026\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x102c\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x104a\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1056\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1068\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x106e\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1074\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1080\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1086\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x108c\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10aa\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10b6\): branch to a non-instruction-aligned address\Z
diff --git a/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-r6-1.d b/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-r6-1.d
index af4d9f6..4a09001 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-r6-1.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-r6-1.d
@@ -3,37 +3,37 @@ 
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000 --ignore-branch-isa
 #source: ../../../gas/testsuite/gas/mips/unaligned-branch-r6-3.s
 #error: \A[^\n]*: In function `foo':\n
-#error:   \(\.text\+0x101c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1024\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x102c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1034\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x103c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1044\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x104c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1054\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x105c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x107c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1084\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x108c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1094\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x109c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10a4\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10ac\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10b4\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10bc\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10dc\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10e4\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10f4\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10fc\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1104\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x110c\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1114\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1124\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x112c\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1134\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x113c\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1144\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x114c\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1164\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x116c\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1174\): Cannot convert a branch to JALX for a non-word-aligned address\Z
+#error:   \(\.text\+0x101c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1024\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x102c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1034\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x103c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1044\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x104c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1054\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x105c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x107c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1084\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x108c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1094\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x109c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10a4\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10ac\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10b4\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10bc\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10dc\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10e4\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10f4\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10fc\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1104\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x110c\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1114\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1124\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x112c\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1134\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x113c\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1144\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x114c\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1164\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x116c\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1174\): cannot convert a branch to JALX for a non-word-aligned address\Z
diff --git a/ld/testsuite/ld-mips-elf/unaligned-branch-micromips.d b/ld/testsuite/ld-mips-elf/unaligned-branch-micromips.d
index f4929eb..2a1ae34 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-branch-micromips.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-branch-micromips.d
@@ -3,79 +3,79 @@ 
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000
 #source: ../../../gas/testsuite/gas/mips/unaligned-branch-micromips-2.s
 #error: \A[^\n]*: In function `foo':\n
-#error:   \(\.text\+0x100a\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1012\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x101a\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x102a\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1032\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x103a\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1062\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1072\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1082\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1088\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1088\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x108e\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x108e\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1094\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1094\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x109a\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x10a0\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10a0\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x10a6\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10a6\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x10ac\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10ac\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x10b2\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x10ca\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10d6\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10e2\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x10e8\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10e8\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x10ee\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10ee\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x10f4\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10f4\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x10fa\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1100\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1100\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1106\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1106\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x110c\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x110c\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1112\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x112a\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1136\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1142\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1146\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1146\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x114a\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x114a\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x114e\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x114e\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1152\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1156\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1156\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x115a\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x115a\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x115e\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x115e\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1162\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1172\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x117a\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1182\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1186\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1186\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x118a\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x118a\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x118e\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x118e\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1192\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1196\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1196\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x119a\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x119a\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x119e\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x119e\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x11a2\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x11b2\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x11ba\): Branch to a non-instruction-aligned address\Z
+#error:   \(\.text\+0x100a\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1012\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x101a\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x102a\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1032\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x103a\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1062\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1072\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1082\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1088\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1088\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x108e\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x108e\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1094\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1094\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x109a\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x10a0\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10a0\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x10a6\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10a6\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x10ac\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10ac\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x10b2\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x10ca\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10d6\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10e2\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x10e8\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10e8\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x10ee\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10ee\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x10f4\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10f4\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x10fa\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1100\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1100\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1106\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1106\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x110c\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x110c\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1112\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x112a\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1136\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1142\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1146\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1146\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x114a\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x114a\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x114e\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x114e\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1152\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1156\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1156\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x115a\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x115a\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x115e\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x115e\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1162\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1172\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x117a\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1182\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1186\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1186\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x118a\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x118a\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x118e\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x118e\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1192\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1196\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1196\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x119a\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x119a\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x119e\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x119e\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x11a2\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x11b2\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x11ba\): branch to a non-instruction-aligned address\Z
diff --git a/ld/testsuite/ld-mips-elf/unaligned-branch-mips16.d b/ld/testsuite/ld-mips-elf/unaligned-branch-mips16.d
index b2c113c..b9ec2a6 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-branch-mips16.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-branch-mips16.d
@@ -3,37 +3,37 @@ 
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000
 #source: ../../../gas/testsuite/gas/mips/unaligned-branch-mips16-2.s
 #error: \A[^\n]*: In function `foo':\n
-#error:   \(\.text\+0x1002\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1008\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1008\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x100e\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x100e\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1014\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1014\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x101a\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1020\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1020\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1026\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1026\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x102c\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x102c\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1032\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x104a\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1056\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1062\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1068\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1068\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x106e\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x106e\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1074\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1074\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x107a\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1080\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1080\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1086\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1086\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x108c\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x108c\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1092\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x10aa\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10b6\): Branch to a non-instruction-aligned address\Z
+#error:   \(\.text\+0x1002\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1008\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1008\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x100e\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x100e\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1014\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1014\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x101a\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1020\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1020\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1026\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1026\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x102c\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x102c\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1032\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x104a\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1056\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1062\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1068\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1068\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x106e\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x106e\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1074\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1074\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x107a\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1080\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1080\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1086\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1086\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x108c\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x108c\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1092\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x10aa\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10b6\): branch to a non-instruction-aligned address\Z
diff --git a/ld/testsuite/ld-mips-elf/unaligned-branch-r6-1.d b/ld/testsuite/ld-mips-elf/unaligned-branch-r6-1.d
index 07b41da..608e52c 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-branch-r6-1.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-branch-r6-1.d
@@ -3,58 +3,58 @@ 
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000
 #source: ../../../gas/testsuite/gas/mips/unaligned-branch-r6-3.s
 #error: \A[^\n]*: In function `foo':\n
-#error:   \(\.text\+0x101c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1024\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x102c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1034\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x103c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1044\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x104c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1054\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x105c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x107c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1084\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x108c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1094\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x109c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10a4\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10ac\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10b4\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10bc\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10dc\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10dc\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x10e4\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10e4\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x10ec\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x10f4\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10f4\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x10fc\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10fc\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1104\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1104\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x110c\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x110c\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1114\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1114\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x111c\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1124\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1124\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x112c\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x112c\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1134\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1134\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x113c\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x113c\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1144\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1144\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x114c\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x114c\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1154\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x115c\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1164\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1164\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x116c\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x116c\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x1174\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1174\): Unsupported branch between ISA modes\n
-#error:   \(\.text\+0x117c\): Unsupported branch between ISA modes\Z
+#error:   \(\.text\+0x101c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1024\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x102c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1034\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x103c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1044\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x104c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1054\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x105c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x107c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1084\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x108c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1094\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x109c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10a4\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10ac\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10b4\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10bc\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10dc\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10dc\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x10e4\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10e4\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x10ec\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x10f4\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10f4\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x10fc\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10fc\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1104\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1104\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x110c\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x110c\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1114\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1114\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x111c\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1124\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1124\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x112c\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x112c\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1134\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1134\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x113c\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x113c\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1144\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1144\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x114c\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x114c\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1154\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x115c\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1164\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1164\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x116c\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x116c\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x1174\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1174\): unsupported branch between ISA modes\n
+#error:   \(\.text\+0x117c\): unsupported branch between ISA modes\Z
diff --git a/ld/testsuite/ld-mips-elf/unaligned-branch-r6-2.d b/ld/testsuite/ld-mips-elf/unaligned-branch-r6-2.d
index e397a09..85da8ce 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-branch-r6-2.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-branch-r6-2.d
@@ -3,33 +3,33 @@ 
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000
 #source: ../../../gas/testsuite/gas/mips/unaligned-branch-r6-4.s
 #error: \A[^\n]*: In function `foo':\n
-#error:   \(\.text\+0x101c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1024\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x102c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1034\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x103c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1044\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x104c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1054\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x105c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x107c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1084\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x108c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1094\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x109c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10a4\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10ac\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10b4\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10bc\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10f4\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10fc\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1104\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1124\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x112c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1134\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x113c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1144\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x114c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1154\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x115c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1164\): Branch to a non-instruction-aligned address\Z
+#error:   \(\.text\+0x101c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1024\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x102c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1034\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x103c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1044\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x104c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1054\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x105c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x107c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1084\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x108c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1094\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x109c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10a4\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10ac\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10b4\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10bc\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10f4\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10fc\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1104\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1124\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x112c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1134\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x113c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1144\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x114c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1154\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x115c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1164\): branch to a non-instruction-aligned address\Z
diff --git a/ld/testsuite/ld-mips-elf/unaligned-branch.d b/ld/testsuite/ld-mips-elf/unaligned-branch.d
index 00e8ffe..95b3360 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-branch.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-branch.d
@@ -4,12 +4,12 @@ 
 #as: -EB -32 -mips32r6
 #ld: -EB -Ttext 0x10000000 -e 0x10000000
 #error: \A[^\n]*: In function `foo':\n
-#error:   \(\.text\+0x14\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x24\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x28\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x30\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x38\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x3c\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x44\): Branch to a non-instruction-aligned address\n
-#error:   \(\.text\+0x4c\): Branch to a non-instruction-aligned address\Z
+#error:   \(\.text\+0x14\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x24\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x28\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x30\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x38\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x3c\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x44\): branch to a non-instruction-aligned address\n
+#error:   \(\.text\+0x4c\): branch to a non-instruction-aligned address\Z
diff --git a/ld/testsuite/ld-mips-elf/unaligned-jalx-1.d b/ld/testsuite/ld-mips-elf/unaligned-jalx-1.d
index a842cfc..d70cf4c 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-jalx-1.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-jalx-1.d
@@ -4,4 +4,4 @@ 
 #as: -EB -32
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000
 #error: \A[^\n]*: In function `foo':\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\Z
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\Z
diff --git a/ld/testsuite/ld-mips-elf/unaligned-jalx-3.d b/ld/testsuite/ld-mips-elf/unaligned-jalx-3.d
index d64e42f..fb558b7 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-jalx-3.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-jalx-3.d
@@ -4,4 +4,4 @@ 
 #as: -EB -32
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000
 #error: \A[^\n]*: In function `foo':\n
-#error:   \(\.text\+0x0\): Cannot convert a branch to JALX for a non-word-aligned address\Z
+#error:   \(\.text\+0x0\): cannot convert a branch to JALX for a non-word-aligned address\Z
diff --git a/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-1.d b/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-1.d
index 2b21cd6..a80c871 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-1.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-1.d
@@ -4,15 +4,15 @@ 
 #as: -EB -n32 -march=from-abi
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000
 #error: \A[^\n]*: In function `foo':\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\Z
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\Z
diff --git a/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-3.d b/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-3.d
index 04d4045..8f96c8f 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-3.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-3.d
@@ -4,15 +4,15 @@ 
 #as: -EB -n32 -march=from-abi
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000
 #error: \A[^\n]*: In function `foo':\n
-#error:   \(\.text\+0x0\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x8\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x18\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x20\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x28\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x30\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x38\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x40\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x48\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x50\): Cannot convert a branch to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x58\): Cannot convert a branch to JALX for a non-word-aligned address\Z
+#error:   \(\.text\+0x0\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x8\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x18\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x20\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x28\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x30\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x38\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x40\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x48\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x50\): cannot convert a branch to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x58\): cannot convert a branch to JALX for a non-word-aligned address\Z
diff --git a/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-micromips-1.d b/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-micromips-1.d
index 33473f8..8e11706 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-micromips-1.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-micromips-1.d
@@ -5,15 +5,15 @@ 
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 #error: \A[^\n]*: In function `foo':\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\Z
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\Z
diff --git a/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-mips16-1.d b/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-mips16-1.d
index dd2ff3b..eec4cc1 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-mips16-1.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-mips16-1.d
@@ -5,15 +5,15 @@ 
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 #error: \A[^\n]*: In function `foo':\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\Z
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\Z
diff --git a/ld/testsuite/ld-mips-elf/unaligned-jalx-micromips-1.d b/ld/testsuite/ld-mips-elf/unaligned-jalx-micromips-1.d
index 7143c05..d63d92c 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-jalx-micromips-1.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-jalx-micromips-1.d
@@ -4,4 +4,4 @@ 
 #as: -EB -32
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000
 #error: \A[^\n]*: In function `foo':\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\Z
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\Z
diff --git a/ld/testsuite/ld-mips-elf/unaligned-jalx-mips16-1.d b/ld/testsuite/ld-mips-elf/unaligned-jalx-mips16-1.d
index 07d5568..cc8ec6a 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-jalx-mips16-1.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-jalx-mips16-1.d
@@ -4,4 +4,4 @@ 
 #as: -EB -32
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000
 #error: \A[^\n]*: In function `foo':\n
-#error:   \(\.text\+0x[0-9a-f]+\): Cannot convert a jump to JALX for a non-word-aligned address\Z
+#error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\Z
diff --git a/ld/testsuite/ld-mips-elf/unaligned-jump-micromips.d b/ld/testsuite/ld-mips-elf/unaligned-jump-micromips.d
index 17c609a..1723b9c 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-jump-micromips.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-jump-micromips.d
@@ -3,60 +3,60 @@ 
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000
 #source: ../../../gas/testsuite/gas/mips/unaligned-jump-micromips-2.s
 #error: \A[^\n]*: In function `foo':\n
-#error:   \(\.text\+0x1012\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x1018\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x101e\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1026\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x102e\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x102e\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x1034\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1034\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x103a\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1042\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x104a\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x104a\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x1050\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1050\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x1056\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x105e\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1066\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1066\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x106c\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x106c\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x1082\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x1088\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x108e\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1096\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x109e\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x109e\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x10a4\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10a4\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x10aa\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10b2\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10ba\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10ba\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x10c0\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10c0\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x10c6\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10ce\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10d6\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10d6\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x10dc\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10dc\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x10f2\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x10f8\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x10fe\): Unsupported JALX to the same ISA mode\n
-#error:   \(\.text\+0x111a\): Unsupported JALX to the same ISA mode\n
-#error:   \(\.text\+0x1136\): Unsupported JALX to the same ISA mode\n
-#error:   \(\.text\+0x1152\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1152\): Unsupported JALX to the same ISA mode\n
-#error:   \(\.text\+0x115a\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1162\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1168\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x116e\): Unsupported JALX to the same ISA mode\n
-#error:   \(\.text\+0x118a\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x118a\): Unsupported JALX to the same ISA mode\n
-#error:   \(\.text\+0x1192\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x119a\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x11a0\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x11a6\): Unsupported JALX to the same ISA mode\Z
+#error:   \(\.text\+0x1012\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x1018\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x101e\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1026\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x102e\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x102e\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x1034\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1034\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x103a\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1042\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x104a\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x104a\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x1050\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1050\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x1056\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x105e\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1066\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1066\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x106c\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x106c\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x1082\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x1088\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x108e\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1096\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x109e\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x109e\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x10a4\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10a4\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x10aa\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10b2\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10ba\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10ba\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x10c0\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10c0\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x10c6\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10ce\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10d6\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10d6\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x10dc\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10dc\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x10f2\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x10f8\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x10fe\): unsupported JALX to the same ISA mode\n
+#error:   \(\.text\+0x111a\): unsupported JALX to the same ISA mode\n
+#error:   \(\.text\+0x1136\): unsupported JALX to the same ISA mode\n
+#error:   \(\.text\+0x1152\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1152\): unsupported JALX to the same ISA mode\n
+#error:   \(\.text\+0x115a\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1162\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1168\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x116e\): unsupported JALX to the same ISA mode\n
+#error:   \(\.text\+0x118a\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x118a\): unsupported JALX to the same ISA mode\n
+#error:   \(\.text\+0x1192\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x119a\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x11a0\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x11a6\): unsupported JALX to the same ISA mode\Z
diff --git a/ld/testsuite/ld-mips-elf/unaligned-jump-mips16.d b/ld/testsuite/ld-mips-elf/unaligned-jump-mips16.d
index faafb57..38b56a2 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-jump-mips16.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-jump-mips16.d
@@ -3,30 +3,30 @@ 
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000
 #source: ../../../gas/testsuite/gas/mips/unaligned-jump-mips16-2.s
 #error: \A[^\n]*: In function `foo':\n
-#error:   \(\.text\+0x100e\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1014\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x101a\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1020\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1026\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x102c\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x103e\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1044\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x104a\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1050\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1056\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x105c\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x106e\): Unsupported JALX to the same ISA mode\n
-#error:   \(\.text\+0x107a\): Jump to a non-word-aligned address\n
-#error:   \(\.text\+0x107a\): Unsupported JALX to the same ISA mode\n
-#error:   \(\.text\+0x1080\): Jump to a non-word-aligned address\n
-#error:   \(\.text\+0x1086\): Unsupported JALX to the same ISA mode\n
-#error:   \(\.text\+0x1092\): Jump to a non-word-aligned address\n
-#error:   \(\.text\+0x1092\): Unsupported JALX to the same ISA mode\n
-#error:   \(\.text\+0x1098\): Jump to a non-word-aligned address\n
-#error:   \(\.text\+0x109e\): Jump to a non-word-aligned address\n
-#error:   \(\.text\+0x109e\): Unsupported JALX to the same ISA mode\n
-#error:   \(\.text\+0x10a4\): Jump to a non-word-aligned address\n
-#error:   \(\.text\+0x10aa\): Jump to a non-word-aligned address\n
-#error:   \(\.text\+0x10aa\): Unsupported JALX to the same ISA mode\n
-#error:   \(\.text\+0x10b0\): Jump to a non-word-aligned address\n
-#error:   \(\.text\+0x10b6\): Unsupported JALX to the same ISA mode\Z
+#error:   \(\.text\+0x100e\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1014\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x101a\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1020\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1026\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x102c\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x103e\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1044\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x104a\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1050\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1056\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x105c\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x106e\): unsupported JALX to the same ISA mode\n
+#error:   \(\.text\+0x107a\): jump to a non-word-aligned address\n
+#error:   \(\.text\+0x107a\): unsupported JALX to the same ISA mode\n
+#error:   \(\.text\+0x1080\): jump to a non-word-aligned address\n
+#error:   \(\.text\+0x1086\): unsupported JALX to the same ISA mode\n
+#error:   \(\.text\+0x1092\): jump to a non-word-aligned address\n
+#error:   \(\.text\+0x1092\): unsupported JALX to the same ISA mode\n
+#error:   \(\.text\+0x1098\): jump to a non-word-aligned address\n
+#error:   \(\.text\+0x109e\): jump to a non-word-aligned address\n
+#error:   \(\.text\+0x109e\): unsupported JALX to the same ISA mode\n
+#error:   \(\.text\+0x10a4\): jump to a non-word-aligned address\n
+#error:   \(\.text\+0x10aa\): jump to a non-word-aligned address\n
+#error:   \(\.text\+0x10aa\): unsupported JALX to the same ISA mode\n
+#error:   \(\.text\+0x10b0\): jump to a non-word-aligned address\n
+#error:   \(\.text\+0x10b6\): unsupported JALX to the same ISA mode\Z
diff --git a/ld/testsuite/ld-mips-elf/unaligned-jump.d b/ld/testsuite/ld-mips-elf/unaligned-jump.d
index 845f73d..2518457 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-jump.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-jump.d
@@ -3,49 +3,49 @@ 
 #ld: -EB -Ttext 0x1c000000 -e 0x1c000000
 #source: ../../../gas/testsuite/gas/mips/unaligned-jump-2.s
 #error: \A[^\n]*: In function `foo':\n
-#error:   \(\.text\+0x1004\): Unsupported JALX to the same ISA mode\n
-#error:   \(\.text\+0x101c\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x101c\): Unsupported JALX to the same ISA mode\n
-#error:   \(\.text\+0x1024\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x102c\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1034\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1034\): Unsupported JALX to the same ISA mode\n
-#error:   \(\.text\+0x103c\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1044\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x104c\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x104c\): Unsupported JALX to the same ISA mode\n
-#error:   \(\.text\+0x1054\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x105c\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1064\): Unsupported JALX to the same ISA mode\n
-#error:   \(\.text\+0x107c\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x107c\): Unsupported JALX to the same ISA mode\n
-#error:   \(\.text\+0x1084\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x108c\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1094\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x1094\): Unsupported JALX to the same ISA mode\n
-#error:   \(\.text\+0x109c\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10a4\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10ac\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10ac\): Unsupported JALX to the same ISA mode\n
-#error:   \(\.text\+0x10b4\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10bc\): Jump to a non-instruction-aligned address\n
-#error:   \(\.text\+0x10c4\): Unsupported JALX to the same ISA mode\n
-#error:   \(\.text\+0x10ec\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x10f4\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x10fc\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1104\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1104\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x111c\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x1124\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x112c\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1134\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1134\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x113c\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1144\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x114c\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x114c\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x1154\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x115c\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1164\): Cannot convert a jump to JALX for a non-word-aligned address\n
-#error:   \(\.text\+0x1164\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
-#error:   \(\.text\+0x117c\): Unsupported jump between ISA modes; consider recompiling with interlinking enabled\Z
+#error:   \(\.text\+0x1004\): unsupported JALX to the same ISA mode\n
+#error:   \(\.text\+0x101c\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x101c\): unsupported JALX to the same ISA mode\n
+#error:   \(\.text\+0x1024\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x102c\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1034\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1034\): unsupported JALX to the same ISA mode\n
+#error:   \(\.text\+0x103c\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1044\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x104c\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x104c\): unsupported JALX to the same ISA mode\n
+#error:   \(\.text\+0x1054\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x105c\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1064\): unsupported JALX to the same ISA mode\n
+#error:   \(\.text\+0x107c\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x107c\): unsupported JALX to the same ISA mode\n
+#error:   \(\.text\+0x1084\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x108c\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1094\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x1094\): unsupported JALX to the same ISA mode\n
+#error:   \(\.text\+0x109c\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10a4\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10ac\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10ac\): unsupported JALX to the same ISA mode\n
+#error:   \(\.text\+0x10b4\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10bc\): jump to a non-instruction-aligned address\n
+#error:   \(\.text\+0x10c4\): unsupported JALX to the same ISA mode\n
+#error:   \(\.text\+0x10ec\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x10f4\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x10fc\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1104\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1104\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x111c\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x1124\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x112c\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1134\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1134\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x113c\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1144\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x114c\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x114c\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x1154\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x115c\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1164\): cannot convert a jump to JALX for a non-word-aligned address\n
+#error:   \(\.text\+0x1164\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
+#error:   \(\.text\+0x117c\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\Z