From nobody Thu Mar 07 00:35:33 2024 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 4Tqr1d4Hqmz5DjxN; Thu, 7 Mar 2024 00:35:33 +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 4Tqr1d3pxLz4lPP; Thu, 7 Mar 2024 00:35:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709771733; 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=sPhDddUIvuPihwcz7dVr6hJ0lgGgqONMZV1loM2JVUU=; b=K457g2dHeEoLMw4Djr4JIJ6px7d7SAP2dVl/Y30mUnHnFRhUUEt8vPWxVqwygh2q5vMo6q Bo+xLQp6twBG+vVtvCUVrechjWsyeVx4Tt5QqDtcjVFaOid6YfuopIabg9W3qYeehZfTFo PESZucz3vZVQ9Acu38QQnH4lboG2LafnnbGjTK7uTjPMu4F5d/OXMKafyPxjvCJd4WCxOK ucCVjEW4pBEyZY82qws5ivm8d5mIkda9ai8sAuhYWiRnD8FDbR5tx4QT3eLx8nEoIuiAc6 PvcK3hBU0NfeNoJ6JvC55HMWliPu6DNRsm4u+OBfDwW+MRX5UfYGEG2KS0KeSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709771733; a=rsa-sha256; cv=none; b=HP62vLA2kUUzwe086dmLcUbE7s6LgtjN2JW6BtnT9eEantfRb4awVf/zMdAmtYU4VACJq0 g0JOAYl6YgJqGeu8BkXzLN/hlCUZyxbke+gcXLMIa/NezO+/HBSqPXRadnc/VGKUm6xTc1 kChazHWVsLB81a1qo2SGKEUto0IDSDy/GZIDRo++aQ9WcuBlq8qVYCDnGM80W+6lK2Azj7 yZ/pJNNcU2iF2+jpOawAEoJM+HsrcUk6myHxgJ6CK7V7rhN6j2dXIS9JZ+IAle54tmsa4u Pgd+x8+HmayNU/pjHIfY+A+5VLOctL8kzyy+kBkdO+4N0FI71Qj9tX9D2aYOTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709771733; 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=sPhDddUIvuPihwcz7dVr6hJ0lgGgqONMZV1loM2JVUU=; b=OSOHZFjIXYltsaoib3G8hUeKI0m64yooJE5N7tAfu/sXJ857jOiNq4hbYqANspflITVxgA hQPIKQ3aQMphxIYwyTBkCYCwTig7+rJ7sZgoUFFIeRy4LnJOG6kAeU84CtsnTczL36l5D1 VvmwE4JDDeLbgDG5Qi9P/3JganuoanhEQPz/lbbMaz1wX/WFkSPCSLVAlhgggf/eejvY/t GexIZ31atr35IDhSJsHUCMTO4+lqp4iHVZHEDxUNTkPEt1z+KJy3sYNNFemVZ+kpCtFw/5 R628ryVH6AgS5b/vV+NvvKEMzNwc+MIDagx+50QkLVVAPBrDsj/USM8VY/rnTQ== 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 4Tqr1d3QMYz1C49; Thu, 7 Mar 2024 00:35:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4270ZXAB055462; Thu, 7 Mar 2024 00:35:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4270ZXjk055459; Thu, 7 Mar 2024 00:35:33 GMT (envelope-from git) Date: Thu, 7 Mar 2024 00:35:33 GMT Message-Id: <202403070035.4270ZXjk055459@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: fd5a82ecd2a6 - stable/13 - rtld: unconditionally generate map file during build 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fd5a82ecd2a6f51dde00459854f92066b23c3be4 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fd5a82ecd2a6f51dde00459854f92066b23c3be4 commit fd5a82ecd2a6f51dde00459854f92066b23c3be4 Author: Konstantin Belousov AuthorDate: 2024-02-28 00:04:37 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-06 07:42:42 +0000 rtld: unconditionally generate map file during build (cherry picked from commit 799940154c70597a46627deb4d0b98e174b27b98) --- libexec/rtld-elf/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index b95adf82fe9b..def8bb513b3b 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -69,6 +69,12 @@ SYMBOL_MAPS+= ${RTLD_ELF_DIR}/${RTLD_ARCH}/Symbol.map .sinclude "${RTLD_ELF_DIR}/${RTLD_ARCH}/Makefile.inc" RTLD_ENTRY?= .rtld_start +# Always produce the map file so that may be inspected to confirm +# undesired code is not linked from libsys/libc. +MAPFILE= ld-elf.so.1.map +LDFLAGS+= -Wl,-Map=${MAPFILE} -Wl,--cref +CLEANFILES+= ${MAPFILE} + # Since moving rtld-elf to /libexec, we need to create a symlink. # Fixup the existing binary that's there so we can symlink over it. beforeinstall: