From: Adam Nemet <anemet@caviumnetworks.com>
Date: Thu, 3 Sep 2009 18:31:00 +0000 (+0000)
Subject: 	* elfxx-mips.c (mips_elf_calculate_relocation): Don't relocate
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5bbc5ae7bb145ad8ccaa57c02646a7557e67c1bf;p=binutils-gdb.git

	* 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 94dc04912d5..39987cdcd2a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index cece0bc7070..3a1c8ba9bf7 100644
--- 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;