diff options
| author | H.J. Lu <hjl@lucon.org> | 2007-08-14 19:48:21 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl@lucon.org> | 2007-08-14 19:48:21 +0000 |
| commit | 03123c4b81dca4f810543b7bb1d49b48e96a2fca (patch) | |
| tree | b1d72c651e7ec88df1caa2585501d50da4b8edb8 /bfd/elf32-i386.c | |
| parent | 35ff182f958209a488e6959d90ecba5d59d71729 (diff) | |
| download | gdb-03123c4b81dca4f810543b7bb1d49b48e96a2fca.tar.gz | |
bfd/
2007-08-14 H.J. Lu <hongjiu.lu@intel.com>
PR ld/4918
* elf32-i386.c (elf_i386_relocate_section): Allow R_386_PC32
on ___tls_get_addr for GD->LE/LD->LE transitions when not
building shared library.
* elf64-x86-64.c (elf64_x86_64_relocate_section): Allow
R_X86_64_PC32 on __tls_get_addr for GD->LE/LD->LE transitions
when not building shared library.
ld/testsuite/
2007-08-14 H.J. Lu <hongjiu.lu@intel.com>
PR ld/4918
* ld-i386/i386.exp (i386tests): Add tlsgd1 and tlsld1 tests.
* ld-x86-64/x86-64.exp (x86_64tests): Likewise.
* ld-i386/tlsgd1.dd: New file.
* ld-i386/tlsgd1.s: Likewise.
* ld-i386/tlsld1.dd: Likewise.
* ld-i386/tlsld1.s: Likewise.
* ld-x86-64/tlsgd1.dd: Likewise.
* ld-x86-64/tlsgd1.s: Likewise.
* ld-x86-64/tlsld1.dd: Likewise.
* ld-x86-64/tlsld1.s: Likewise.
Diffstat (limited to 'bfd/elf32-i386.c')
| -rw-r--r-- | bfd/elf32-i386.c | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index c50e98d92bf..0e50e9ea1c7 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -2652,6 +2652,8 @@ elf_i386_relocate_section (bfd *output_bfd, { unsigned int val, type; bfd_vma roff; + unsigned long tls_r_symndx; + struct elf_link_hash_entry *tls_h; /* GD->LE transition. */ BFD_ASSERT (rel->r_offset >= 2); @@ -2662,7 +2664,16 @@ elf_i386_relocate_section (bfd *output_bfd, contents + rel->r_offset + 4) == 0xe8); BFD_ASSERT (rel + 1 < relend); - BFD_ASSERT (ELF32_R_TYPE (rel[1].r_info) == R_386_PLT32); + tls_r_symndx = ELF32_R_SYM (rel[1].r_info); + BFD_ASSERT (tls_r_symndx >= symtab_hdr->sh_info); + tls_h = sym_hashes[tls_r_symndx - symtab_hdr->sh_info]; + BFD_ASSERT (tls_h != NULL + && tls_h->root.root.string != NULL + && strcmp (tls_h->root.root.string, + "___tls_get_addr") == 0); + BFD_ASSERT ((! info->shared + && ELF32_R_TYPE (rel[1].r_info) == R_386_PC32) + || ELF32_R_TYPE (rel[1].r_info) == R_386_PLT32); roff = rel->r_offset + 5; val = bfd_get_8 (input_bfd, contents + rel->r_offset - 1); @@ -2707,7 +2718,7 @@ elf_i386_relocate_section (bfd *output_bfd, } bfd_put_32 (output_bfd, tpoff (info, relocation), contents + roff); - /* Skip R_386_PLT32. */ + /* Skip R_386_PC32/R_386_PLT32. */ rel++; continue; } @@ -3191,6 +3202,8 @@ elf_i386_relocate_section (bfd *output_bfd, if (! info->shared) { unsigned int val; + unsigned long tls_r_symndx; + struct elf_link_hash_entry *tls_h; /* LD->LE transition: Ensure it is: @@ -3206,10 +3219,18 @@ elf_i386_relocate_section (bfd *output_bfd, BFD_ASSERT (bfd_get_8 (input_bfd, contents + rel->r_offset + 4) == 0xe8); BFD_ASSERT (rel + 1 < relend); - BFD_ASSERT (ELF32_R_TYPE (rel[1].r_info) == R_386_PLT32); + tls_r_symndx = ELF32_R_SYM (rel[1].r_info); + BFD_ASSERT (tls_r_symndx >= symtab_hdr->sh_info); + tls_h = sym_hashes[tls_r_symndx - symtab_hdr->sh_info]; + BFD_ASSERT (tls_h != NULL + && tls_h->root.root.string != NULL + && strcmp (tls_h->root.root.string, + "___tls_get_addr") == 0); + BFD_ASSERT (ELF32_R_TYPE (rel[1].r_info) == R_386_PC32 + || ELF32_R_TYPE (rel[1].r_info) == R_386_PLT32); memcpy (contents + rel->r_offset - 2, "\x65\xa1\0\0\0\0\x90\x8d\x74\x26", 11); - /* Skip R_386_PLT32. */ + /* Skip R_386_PC32/R_386_PLT32. */ rel++; continue; } |