Author: markj
Date: Mon Feb 17 14:51:02 2014
New Revision: 262060
URL: http://svnweb.freebsd.org/changeset/base/262060
Log:
MFC r260051:
When clearing relocations to __dtrace* symbols, handle both SHT_REL and
SHT_RELA sections properly instead of assuming that the relocation section
is of type SHT_REL.
Modified:
stable/10/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
==============================================================================
--- stable/10/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Mon Feb
17 14:48:23 2014 (r262059)
+++ stable/10/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Mon Feb
17 14:51:02 2014 (r262060)
@@ -1620,10 +1620,17 @@ process_obj(dtrace_hdl_t *dtp, const cha
* the executable file as the symbol is going to be
* change from UND to ABS.
*/
- rela.r_offset = 0;
- rela.r_info = 0;
- rela.r_addend = 0;
- (void) gelf_update_rela(data_rel, i, &rela);
+ if (shdr_rel.sh_type == SHT_RELA) {
+ rela.r_offset = 0;
+ rela.r_info = 0;
+ rela.r_addend = 0;
+ (void) gelf_update_rela(data_rel, i, &rela);
+ } else {
+ GElf_Rel rel;
+ rel.r_offset = 0;
+ rel.r_info = 0;
+ (void) gelf_update_rel(data_rel, i, &rel);
+ }
#endif
mod = 1;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
