From: Catherine Moore <clm@redhat.com>
Date: Mon, 9 Aug 2010 19:54:13 +0000 (+0000)
Subject: 2010-08-09  Catherine Moore  <clm@codesourcery.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=776167e8fa07df96f999a0593f1dc536c80bc1cb;p=binutils-gdb.git

2010-08-09  Catherine Moore  <clm@codesourcery.com>

        * elfxx-mips.c (mips_elf_perform_relocation): Improve
        interlinking error message.

2010-08-09  Catherine Moore  <clm@codesourcery.com>

        * ld-mips-elf/mode-change-error-1.d: New.
        * ld-mips-elf/mode-change-error-1a.s: New.
        * ld-mips-elf/mode-change-error-1b.s: New.
        * ld-mips-elf/mips-elf.exp: Run new test.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e79fa19f891..c1c9054c950 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-09  Catherine Moore  <clm@codesourcery.com>
+
+	* elfxx-mips.c (mips_elf_perform_relocation): Improve
+	interlinking error message.
+
 2010-08-06  Alan Modra  <amodra@gmail.com>
 
 	* elf64-ppc.c (ha_reloc_match): Allow matches to other than r2.
diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index 7b89a83c615..e9a9c27e100 100644
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -5641,7 +5641,7 @@ mips_elf_perform_relocation (struct bfd_link_info *info,
       if (!ok)
 	{
 	  (*_bfd_error_handler)
-	    (_("%B: %A+0x%lx: jump to stub routine which is not jal"),
+	    (_("%B: %A+0x%lx: Direct jumps between ISA modes are not allowed; 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 f5b05fa3cc1..b5250a5e71e 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-09  Catherine Moore  <clm@codesourcery.com>
+
+	* ld-mips-elf/mode-change-error-1.d: New.
+	* ld-mips-elf/mode-change-error-1a.s: New.
+	* ld-mips-elf/mode-change-error-1b.s: New.
+	* ld-mips-elf/mips-elf.exp: Run new test.
+
 2010-08-06  Alan Modra  <amodra@gmail.com>
 
 	* ld-powerpc/tocopt.s, * ld-powerpc/tocopt.d: New test.
diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp
index 7b1a57b7619..6c283e206b1 100644
--- a/ld/testsuite/ld-mips-elf/mips-elf.exp
+++ b/ld/testsuite/ld-mips-elf/mips-elf.exp
@@ -322,6 +322,8 @@ if {$has_newabi} {
     run_dump_test "jalbal"
 }
 
+run_dump_test "mode-change-error-1"
+
 run_dump_test "mips16-hilo"
 if {$has_newabi} {
     run_dump_test "mips16-hilo-n32"
diff --git a/ld/testsuite/ld-mips-elf/mode-change-error-1.d b/ld/testsuite/ld-mips-elf/mode-change-error-1.d
new file mode 100644
index 00000000000..55e9027b783
--- /dev/null
+++ b/ld/testsuite/ld-mips-elf/mode-change-error-1.d
@@ -0,0 +1,5 @@
+#name: Mode Change Error 1
+#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.
diff --git a/ld/testsuite/ld-mips-elf/mode-change-error-1a.s b/ld/testsuite/ld-mips-elf/mode-change-error-1a.s
new file mode 100644
index 00000000000..44bdb1f7229
--- /dev/null
+++ b/ld/testsuite/ld-mips-elf/mode-change-error-1a.s
@@ -0,0 +1,17 @@
+	.option	pic0
+	.text
+	.align	4
+	.globl	main
+	.set	nomips16
+	.ent	main
+	.type	main, @function
+main:
+	.mask	0x80000000,-4
+	.fmask	0x00000000,0
+	.set	noreorder
+	
+	j	doit
+	nop
+
+	.end	main
+	.size	main, .-main
diff --git a/ld/testsuite/ld-mips-elf/mode-change-error-1b.s b/ld/testsuite/ld-mips-elf/mode-change-error-1b.s
new file mode 100644
index 00000000000..84e15d60e6f
--- /dev/null
+++ b/ld/testsuite/ld-mips-elf/mode-change-error-1b.s
@@ -0,0 +1,18 @@
+	.text
+	.align	4
+	.globl	doit
+	.set	mips16
+	.ent	doit
+	.type	doit, @function
+doit:
+	.frame	$sp,0,$31
+	.mask	0x00000000,0
+	.fmask	0x00000000,0
+	sll	$2,$4,1
+	sll	$4,$4,3
+	.set	noreorder
+	.set	nomacro
+	j	$31
+	addu	$2,$2,$4
+	.end	doit
+	.size	doit, .-doit