D51188.id158107.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D51188.id158107.diff
View Options

	diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c
	--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c
	+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c
	@@ -109,8 +109,7 @@
	if (sym->st_name == 0 \|\| sym->st_name >= ss_size)
	continue; /* skip null or invalid names */

	- if (sym->st_value != 0 &&
	- (ELF32_ST_BIND(sym->st_info) != STB_LOCAL \|\| sym->st_size)) {
	+ if (ELF32_ST_BIND(sym->st_info) != STB_LOCAL \|\| sym->st_size) {
	asrsv++; /* reserve space in the address map */

	#if defined(__FreeBSD__)
	@@ -159,8 +158,7 @@
	if (sym->st_name == 0 \|\| sym->st_name >= ss_size)
	continue; /* skip null or invalid names */

	- if (sym->st_value != 0 &&
	- (ELF64_ST_BIND(sym->st_info) != STB_LOCAL \|\| sym->st_size)) {
	+ if (ELF64_ST_BIND(sym->st_info) != STB_LOCAL \|\| sym->st_size) {
	asrsv++; /* reserve space in the address map */
	#if defined(__FreeBSD__)
	sym->st_value += (Elf_Addr) dmp->dm_reloc_offset;
	@@ -1218,7 +1216,7 @@
	continue; /* skip any malformed sections */
	if (sh.sh_size == 0)
	continue;
	- if (sh.sh_type == SHT_PROGBITS \|\| sh.sh_type == SHT_NOBITS) {
	+ if (sh.sh_flags & SHF_ALLOC) {
	alignmask = sh.sh_addralign - 1;
	mapbase += alignmask;
	mapbase &= ~alignmask;