From 5708b154dedeb9064b28979c0ca36a9c9b9833ac Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Mon, 24 Sep 2012 12:24:44 +0000 Subject: [PATCH] bfd/ 2012-09-20 Walter Lee * elf32-tilepro.c (tilepro_elf_relocate_section): Adjust got relocations with value of hgot. * elfxx-tilegx.c (tilegx_elf_relocate_section): Ditto. --- bfd/ChangeLog | 6 ++++++ bfd/elf32-tilepro.c | 10 ++++++++-- bfd/elfxx-tilegx.c | 10 ++++++++-- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 0309325f0fe..b542abd106d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2012-09-20 Walter Lee + + * elf32-tilepro.c (tilepro_elf_relocate_section): Adjust got + relocations with value of hgot. + * elfxx-tilegx.c (tilegx_elf_relocate_section): Ditto. + 2012-09-18 H.J. Lu PR ld/14591 diff --git a/bfd/elf32-tilepro.c b/bfd/elf32-tilepro.c index 3d5a09e8fe7..9dff9e52838 100644 --- 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 425f9d88683..df63569ed3e 100644 --- a/bfd/elfxx-tilegx.c +++ b/bfd/elfxx-tilegx.c @@ -3051,6 +3051,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; @@ -3062,6 +3063,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; @@ -3430,7 +3436,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: @@ -3863,7 +3869,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; -- 2.47.3