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

	R_MIPS_JALR unless symbol resolves locally.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 94dc049..39987cd 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,10 @@
 2009-09-03  Adam Nemet  <anemet@caviumnetworks.com>
 
+       * elfxx-mips.c (mips_elf_calculate_relocation): Don't relocate
+       R_MIPS_JALR unless symbol resolves locally.
+
+2009-09-03  Adam Nemet  <anemet@caviumnetworks.com>
+
        * elfxx-mips.c (_bfd_mips_elf_check_relocs): Don't set
        has_static_relocs for R_MIPS_JALR.
 

diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index cece0bc..3a1c8ba 100644 (file)
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -5489,8 +5489,8 @@ mips_elf_calculate_relocation (bfd *abfd, bfd *input_bfd,
     case R_MIPS_JALR:
       /* This relocation is only a hint.  In some cases, we optimize
         it into a bal instruction.  But we don't try to optimize
-        branches to the PLT; that will wind up wasting time.  */
-      if (h != NULL && h->root.plt.offset != (bfd_vma) -1)
+        when the symbol does not resolve locally.  */
+      if (h != NULL && !SYMBOL_CALLS_LOCAL (info, &h->root))
        return bfd_reloc_continue;
       value = symbol + addend;
       break;