Fix computation of got relocations for .got sections greater than

0x8000 bytes.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index aeb095176235b4bbcc82544618c20a27b8796615..4c3e181cb4ef0e58b6f1a0f8b99e4eaec7320bce 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-20  Walter Lee  <walt@tilera.com>
+
+       * elf32-tilepro.c (tilepro_elf_relocate_section): Adjust got
+       relocations with value of hgot.
+       * elfxx-tilegx.c (tilegx_elf_relocate_section): Ditto.
+
 2012-09-19  Steve Ellcey  <sellcey@mips.com>
 
        * config.bfd: Add mips*-mti-elf* target.

diff --git a/bfd/elf32-tilepro.c b/bfd/elf32-tilepro.c
index 90fdacea9bbb6815c8229f7caaafc7b116d49e8c..1c6e3d31555dd650d7db05ac15dc2ebb55820b0a 100644 (file)
--- a/bfd/elf32-tilepro.c
+++ b/bfd/elf32-tilepro.c
@@ -2785,6 +2785,7 @@ tilepro_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
   Elf_Internal_Shdr *symtab_hdr;
   struct elf_link_hash_entry **sym_hashes;
   bfd_vma *local_got_offsets;
+  bfd_vma got_base;
   asection *sreloc;
   Elf_Internal_Rela *rel;
   Elf_Internal_Rela *relend;
@@ -2796,6 +2797,11 @@ tilepro_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
   sym_hashes = elf_sym_hashes (input_bfd);
   local_got_offsets = elf_local_got_offsets (input_bfd);
 
+  if (elf_hash_table (info)->hgot == NULL)
+    got_base = 0;
+  else
+    got_base = elf_hash_table (info)->hgot->root.u.def.value;
+
   sreloc = elf_section_data (input_section)->sreloc;
 
   rel = relocs;
@@ -3086,7 +3092,7 @@ tilepro_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                  local_got_offsets[r_symndx] |= 1;
                }
            }
-         relocation = off;
+         relocation = off - got_base;
          break;
 
         case R_TILEPRO_JOFFLONG_X1_PLT:
@@ -3505,7 +3511,7 @@ tilepro_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
          if (off >= (bfd_vma) -2)
            abort ();
 
-         relocation = off;
+         relocation = off - got_base;
          unresolved_reloc = FALSE;
          howto = tilepro_elf_howto_table + r_type;
          break;

diff --git a/bfd/elfxx-tilegx.c b/bfd/elfxx-tilegx.c
index e22188b76926a4df3dd1e2025b4bc105efcd90f2..c1b54f9994f9f80d5432f80b2da7b229bea5ed77 100644 (file)
--- a/bfd/elfxx-tilegx.c
+++ b/bfd/elfxx-tilegx.c
@@ -3094,6 +3094,7 @@ tilegx_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
   Elf_Internal_Shdr *symtab_hdr;
   struct elf_link_hash_entry **sym_hashes;
   bfd_vma *local_got_offsets;
+  bfd_vma got_base;
   asection *sreloc;
   Elf_Internal_Rela *rel;
   Elf_Internal_Rela *relend;
@@ -3105,6 +3106,11 @@ tilegx_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
   sym_hashes = elf_sym_hashes (input_bfd);
   local_got_offsets = elf_local_got_offsets (input_bfd);
 
+  if (elf_hash_table (info)->hgot == NULL)
+    got_base = 0;
+  else
+    got_base = elf_hash_table (info)->hgot->root.u.def.value;
+
   sreloc = elf_section_data (input_section)->sreloc;
 
   rel = relocs;
@@ -3473,7 +3479,7 @@ tilegx_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                  local_got_offsets[r_symndx] |= 1;
                }
            }
-         relocation = off;
+         relocation = off - got_base;
          break;
 
         case R_TILEGX_JUMPOFF_X1_PLT:
@@ -3920,7 +3926,7 @@ tilegx_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
          if (off >= (bfd_vma) -2)
            abort ();
 
-         relocation = off;
+         relocation = off - got_base;
          unresolved_reloc = FALSE;
          howto = tilegx_elf_howto_table + r_type;
          break;