From c366c25e10407f3fe6bc2fc73927fe993ee979e8 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 8 Aug 2002 21:38:27 +0000 Subject: [PATCH] * elf32-i386.c (elf_i386_relocate_section): Fill in proper addend for R_386_TLS_TPOFF32 relocs against symndx 0. --- bfd/ChangeLog | 5 +++++ bfd/elf32-i386.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 40a824e683e..f597f9cc311 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2002-08-08 Jakub Jelinek + + * elf32-i386.c (elf_i386_relocate_section): Fill in proper addend + for R_386_TLS_TPOFF32 relocs against symndx 0. + 2002-08-07 H.J. Lu * elflink.h (NAME(bfd_elf,size_dynamic_sections)): Check symbol diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index 997bf372270..5c0d5a1ceab 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -2567,13 +2567,17 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section, outrel.r_offset = (htab->sgot->output_section->vma + htab->sgot->output_offset + off); - bfd_put_32 (output_bfd, 0, - htab->sgot->contents + off); indx = h && h->dynindx != -1 ? h->dynindx : 0; if (r_type == R_386_TLS_GD) dr_type = R_386_TLS_DTPMOD32; else dr_type = R_386_TLS_TPOFF32; + if (dr_type == R_386_TLS_TPOFF32 && indx == 0) + bfd_put_32 (output_bfd, relocation - dtpoff_base (info), + htab->sgot->contents + off); + else + bfd_put_32 (output_bfd, 0, + htab->sgot->contents + off); outrel.r_info = ELF32_R_INFO (indx, dr_type); loc = (Elf32_External_Rel *) htab->srelgot->contents; loc += htab->srelgot->reloc_count++;