aboutsummaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2002-02-27 23:44:50 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2002-02-27 23:44:50 +0000
commite211585c77db3db8d8aa98cc6968a589d0fb5810 (patch)
tree952e993d0788770ea7add3bc87e2709ac5298368 /libexec
parent10d3660bd2468ef4a8cc8dc1bca0a205297d72d9 (diff)
Notes
Diffstat (limited to 'libexec')
-rw-r--r--libexec/rtld-elf/rtld.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index abc95e883df8..619791ecb50e 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -1915,9 +1915,12 @@ symlook_default(const char *name, unsigned long hash,
}
}
- /* Search all RTLD_GLOBAL objects. */
- if (def == NULL || ELF_ST_BIND(def->st_info) == STB_WEAK) {
- symp = symlook_list(name, hash, &list_global, &obj, in_plt, &donelist);
+ /* Search all DAGs whose roots are RTLD_GLOBAL objects. */
+ STAILQ_FOREACH(elm, &list_global, link) {
+ if (def != NULL && ELF_ST_BIND(def->st_info) != STB_WEAK)
+ break;
+ symp = symlook_list(name, hash, &elm->obj->dagmembers, &obj, in_plt,
+ &donelist);
if (symp != NULL &&
(def == NULL || ELF_ST_BIND(symp->st_info) != STB_WEAK)) {
def = symp;