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

libdtrace: Format USDT symbols correctly based on symbol binding

Browse Source 
Before we did not handle weak symbols correctly, sometimes resulting in
link errors from dtrace -G when processing object files where functions
with weak aliases contain USDT probes.

Reported by:	rlibby
Tested by:	rlibby
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Mark Johnston 2021-01-10 17:46:32 -05:00
parent 55f0ad5fde
commit d00431a7bd
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
View File

@ -1344,18 +1344,24 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *eprobesp)
/*
* Aliases of weak symbols don't get a uniquifier.
*/
if (GELF_ST_BIND(fsym.st_info) == STB_WEAK)
if (GELF_ST_BIND(fsym.st_info) == STB_WEAK) {
len = snprintf(NULL, 0, dt_weaksymfmt,
dt_symprefix, s) + 1;
else
} else {
len = snprintf(NULL, 0, dt_symfmt, dt_symprefix,
objkey, s) + 1;
}
if ((p = dt_alloc(dtp, len)) == NULL) {
dt_strtab_destroy(strtab);
goto err;
}
(void) snprintf(p, len, dt_symfmt, dt_symprefix,
objkey, s);
if (GELF_ST_BIND(fsym.st_info) == STB_WEAK) {
(void) snprintf(p, len, dt_weaksymfmt,
dt_symprefix, s);
} else {
(void) snprintf(p, len, dt_symfmt, dt_symprefix,
objkey, s);
}
if (dt_strtab_index(strtab, p) == -1) {
/*