Author: kib
Date: Tue Jul 11 05:36:02 2017
New Revision: 320888
URL: https://svnweb.freebsd.org/changeset/base/320888
Log:
MFC r320658:
When reporting undefined symbol, note the version, if specified.
Modified:
stable/10/libexec/rtld-elf/rtld.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/libexec/rtld-elf/rtld.c
==============================================================================
--- stable/10/libexec/rtld-elf/rtld.c Tue Jul 11 05:33:07 2017
(r320887)
+++ stable/10/libexec/rtld-elf/rtld.c Tue Jul 11 05:36:02 2017
(r320888)
@@ -1547,6 +1547,7 @@ find_symdef(unsigned long symnum, const Obj_Entry *ref
const Elf_Sym *ref;
const Elf_Sym *def;
const Obj_Entry *defobj;
+ const Ver_Entry *ve;
SymLook req;
const char *name;
int res;
@@ -1566,6 +1567,7 @@ find_symdef(unsigned long symnum, const Obj_Entry *ref
name = refobj->strtab + ref->st_name;
def = NULL;
defobj = NULL;
+ ve = NULL;
/*
* We don't have to do a full scale lookup if the symbol is local.
@@ -1582,7 +1584,7 @@ find_symdef(unsigned long symnum, const Obj_Entry *ref
}
symlook_init(&req, name);
req.flags = flags;
- req.ventry = fetch_ventry(refobj, symnum);
+ ve = req.ventry = fetch_ventry(refobj, symnum);
req.lockstate = lockstate;
res = symlook_default(&req, refobj);
if (res == 0) {
@@ -1612,7 +1614,8 @@ find_symdef(unsigned long symnum, const Obj_Entry *ref
}
} else {
if (refobj != &obj_rtld)
- _rtld_error("%s: Undefined symbol \"%s\"", refobj->path, name);
+ _rtld_error("%s: Undefined symbol \"%s%s%s\"", refobj->path, name,
+ ve != NULL ? "@" : "", ve != NULL ? ve->name : "");
}
return def;
}
@@ -3283,7 +3286,8 @@ do_dlsym(void *handle, const char *name, void *retaddr
return (sym);
}
- _rtld_error("Undefined symbol \"%s\"", name);
+ _rtld_error("Undefined symbol \"%s%s%s\"", name, ve != NULL ? "@" : "",
+ ve != NULL ? ve->name : "");
lock_release(rtld_bind_lock, &lockstate);
LD_UTRACE(UTRACE_DLSYM_STOP, handle, NULL, 0, 0, name);
return NULL;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
