diff options
author | Ulrich Drepper <drepper@redhat.com> | 1998-10-07 13:40:55 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1998-10-07 13:40:55 +0000 |
commit | 604510f7170a912e7abd352d61b7686445216904 (patch) | |
tree | 60e34c2f1a07ef310b4bcbce0c8d20a389964ca8 /elf/rtld.c | |
parent | 0163d97b8c55bc320c7d867d02ca37badabd1f7c (diff) | |
download | glibc-604510f7170a912e7abd352d61b7686445216904.zip glibc-604510f7170a912e7abd352d61b7686445216904.tar.gz glibc-604510f7170a912e7abd352d61b7686445216904.tar.bz2 |
Update.
1998-10-07 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-open.c (_dl_global_scope_alloc): Make global.
(dl_open_worker): Use realloc, not malloc to resize array.
* elf/rtld.c (_dl_initial_searchlist): New variable.
(_dl_main): Copy content of _dl_main_searchlist to
_dl_initial_searchlist.
* elf/ldsodefs.h: Add declarations for _dl_initial_searchlist and
_dl_global_scope_alloc.
* elf/Versions [libc, GLIBC_2.1]: Add _dl_initial_searchlist.
* elf/dl-close.c (_dl_close): When removing object with global
scope remove allocated searchlist if no dynamically loaded object
is on it anymore.
* elf/dl-support.c (_dl_initial_searchlist): Renamed from fake_scope.
(_dl_global_scope, _dl_main_searchlist): Use _dl_initial_searchlist.
* malloc/mtrace.c (tr_where): Don't print space in location string,
print it afterwards. Print better symbol name information.
Diffstat (limited to 'elf/rtld.c')
-rw-r--r-- | elf/rtld.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -95,6 +95,8 @@ const char *_dl_origin_path; struct link_map *_dl_loaded; /* Pointer to the l_searchlist element of the link map of the main object. */ struct r_scope_elem *_dl_main_searchlist; +/* Copy of the content of `_dl_main_searchlist'. */ +struct r_scope_elem _dl_initial_searchlist; /* Array which is used when looking up in the global scope. */ struct r_scope_elem *_dl_global_scope[2]; @@ -909,6 +911,10 @@ of this helper program; chances are you did not intend to run this program.\n\ _dl_main_searchlist = &_dl_loaded->l_searchlist; _dl_global_scope[0] = &_dl_loaded->l_searchlist; + /* Safe the information about the original global scope list since + we need it in the memory handling later. */ + _dl_initial_searchlist = *_dl_main_searchlist; + { /* Initialize _r_debug. */ struct r_debug *r = _dl_debug_initialize (_dl_rtld_map.l_addr); |