From 604510f7170a912e7abd352d61b7686445216904 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 7 Oct 1998 13:40:55 +0000 Subject: Update. 1998-10-07 Ulrich Drepper * 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. --- elf/dl-close.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'elf/dl-close.c') diff --git a/elf/dl-close.c b/elf/dl-close.c index 3618b13da7..0fbeecc4cd 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -115,6 +115,22 @@ _dl_close (struct link_map *map) ++cnt; } --_dl_main_searchlist->r_nlist; + if (_dl_main_searchlist->r_nlist + == _dl_initial_searchlist.r_nlist) + { + /* All object dynamically loaded by the program are + unloaded. Free the memory allocated for the global + scope variable. */ + struct link_map **old = _dl_main_searchlist->r_list; + + /* Put the old map in. */ + _dl_main_searchlist->r_list = _dl_initial_searchlist.r_list; + /* Signal that the old map is used. */ + _dl_global_scope_alloc = 0; + + /* Now free the old map. */ + free (old); + } } /* We can unmap all the maps at once. We determined the -- cgit v1.2.3