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
This commit is contained in:
parent
d7dd6ae7ec
commit
b2ce513208
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=105492
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user