diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2010-07-13 16:59:14 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2010-07-13 16:59:14 +0000 |
| commit | bb1cb422aef79013990a3331f837a8dd24d71165 (patch) | |
| tree | feeacaf154cf0e24afcea5451d49e3b400bf94a9 /bfd/elf32-i386.c | |
| parent | 9aa1f1e33995b48c94b8d6833d071751aa02f751 (diff) | |
| download | gdb-bb1cb422aef79013990a3331f837a8dd24d71165.zip gdb-bb1cb422aef79013990a3331f837a8dd24d71165.tar.gz gdb-bb1cb422aef79013990a3331f837a8dd24d71165.tar.bz2 | |
Support garbage collection against STT_GNU_IFUNC symbols.
bfd/
2010-07-13 H.J. Lu <hongjiu.lu@intel.com>
PR ld/11791
* elf-ifunc.c (_bfd_elf_allocate_ifunc_dyn_relocs): Support
garbage collection against STT_GNU_IFUNC symbols.
* elf32-i386.c (elf_i386_get_local_sym_hash): Don't set
elf.plt.offset/elf.got.offset to -1.
(elf_i386_tls_transition): Skip TLS transition for functions.
(elf_i386_gc_sweep_hook): Support STT_GNU_IFUNC symbols.
* elf64-x86-64.c (elf64_x86_64_get_local_sym_hash): Don't set
elf.plt.offset/elf.got.offset to -1.
(elf64_x86_64_tls_transition): Skip TLS transition for functions.
(elf64_x86_64_gc_sweep_hook): Support STT_GNU_IFUNC symbols.
ld/testsuite/
2010-07-13 H.J. Lu <hongjiu.lu@intel.com>
PR ld/11791
* ld-ifunc/ifunc-10-i386.d: New.
* ld-ifunc/ifunc-10-i386.s: Likewise.
* ld-ifunc/ifunc-10-x86-64.d: Likewise.
* ld-ifunc/ifunc-10-x86-64.s: Likewise.
* ld-ifunc/ifunc-11-i386.d: Likewise.
* ld-ifunc/ifunc-11-i386.s: Likewise.
* ld-ifunc/ifunc-11-x86-64.d: Likewise.
* ld-ifunc/ifunc-11-x86-64.s: Likewise.
Diffstat (limited to 'bfd/elf32-i386.c')
| -rw-r--r-- | bfd/elf32-i386.c | 40 |
1 files changed, 38 insertions, 2 deletions
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index e85a7e5..ac9bdb6 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -789,8 +789,6 @@ elf_i386_get_local_sym_hash (struct elf_i386_link_hash_table *htab, ret->elf.indx = sec->id; ret->elf.dynstr_index = ELF32_R_SYM (rel->r_info); ret->elf.dynindx = -1; - ret->elf.plt.offset = (bfd_vma) -1; - ret->elf.got.offset = (bfd_vma) -1; *slot = ret; } return &ret->elf; @@ -1162,6 +1160,12 @@ elf_i386_tls_transition (struct bfd_link_info *info, bfd *abfd, unsigned int to_type = from_type; bfd_boolean check = TRUE; + /* Skip TLS transition for functions. */ + if (h != NULL + && (h->type == STT_FUNC + || h->type == STT_GNU_IFUNC)) + return TRUE; + switch (from_type) { case R_386_TLS_GD: @@ -1819,6 +1823,23 @@ elf_i386_gc_sweep_hook (bfd *abfd, break; } } + else + { + /* A local symbol. */ + Elf_Internal_Sym *isym; + + isym = bfd_sym_from_r_symndx (&htab->sym_cache, + abfd, r_symndx); + + /* Check relocation against local STT_GNU_IFUNC symbol. */ + if (isym != NULL + && ELF32_ST_TYPE (isym->st_info) == STT_GNU_IFUNC) + { + h = elf_i386_get_local_sym_hash (htab, abfd, rel, FALSE); + if (h == NULL) + abort (); + } + } r_type = ELF32_R_TYPE (rel->r_info); if (! elf_i386_tls_transition (info, abfd, sec, NULL, @@ -1845,6 +1866,11 @@ elf_i386_gc_sweep_hook (bfd *abfd, { if (h->got.refcount > 0) h->got.refcount -= 1; + if (h->type == STT_GNU_IFUNC) + { + if (h->plt.refcount > 0) + h->plt.refcount -= 1; + } } else if (local_got_refcounts != NULL) { @@ -1867,6 +1893,16 @@ elf_i386_gc_sweep_hook (bfd *abfd, } break; + case R_386_GOTOFF: + if (h != NULL && h->type == STT_GNU_IFUNC) + { + if (h->got.refcount > 0) + h->got.refcount -= 1; + if (h->plt.refcount > 0) + h->plt.refcount -= 1; + } + break; + default: break; } |