d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When reporting undefined symbol, note the version, if specified.

Browse Source 
Use the standard syntax of name@version, I do not expect a confusion
due to unlikely possibility of the name containing the '@' character.

Requested by:	emaste
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
This commit is contained in:
Konstantin Belousov 2017-07-04 20:19:36 +00:00
parent 8fadf6a637
commit 84de44d3f2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=320658
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libexec/rtld-elf/rtld.c
View File

@ -1659,6 +1659,7 @@ find_symdef(unsigned long symnum, const Obj_Entry *refobj,
const Elf_Sym *ref; const Elf_Sym *ref;
const Elf_Sym *def; const Elf_Sym *def;
const Obj_Entry *defobj; const Obj_Entry *defobj;
const Ver_Entry *ve;
SymLook req; SymLook req;
const char *name; const char *name;
int res; int res;
@ -1678,6 +1679,7 @@ find_symdef(unsigned long symnum, const Obj_Entry *refobj,
name = refobj->strtab + ref->st_name; name = refobj->strtab + ref->st_name;
def = NULL; def = NULL;
defobj = NULL; defobj = NULL;
ve = NULL;
/* /*
* We don't have to do a full scale lookup if the symbol is local. * We don't have to do a full scale lookup if the symbol is local.
@ -1694,7 +1696,7 @@ find_symdef(unsigned long symnum, const Obj_Entry *refobj,
} }
symlook_init(&req, name); symlook_init(&req, name);
req.flags = flags; req.flags = flags;
req.ventry = fetch_ventry(refobj, symnum); ve = req.ventry = fetch_ventry(refobj, symnum);
req.lockstate = lockstate; req.lockstate = lockstate;
res = symlook_default(&req, refobj); res = symlook_default(&req, refobj);
if (res == 0) { if (res == 0) {
@ -1724,7 +1726,8 @@ find_symdef(unsigned long symnum, const Obj_Entry *refobj,
} }
} else { } else {
if (refobj != &obj_rtld) 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; return def;
} }
@ -3489,7 +3492,8 @@ do_dlsym(void *handle, const char *name, void *retaddr, const Ver_Entry *ve,
return (sym); 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); lock_release(rtld_bind_lock, &lockstate);
LD_UTRACE(UTRACE_DLSYM_STOP, handle, NULL, 0, 0, name); LD_UTRACE(UTRACE_DLSYM_STOP, handle, NULL, 0, 0, name);
return NULL; return NULL;