bfd/

	* elfxx-mips.c (mips_elf_perform_relocation): Update the
	cross-mode jump message.

	ld/testsuite/
	* ld-mips-elf/mode-change-error-1.d: Update the error message.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 0fcfdb1ad41612cdf546221b814e3c28705ffb41..9eb776ea5d262b7d17f2a5223471a45ab3f4932d 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-03  Maciej W. Rozycki  <macro@codesourcery.com>
+
+       * elfxx-mips.c (mips_elf_perform_relocation): Update the
+       cross-mode jump message.
+
 2012-08-03  Maciej W. Rozycki  <macro@codesourcery.com>
 
        * elfxx-mips.c (_bfd_mips_elf_size_dynamic_sections): Update the

diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index cf1baa865e414a1187d8152e3299a10dfb6e4eb3..82743acdd6d65cdce22efbd01110d595d7af132a 100644 (file)
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -5930,11 +5930,12 @@ mips_elf_perform_relocation (struct bfd_link_info *info,
          jalx_opcode = 0x1d;
        }
 
-      /* If the opcode is not JAL or JALX, there's a problem.  */
+      /* If the opcode is not JAL or JALX, there's a problem.  We cannot
+         convert J or JALS to JALX.  */
       if (!ok)
        {
          (*_bfd_error_handler)
-           (_("%B: %A+0x%lx: Direct jumps between ISA modes are not allowed; consider recompiling with interlinking enabled."),
+           (_("%B: %A+0x%lx: Unsupported jump between ISA modes; consider recompiling with interlinking enabled."),
             input_bfd,
             input_section,
             (unsigned long) relocation->r_offset);

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 685863a98f23dc21658e1c57f82cacc6ffadc0ae..3811b14eb23f7ae629296b4cfae187eeff8d53be 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-03  Maciej W. Rozycki  <macro@codesourcery.com>
+
+       * ld-mips-elf/mode-change-error-1.d: Update the error message.
+
 2012-08-02  Maciej W. Rozycki  <macro@codesourcery.com>
 
        * ld-mips-elf/got-vers-1.rd: Fix a typo.

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 55e9027b783ce6e1020d87c15dfedc82d87da3ce..885c62809dcd1ae7d008b13e0d9ec5ed5b0425e5 100644 (file)
--- a/ld/testsuite/ld-mips-elf/mode-change-error-1.d
+++ b/ld/testsuite/ld-mips-elf/mode-change-error-1.d
@@ -2,4 +2,4 @@
 #source: mode-change-error-1a.s
 #source: mode-change-error-1b.s
 #ld: -e 0x8000000
-#error: .*: Direct jumps between ISA modes are not allowed; consider recompiling with interlinking enabled.
+#error: .*: Unsupported jump between ISA modes; consider recompiling with interlinking enabled.