* elfxx-mips.c (mips_elf_calculate_relocation): Don't report an

	overflow for calls to undefined weak symbols.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f61fd22..e0d5f86 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-14  Richard Sandiford  <rsandifo@redhat.com>
+
+       * elfxx-mips.c (mips_elf_calculate_relocation): Don't report an
+       overflow for calls to undefined weak symbols.
+
 2004-12-11  Alan Modra  <amodra@bigpond.net.au>
 
        * elfcode.h (elf_slurp_symbol_table): Use bfd_elf_sym_name so that

diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index ef4650b..9ec9c86 100644 (file)
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -3352,7 +3352,8 @@ mips_elf_calculate_relocation (bfd *abfd, bfd *input_bfd,
       else
        {
          value = (_bfd_mips_elf_sign_extend (addend, 28) + symbol) >> 2;
-         overflowed_p = (value >> 26) != ((p + 4) >> 28);
+         if (h->root.root.type != bfd_link_hash_undefweak)
+           overflowed_p = (value >> 26) != ((p + 4) >> 28);
        }
       value &= howto->dst_mask;
       break;

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 14a6fa1..cbf50fc 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-14  Richard Sandiford  <rsandifo@redhat.com>
+
+       * ld-mips-elf/jal-overflow-2.[sd]: New test.
+       * ld-mips-elf/mips-elf.exp: Run it.
+
 2004-12-13  Richard Sandiford  <rsandifo@redhat.com>
 
        * ld-mips-elf/mips-elf.exp: Only run jalbal if n32 is supported.

diff --git a/ld/testsuite/ld-mips-elf/jaloverflow-2.d b/ld/testsuite/ld-mips-elf/jaloverflow-2.d
new file mode 100644 (file)
index 0000000..b28b4ed
--- /dev/null
+++ b/ld/testsuite/ld-mips-elf/jaloverflow-2.d
@@ -0,0 +1,8 @@
+#name: JAL overflow 2
+#source: jaloverflow-2.s
+#as:
+#ld: -Ttext=0x10000000 -e start
+#objdump: -dr
+#...
+0*10000000:    0c000000.*
+#pass

diff --git a/ld/testsuite/ld-mips-elf/jaloverflow-2.s b/ld/testsuite/ld-mips-elf/jaloverflow-2.s
new file mode 100644 (file)
index 0000000..71acf29
--- /dev/null
+++ b/ld/testsuite/ld-mips-elf/jaloverflow-2.s
@@ -0,0 +1,7 @@
+# jal relocs against undefined weak symbols should not be treated as
+# overflowing
+
+       .globl  start
+       .weak   foo
+start:
+       jal     foo

diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp
index 36e29c5..63fe3f0 100644 (file)
--- a/ld/testsuite/ld-mips-elf/mips-elf.exp
+++ b/ld/testsuite/ld-mips-elf/mips-elf.exp
@@ -81,6 +81,7 @@ if {$has_newabi && $linux_gnu} {
 }
 
 run_dump_test "jaloverflow"
+run_dump_test "jaloverflow-2"
 if {$has_newabi} {
     run_dump_test "jalbal"
 }