diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2012-03-29 10:32:34 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2012-03-29 10:32:34 +0000 |
| commit | 5ceeeba90c6cd0dd27aee772aeb0c82a99a05ed4 (patch) | |
| tree | 65be9b6f62c387e35eb0384f32b391fe0d7aaef5 /libexec/rtld-elf | |
| parent | ba289b84b0f286d763a106f40986c008001a002b (diff) | |
Notes
Diffstat (limited to 'libexec/rtld-elf')
| -rw-r--r-- | libexec/rtld-elf/rtld.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index c4607b2248a3..828b8b4af881 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2618,6 +2618,7 @@ do_dlsym(void *handle, const char *name, void *retaddr, const Ver_Entry *ve, const Elf_Sym *def; SymLook req; RtldLockState lockstate; + tls_index ti; int res; def = NULL; @@ -2732,7 +2733,11 @@ do_dlsym(void *handle, const char *name, void *retaddr, const Ver_Entry *ve, return (make_function_pointer(def, defobj)); else if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC) return (rtld_resolve_ifunc(defobj, def)); - else + else if (ELF_ST_TYPE(def->st_info) == STT_TLS) { + ti.ti_module = defobj->tlsindex; + ti.ti_offset = def->st_value; + return (__tls_get_addr(&ti)); + } else return (defobj->relocbase + def->st_value); } |