bfd/

2012-09-17  Walter Lee  <walt@tilera.com>

	* elf32-tilepro.c (tilepro_elf_relocate_section): Fix computation
	of got relocations for when .got.plt section is merged with .got.
	* elfxx-tilegx.c (tilegx_elf_relocate_section): Ditto.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 0f668e5394fe7c34e3e5bb317a4cf5ec37298996..2f4cab2ff4267c23d0e43321dc6280501c395664 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-17  Walter Lee  <walt@tilera.com>
+
+       * elf32-tilepro.c (tilepro_elf_relocate_section): Fix computation
+       of got relocations for when .got.plt section is merged with .got.
+       * elfxx-tilegx.c (tilegx_elf_relocate_section): Ditto.
+
 2012-09-13  Doug Kwan  <dougkwan@google.com>
 
        * elf64-ppc.c (ppc64_elf_relocate_section): Use pre-adjusted

diff --git a/bfd/elf32-tilepro.c b/bfd/elf32-tilepro.c
index fa883e19d69a2acb55de4b763d84081d69646aa6..d653c36c503bee3f98dbb378437d3e734f0a48a8 100644 (file)
--- a/bfd/elf32-tilepro.c
+++ b/bfd/elf32-tilepro.c
@@ -3092,7 +3092,7 @@ tilepro_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                  local_got_offsets[r_symndx] |= 1;
                }
            }
-         relocation = htab->elf.sgot->output_offset + off - got_base;
+         relocation = off;
          break;
 
         case R_TILEPRO_JOFFLONG_X1_PLT:
@@ -3511,7 +3511,7 @@ tilepro_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
          if (off >= (bfd_vma) -2)
            abort ();
 
-         relocation = htab->elf.sgot->output_offset + off - got_base;
+         relocation = off;
          unresolved_reloc = FALSE;
          howto = tilepro_elf_howto_table + r_type;
          break;

diff --git a/bfd/elfxx-tilegx.c b/bfd/elfxx-tilegx.c
index 6f748ece7f09a477f23315f3757782f25b984090..ac4ff816eddc4c313dd3dc9c08392a36f5d23482 100644 (file)
--- a/bfd/elfxx-tilegx.c
+++ b/bfd/elfxx-tilegx.c
@@ -3436,7 +3436,7 @@ tilegx_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                  local_got_offsets[r_symndx] |= 1;
                }
            }
-         relocation = htab->elf.sgot->output_offset + off - got_base;
+         relocation = off;
          break;
 
         case R_TILEGX_JUMPOFF_X1_PLT:
@@ -3869,7 +3869,7 @@ tilegx_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
          if (off >= (bfd_vma) -2)
            abort ();
 
-         relocation = htab->elf.sgot->output_offset + off - got_base;
+         relocation = off;
          unresolved_reloc = FALSE;
          howto = tilegx_elf_howto_table + r_type;
          break;