zldrobit_gmail.com updated this revision to Diff 158107.
zldrobit_gmail.com added a comment.
The patch is updated:
1. Delete `sym->st_value != 0` in `dt_module_syminit32()`.
2. Generate patch file with `-U999` option.
REPOSITORY
rG FreeBSD src repository
CHANGES SINCE LAST UPDATE
https://reviews.freebsd.org/D51188?vs=158079&id=158107
CHANGES SINCE LAST ACTION
https://reviews.freebsd.org/D51188/new/
REVISION DETAIL
https://reviews.freebsd.org/D51188
AFFECTED FILES
cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c
EMAIL PREFERENCES
https://reviews.freebsd.org/settings/panel/emailpreferences/
To: zldrobit_gmail.com, #dtrace, gnn
Cc: markj, avg, freebsd-dtrace-list, imp, me_reviews.freebsd_lelf.lu,
kpraveen.lkml_gmail.com, bkidney_briankidney.ca, dnelson_1901_yahoo.com,
yan.jurak_gmail.com, bcr, lwhsu, jonathan, pstef
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;
