From nobody Tue Apr 11 14:10:37 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pwnmt4Pqvz44w9T; Tue, 11 Apr 2023 14:10:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pwnmt0GYHz4Kfr; Tue, 11 Apr 2023 14:10:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681222238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=60/fu/DlSYbEju8rNzj22CAxuXrhulfejyAmUqJS3Vg=; b=QOLsKKAwcVs+a/L90TdNWzGVk0cgNSWjtw4NzBbI9vtxv3Sm37DTfpdiqWjDL5l52QbNof b4/blLoD24iIsax/EcFefn9i39+jFNVFpgi92lqipw+/unM22tEk2+yDPpHL0ZyjGdHxSD NtCuqo8Xy8GmB83ZI+EfT6GX1iHUAsLUnc8QqVS+3nlq8OhppGRBfMaHc9k0KqeBMUmTx9 VJ12cBBcEFKNFytQJoxFiGDPAnfNonPVG7ORemnCjBsUA7tzSoul5+cBEGc1ic00g0F8Z2 5yLv3Nx8EKzd5OH0K18ddlGuZXf9oIdm3TAiUgy4arvFXOeJD6s9QORHzyZysg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681222238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=60/fu/DlSYbEju8rNzj22CAxuXrhulfejyAmUqJS3Vg=; b=GkyYAQHqknx7Gn5C2zTABkGB98Hm/OTDLzRhNFk/GqGomIOxcFj8SckHYRYC+kEXReujL0 or8uXZoDHwy6aqB+ACa8ZnJFwPXHiZoZsLNP68mdVq09sI/VJ3O3IOupzhPsqWjBkysNFH ZItnrlwO330IxdziH5X5TY6Vq6Qv7zxeYfxMIi34E57aXT2F2gWHCABbTYVposcO88u1jE PRCWvmfYuR6fitjOoDwaBfFigPK+DM7v4QugrHbVxv1WKXsrIY7PSXYmEw463LK4J799cV fgK1FgQjJNifjkxWd7yeDJzFFfQl22DbFTzihk5TEJi5Kcvinx/OG5JENRPyFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681222238; a=rsa-sha256; cv=none; b=UNLKApZ6Lqwx4nSFnzMmVgY18c1yDbeuFlTH2fDbuQfLNWi7pEfVqJe3wqaYIn678w+Vq/ ZrTaQxmU1zGE86feXW+HHV25LrJdzEgPcokUHC7MGr+UuvaBfu/AGBAo1qlC/V2DKB8E/O tn5EBZ8+eIcGsvckHsPlRPeMYggVoOuDZsvHYo8jeFJKcf9u01dwaFGnfdJcvAIgPwKR0b 5wkqKTmLH8SfUNFmgcjTgGoiPqAVzczxcn1IGIvctGWpAYzdiXPeKjWCPUpFgwy80rPC+z Y1+BvsVr5HvLiyhr8/xSy7wLlmb7dFbA0QZHInjEd3RfRf4US+ZUuwu9bXQydQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pwnms6JLszLP2; Tue, 11 Apr 2023 14:10:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33BEAbFM091100; Tue, 11 Apr 2023 14:10:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33BEAbM6091099; Tue, 11 Apr 2023 14:10:37 GMT (envelope-from git) Date: Tue, 11 Apr 2023 14:10:37 GMT Message-Id: <202304111410.33BEAbM6091099@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f22bd73428dd - stable/13 - libdtrace: Do not set SHF_ALLOC on SUNW_dof relocation sections List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f22bd73428ddff199ee3f4554df2bf761bed5aba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f22bd73428ddff199ee3f4554df2bf761bed5aba commit f22bd73428ddff199ee3f4554df2bf761bed5aba Author: Mark Johnston AuthorDate: 2023-04-04 15:21:51 +0000 Commit: Mark Johnston CommitDate: 2023-04-11 14:10:24 +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 (cherry picked from commit 27f35b7dd418a82cf2f5bb618bd4bb7e81253f3a) --- 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 927b4415409d..d95b11501b17 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c @@ -572,7 +572,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; @@ -715,7 +715,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;