diff options
| author | kan <kan@FreeBSD.org> | 2002-10-19 23:03:35 +0000 |
|---|---|---|
| committer | kan <kan@FreeBSD.org> | 2002-10-19 23:03:35 +0000 |
| commit | d675c525c1e3430650aa9cf941351e80b095a6a7 (patch) | |
| tree | 9e3ecb4c3f88c6e571df22f7e98fd149399fd5ec | |
| parent | 90a2f4ba9a2d8a47bbb857ba864f779122cc7d07 (diff) | |
| download | FreeBSD-src-d675c525c1e3430650aa9cf941351e80b095a6a7.zip FreeBSD-src-d675c525c1e3430650aa9cf941351e80b095a6a7.tar.gz | |
Change the symbol lookup order to search RTLD_GLOBAL objects
before referencing object's DAG. This makes it possible for
C++ exceptions to work across shared libraries and brings
us closer to the search order used by Solaris/Linux.
Reviewed by: jdp
Approved by: obrien
MFC after: 1 month
| -rw-r--r-- | libexec/rtld-elf/rtld.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index d7f243a..8375a4c 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1922,12 +1922,12 @@ symlook_default(const char *name, unsigned long hash, } } - /* Search all dlopened DAGs containing the referencing object. */ - STAILQ_FOREACH(elm, &refobj->dldags, 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); + /* 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; @@ -1935,12 +1935,12 @@ symlook_default(const char *name, unsigned long hash, } } - /* 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); + /* Search all dlopened DAGs containing the referencing object. */ + STAILQ_FOREACH(elm, &refobj->dldags, 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; |
