Date: Fri, 26 Dec 2014 22:49:28 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r276264 - stable/9/cddl/contrib/opensolaris/lib/libdtrace/common Message-ID: <201412262249.sBQMnSw3073062@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Fri Dec 26 22:49:27 2014 New Revision: 276264 URL: https://svnweb.freebsd.org/changeset/base/276264 Log: MFC r275011: The module load address always needs to be included when setting the dm_*_va fields of dt_module_t. Previously, this was only done on architectures where kernel modules have type ET_REL; this change fixes that. As a result, symbol name resolution in the stack() action now works properly for kernel modules on i386. Modified: stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c Directory Properties: stable/9/cddl/contrib/opensolaris/ (props changed) stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/ (props changed) Modified: stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c ============================================================================== --- stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c Fri Dec 26 22:44:27 2014 (r276263) +++ stable/9/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c Fri Dec 26 22:49:27 2014 (r276264) @@ -970,13 +970,13 @@ dt_module_update(dtrace_hdl_t *dtp, stru #if defined(__FreeBSD__) if (sh.sh_size == 0) continue; - if (is_elf_obj && (sh.sh_type == SHT_PROGBITS || - sh.sh_type == SHT_NOBITS)) { + if (sh.sh_type == SHT_PROGBITS || sh.sh_type == SHT_NOBITS) { alignmask = sh.sh_addralign - 1; mapbase += alignmask; mapbase &= ~alignmask; sh.sh_addr = mapbase; - dmp->dm_sec_offsets[elf_ndxscn(sp)] = sh.sh_addr; + if (is_elf_obj) + dmp->dm_sec_offsets[elf_ndxscn(sp)] = sh.sh_addr; mapbase += sh.sh_size; } #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412262249.sBQMnSw3073062>