* elf64-mips.c (mips16_gprel_reloc): Update a comment.

* elfn32-mips.c (mips16_gprel_reloc): Keep R_MIPS16_GPREL
relocations against external symbols unchanged.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index bc6b5852d951cb298c51e338a875166e2a3d080e..889411f52326884fce9c3bbcb6503c7cc33f3577 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-10  Maciej W. Rozycki  <macro@mips.com>
+
+       * elf64-mips.c (mips16_gprel_reloc): Update a comment.
+       * elfn32-mips.c (mips16_gprel_reloc): Keep R_MIPS16_GPREL
+       relocations against external symbols unchanged.
+
 2005-02-08  Paul Brook  <paul@codesourcery.com>
 
        * elflink.c (elf_link_input_bfd): Ignore symbols from null input

diff --git a/bfd/elf64-mips.c b/bfd/elf64-mips.c
index ce37ad2148d4705c3ae6cf69f3276abd8e5d11e3..74ec7cbc478a7462ed2a4818c651f19b5834c974 100644 (file)
--- a/bfd/elf64-mips.c
+++ b/bfd/elf64-mips.c
@@ -1709,8 +1709,8 @@ mips16_gprel_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
   bfd_signed_vma val;
   bfd_vma relocation;
 
-  /* If we're relocating, and this is an external symbol with no
-     addend, we don't want to change anything.  */
+  /* If we're relocating, and this is an external symbol, we don't want
+     to change anything.  */
   if (output_bfd != NULL
       && (symbol->flags & BSF_SECTION_SYM) == 0
       && (symbol->flags & BSF_LOCAL) != 0)

diff --git a/bfd/elfn32-mips.c b/bfd/elfn32-mips.c
index 48c2579bef0c3b06f0eff69ff2824f98e25a74fe..d87c45c076dccca1e90007cac1af246a725ef2ff 100644 (file)
--- a/bfd/elfn32-mips.c
+++ b/bfd/elfn32-mips.c
@@ -1507,6 +1507,16 @@ mips16_gprel_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
   bfd_signed_vma val;
   bfd_vma relocation;
 
+  /* If we're relocating, and this is an external symbol, we don't want
+     to change anything.  */
+  if (output_bfd != NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (symbol->flags & BSF_LOCAL) != 0)
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
   if (output_bfd != NULL)
     relocatable = TRUE;
   else