Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 4 Apr 2023 18:08:30 GMT
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 27f35b7dd418 - main - libdtrace: Do not set SHF_ALLOC on SUNW_dof relocation sections
Message-ID:  <202304041808.334I8UDi061003@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=27f35b7dd418a82cf2f5bb618bd4bb7e81253f3a

commit 27f35b7dd418a82cf2f5bb618bd4bb7e81253f3a
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-04-04 15:21:51 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-04-04 18:08:16 +0000

    libdtrace: Do not set SHF_ALLOC on SUNW_dof relocation sections
    
    The section will contain static relocations which do not need to be
    preserved after linking, and moreover these relocations may reference
    symbols that end up getting removed.
    
    Do not set SHF_ALLOC and instead let the linker decide what needs to be
    done.
    
    PR:             258872
    MFC after:      1 week
    Sponsored by:   The FreeBSD Foundation
---
 cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
index 51f853d9a2b8..442c6f940733 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
@@ -582,7 +582,7 @@ dump_elf32(dtrace_hdl_t *dtp, const dof_hdr_t *dof, int fd)
 	} else {
 		shp = &elf_file.shdr[ESHDR_REL];
 		shp->sh_name = 37; /* DTRACE_SHSTRTAB32[37] = ".rel.SUNW_dof" */
-		shp->sh_flags = SHF_ALLOC;
+		shp->sh_flags = 0;
 		shp->sh_type = SHT_REL;
 		shp->sh_entsize = sizeof (de.de_rel[0]);
 		shp->sh_link = ESHDR_SYMTAB;
@@ -739,7 +739,7 @@ dump_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, int fd)
 	} else {
 		shp = &elf_file.shdr[ESHDR_REL];
 		shp->sh_name = 37; /* DTRACE_SHSTRTAB64[37] = ".rel.SUNW_dof" */
-		shp->sh_flags = SHF_ALLOC;
+		shp->sh_flags = 0;
 		shp->sh_type = SHT_RELA;
 		shp->sh_entsize = sizeof (de.de_rel[0]);
 		shp->sh_link = ESHDR_SYMTAB;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304041808.334I8UDi061003>