mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
Update.
* elf/dl-deps.c (_dl_map_object_deps): Don't add dummy objects created for tracing to the scope lists. * elf/do-lookup.h: Remove test for l_opencount == 0 after above change. DT_SYMTAB is always available according to ELF spec.
This commit is contained in:
@ -385,7 +385,11 @@ _dl_map_object_deps (struct link_map *map,
|
||||
|
||||
for (nlist = 0, runp = known; runp; runp = runp->unique)
|
||||
{
|
||||
map->l_searchlist.r_list[nlist++] = runp->map;
|
||||
if (trace_mode && runp->map->l_opencount == 0)
|
||||
/* This can happen when we trace the loading. */
|
||||
--map->l_searchlist.r_nlist;
|
||||
else
|
||||
map->l_searchlist.r_list[nlist++] = runp->map;
|
||||
|
||||
/* Now clear all the mark bits we set in the objects on the search list
|
||||
to avoid duplicates, so the next call starts fresh. */
|
||||
@ -406,7 +410,11 @@ _dl_map_object_deps (struct link_map *map,
|
||||
"cannot allocate symbol search list");
|
||||
|
||||
for (cnt = 0, runp = known; runp; runp = runp->dup)
|
||||
map->l_searchlist.r_duplist[cnt++] = runp->map;
|
||||
if (trace_mode && runp->map->l_opencount == 0)
|
||||
/* This can happen when we trace the loading. */
|
||||
--map->l_searchlist.r_nduplist;
|
||||
else
|
||||
map->l_searchlist.r_duplist[cnt++] = runp->map;
|
||||
}
|
||||
|
||||
/* Now that all this succeeded put the objects in the global scope if
|
||||
|
Reference in New Issue
Block a user