From nobody Thu Mar 07 00:34:59 2024 X-Original-To: dev-commits-src-all@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 4Tqr0z6YD3z5Djpc; Thu, 7 Mar 2024 00:34:59 +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 4Tqr0z5pjdz4l0l; Thu, 7 Mar 2024 00:34:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709771699; 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=XBCWZShjWDbrvZrzink8jMhtbsZJJL9+vhwZYw+ohCg=; b=Skzn/2vOgrjzF6hXsCtenUlI19ir6XhpaDUXyI12L1enyujZ5b2XB8gRWh4Y/KYhkxo6LA HRTj90xVYmuISpMJ5XA95dq05Rje+06J/NBmQxuBlt3ZveWQw+QkdJcMlfllde6UIpzCmM 18A1YSLJwm4AYeSqx3bjEZCGC+800UStKM2Mp7JG2u52QB+8aIUBh3knqgXT8GoP+YKMY9 JGQ2w0QHHuW06tBmEtcWWJo5QeAzA6yvrLOd/tPk9Es7GIajyFT4Yl/KheMwFK9/cDUxs4 O/IGhqB47sbcTqp6He6IHIgRMLd7J+w/wSy8IAQhKN0KqZ9DvFgV4wZ/ylSu1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709771699; a=rsa-sha256; cv=none; b=qC4A1p3LjYccJKWWdElhui69toO1dSV7q4ZVnL1eC65W3AyhY0rG5awWQI1rNSUHKO32Nt n95RDoVgoOaiO7138PqZx8a5421udymv7rQ8r3hNYD2MLmwkQPPmnybx9sp8sM7IUvqo0Y 0FI+VnT5LPAVpWIPjjs6oBflt9dAE/yL2yyOBuHMBlX/qsQRywP/YAlDODsa+UfgIJz3k/ PMj+pQkEGwrGCLcjR0sxkjf2FXPCAJjTMBMyFXnJq3qerpaoQHZY44SYZut8Nm9Eo1ydZe ivnRql0gE53l/E9V0NLR72f9/VxukanyIRQ0Iq6J32JK1Qy0cQeKB5vstSZkag== 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=1709771699; 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=XBCWZShjWDbrvZrzink8jMhtbsZJJL9+vhwZYw+ohCg=; b=oXaS9YTQMJhVzS6RQNpSK8PNkqKsjPXR12y64xMuVPJxieOdG2s7bqn+sGO4Te1N+6N1GF hxETGzDJdUPhw5yz91+4Tj+W0N9zz2p2ilu0ZtIrurZIyqAx2gK4OElb+yFh5hmre81sjY Qsq+rzdT/K1pWNQAqvvi0ciFGpXj6UmZEQgQ+dDgVgSb2s5+BwSCsSE0yBoqWgSe/oGgn9 CH7PGbi/fFR/b6ppiORRx5YXiOhP00FkC+1ANtVHu33+H4ERVYtOND+BJ7lO3zW1qqvvtr 1aWCMHmup1VIn3J1CXx8WQuQtQnLYh952of4bhQQkeTIuOntBElw0R+uJLJKdQ== 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 4Tqr0z5P7Rz1BQr; Thu, 7 Mar 2024 00:34:59 +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 4270YxEq055160; Thu, 7 Mar 2024 00:34:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4270YxYo055157; Thu, 7 Mar 2024 00:34:59 GMT (envelope-from git) Date: Thu, 7 Mar 2024 00:34:59 GMT Message-Id: <202403070034.4270YxYo055157@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: 5a98473132e6 - stable/14 - rtld: unconditionally generate map file during build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 5a98473132e61babb8885dc3c3feda2766d02ddd Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5a98473132e61babb8885dc3c3feda2766d02ddd commit 5a98473132e61babb8885dc3c3feda2766d02ddd Author: Konstantin Belousov AuthorDate: 2024-02-28 00:04:37 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-07 00:34:34 +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 fe7e39a6b788..cc40b839024f 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -73,6 +73,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: