mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-11 15:50:06 +00:00
aed283dd45
2002-02-12 Ulrich Drepper <drepper@redhat.com> * sysdeps/generic/dl-tls.c (TLS_DTV_UNALLOCATED): Renamed from TLS_DTV_UNALLOCATE. (oom): New function. (_dl_next_tls_modid): Rewrite to handle dl_tls_dtv_slotinfo_list. (_dl_determine_tlsoffset): Likewise. (_dl_allocate_tls): Likewise. (__TLS_GET_ADDR): Define if not already defined. (_dl_tls_symaddr): New function. (allocate_and_init): New function. (__tls_get_addr): Actually implement handling of generation counter and deferred allocation. * sysdeps/generic/ldsodefs.h (_rtld_global): Remove _dl_initimage_list, add _dl_tls_dtv_slotinfo_list, _dl_tls_static_nelem, and _dl_tls_generation. Define TLS_SLOTINFO_SURPLUS and DTV_SURPLUS. Declare _dl_tls_symaddr. * sysdeps/i386/dl-tls.h: Disable __tls_get_addr handling unless SHARED. * include/link.h (struct link_map): Remove l_tls_nextimage and l_tls_previmage. * elf/dl-sym.c (_dl_sym): After successful lookup call _dl_tls_symaddr instead of DL_SYMBOL_ADDRESS for STT_TLS symbols. (_dl_vsym): Likewise. * elf/rtld.c (_dl_start_final): Adjust initdtv initialization for new layout. (dl_main): Allow PT_TLS be present for empty segment. Remove nextimage list handling. Instead add all modules using TLS to dl_tls_dtv_slotinfo_list. * elf/dl-open.c (dl_open_worker): After successfully loading all objects add those with TLS to the dl_tls_dtv_slotinfo_list list. * elf/dl-load.c (_dl_map_object_from_fd): If PT_TLS entry is for an empty segment don't do anything. Remove handling of initimage list. * elf/Versions [ld] (GLIBC_2.0): Add __libc_memalign. (GLIBC_PRIVATE): Add _dl_tls_symaddr. * elf/dl-minimal.c: Define __libc_memalign. * elf/dl-support.c: Remove _dl_initimage_list. Add _dl_tls_dtv_slotinfo_list, _dl_tls_static_nelem, and _dl_tls_generation. * include/stdlib.h: Declare __libc_memalign. * elf/Makefile: Add rules to build and run tst-tls4 and tst-tls5. * elf/tst-tls4.c: New file. * elf/tst-tls5.c: New file. * elf/tst-tlsmod2.c: New file. * elf/tls-macros.h: asms using ___tls_get_addr destroy %ecx and %edx. * elf/tst-tlsmod1.c: Don't define variables unles USE_TLS. * elf/tst-tls1.c: Use test-skeleton.c. * elf/tst-tls2.c: Likewise. * elf/tst-tls3.c: Likewise. * elf/dl-conflict.c (RESOLVE_MAP): Return NULL not 0. * sysdeps/mips/machine-gmon.h: Update MCOUNT for current GCC behavior.
177 lines
5.0 KiB
C
177 lines
5.0 KiB
C
/* Look up a symbol in a shared object loaded by `dlopen'.
|
|
Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <stddef.h>
|
|
#include <setjmp.h>
|
|
#include <libintl.h>
|
|
|
|
#include <dlfcn.h>
|
|
#include <ldsodefs.h>
|
|
#include <dl-hash.h>
|
|
|
|
void *
|
|
internal_function
|
|
_dl_sym (void *handle, const char *name, void *who)
|
|
{
|
|
const ElfW(Sym) *ref = NULL;
|
|
lookup_t result;
|
|
ElfW(Addr) caller = (ElfW(Addr)) who;
|
|
struct link_map *match;
|
|
struct link_map *l;
|
|
|
|
/* If the address is not recognized the call comes from the main
|
|
program (we hope). */
|
|
match = GL(dl_loaded);
|
|
|
|
/* Find the highest-addressed object that CALLER is not below. */
|
|
for (l = GL(dl_loaded); l != NULL; l = l->l_next)
|
|
if (caller >= l->l_map_start && caller < l->l_map_end)
|
|
{
|
|
/* There must be exactly one DSO for the range of the virtual
|
|
memory. Otherwise something is really broken. */
|
|
match = l;
|
|
break;
|
|
}
|
|
|
|
if (handle == RTLD_DEFAULT)
|
|
/* Search the global scope as seen in the caller object. */
|
|
result = _dl_lookup_symbol (name, match, &ref, match->l_scope, 0, 0);
|
|
else
|
|
{
|
|
if (handle != RTLD_NEXT)
|
|
{
|
|
/* Search the scope of the given object. */
|
|
struct link_map *map = handle;
|
|
|
|
result = _dl_lookup_symbol (name, match, &ref, map->l_local_scope,
|
|
0, 1);
|
|
}
|
|
else
|
|
{
|
|
if (__builtin_expect (match == GL(dl_loaded), 0))
|
|
{
|
|
if (! GL(dl_loaded)
|
|
|| caller < GL(dl_loaded)->l_map_start
|
|
|| caller >= GL(dl_loaded)->l_map_end)
|
|
_dl_signal_error (0, NULL, NULL, N_("\
|
|
RTLD_NEXT used in code not dynamically loaded"));
|
|
}
|
|
|
|
l = match;
|
|
while (l->l_loader != NULL)
|
|
l = l->l_loader;
|
|
|
|
result = _dl_lookup_symbol_skip (name, l, &ref, l->l_local_scope,
|
|
match);
|
|
}
|
|
}
|
|
|
|
if (ref != NULL)
|
|
{
|
|
#if defined USE_TLS && defined SHARED
|
|
if (ELFW(ST_TYPE) (ref->st_info) == STT_TLS)
|
|
/* The found symbol is a thread-local storage variable.
|
|
Return the address for to the current thread. */
|
|
return _dl_tls_symaddr (result, ref);
|
|
#endif
|
|
|
|
return DL_SYMBOL_ADDRESS (result, ref);
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
void *
|
|
internal_function
|
|
_dl_vsym (void *handle, const char *name, const char *version, void *who)
|
|
{
|
|
const ElfW(Sym) *ref = NULL;
|
|
struct r_found_version vers;
|
|
lookup_t result;
|
|
ElfW(Addr) caller = (ElfW(Addr)) who;
|
|
struct link_map *match;
|
|
struct link_map *l;
|
|
|
|
/* Compute hash value to the version string. */
|
|
vers.name = version;
|
|
vers.hidden = 1;
|
|
vers.hash = _dl_elf_hash (version);
|
|
/* We don't have a specific file where the symbol can be found. */
|
|
vers.filename = NULL;
|
|
|
|
/* If the address is not recognized the call comes from the main
|
|
program (we hope). */
|
|
match = GL(dl_loaded);
|
|
|
|
/* Find the highest-addressed object that CALLER is not below. */
|
|
for (l = GL(dl_loaded); l != NULL; l = l->l_next)
|
|
if (caller >= l->l_map_start && caller < l->l_map_end)
|
|
{
|
|
/* There must be exactly one DSO for the range of the virtual
|
|
memory. Otherwise something is really broken. */
|
|
match = l;
|
|
break;
|
|
}
|
|
|
|
if (handle == RTLD_DEFAULT)
|
|
/* Search the global scope. */
|
|
result = _dl_lookup_versioned_symbol (name, match, &ref, match->l_scope,
|
|
&vers, 0, 0);
|
|
else if (handle == RTLD_NEXT)
|
|
{
|
|
if (__builtin_expect (match == GL(dl_loaded), 0))
|
|
{
|
|
if (! GL(dl_loaded)
|
|
|| caller < GL(dl_loaded)->l_map_start
|
|
|| caller >= GL(dl_loaded)->l_map_end)
|
|
_dl_signal_error (0, NULL, NULL, N_("\
|
|
RTLD_NEXT used in code not dynamically loaded"));
|
|
}
|
|
|
|
l = match;
|
|
while (l->l_loader != NULL)
|
|
l = l->l_loader;
|
|
|
|
result = _dl_lookup_versioned_symbol_skip (name, l, &ref,
|
|
l->l_local_scope,
|
|
&vers, match);
|
|
}
|
|
else
|
|
{
|
|
/* Search the scope of the given object. */
|
|
struct link_map *map = handle;
|
|
result = _dl_lookup_versioned_symbol (name, map, &ref,
|
|
map->l_local_scope, &vers, 0, 1);
|
|
}
|
|
|
|
if (ref != NULL)
|
|
{
|
|
#if defined USE_TLS && defined SHARED
|
|
if (ELFW(ST_TYPE) (ref->st_info) == STT_TLS)
|
|
/* The found symbol is a thread-local storage variable.
|
|
Return the address for to the current thread. */
|
|
return _dl_tls_symaddr (result, ref);
|
|
#endif
|
|
|
|
return DL_SYMBOL_ADDRESS (result, ref);
|
|
}
|
|
|
|
return NULL;
|
|
}
|