From nobody Tue Sep 30 21:14:40 2025 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 4cbrRP113Rz69LvH; Tue, 30 Sep 2025 21:14:41 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cbrRN5msrz3t5H; Tue, 30 Sep 2025 21:14:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759266880; 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=th/neJ0sbqbCa1OKuDqoR3QkmhjdvQDQ+ccWUFLkl9E=; b=PQQq16ZHMA978prOWSCZOnJnRKq09blOSf2/zc57ZBp/Q3UlAmC5JWzJ+48SeqY0+YL3Xe lTv278mZ4EdkXArw8dJwRrL37b3dtmwrPJzQcwrQJOh+V6R3Zz9wiWfxEq/PvPFEqhZTBq yL8WTNT3ucyffcYkNfuzxNp2bfYxQaQsyG3UK5sQEbXyY2/DxoqxZxLfuXBebQf/ICVxrv LpJOv6bMtL/DMIWMLmFGSNdfPl3hZmdg758glX4PBALcKY2RcWZkiWlUVUi+f0ZfUFTgfl VJPmT28aAaOGb/6NVSbKvj34yltExtpO9YTn01wvbcOFf/lILpFJaDZ4DYzzPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759266880; 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=th/neJ0sbqbCa1OKuDqoR3QkmhjdvQDQ+ccWUFLkl9E=; b=Z+G/0O9BZaU7V3uiafXhWnEyeIio7bqgeujn7eRF0sbvRLovsIGTT6EdjTqP9Wa6ZPfcS/ PtHlukSl0oVAhoMlrU9dHWWEBOtAJijWJMygQabCViqji1xaaFZRplvDu59p3SjaWsR98N DQ97kkOHQEXP/tH6pzxYqJvcv6t/lh+6cMRx7GmjeUIAy9AP2QKzKaV3KG+oKj51gquqTS iX/SLHPzm7CKhMyofHklxQqbypawsVVzcKUR43ifr6lxlzD5B3LF74nQsYsyRQxUQsccut zndqi4qIA5a8BS5SpA4wiJTdGT8c6uueBOcY6R5i2vvJo9rFU86A5SfgND7vzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759266880; a=rsa-sha256; cv=none; b=G3JF4sUuJVBa2gH25yVR5zl/wKgdyJgrYqfGwKH7lronAzcUMg06+/WUekGx5AyNbifdtB ctoxTnXTgI/SZfDUwqLg2qvgTb08eOdQx11CTHriuIOTwkMpyLv+tR6MK6CbEUzrrTqOQZ uBGSOUDOcx95QbkgskBfmydqR2cY0akLlzHLxoe5C6acBv18SGVwf3GamNx8pzD9ooLgcR EVxyVGHe5JudIj//zFM/Cx+aAEJrl5Mv6hKgJi317F0MKXW/KetNAdAigpHTYX1fGzBu1a DYwT326EUF3vTQ8F5ESSGZnABpy66Kps+TG9uIWYo5XB9FaD/OzGa1KIgxR52w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cbrRN5K7SztSP; Tue, 30 Sep 2025 21:14:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58ULEedG010361; Tue, 30 Sep 2025 21:14:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58ULEeVw010358; Tue, 30 Sep 2025 21:14:40 GMT (envelope-from git) Date: Tue, 30 Sep 2025 21:14:40 GMT Message-Id: <202509302114.58ULEeVw010358@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: c89e5c0bfca6 - stable/14 - share/mk: Substitute reproducible prefixes in dwarf info 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: c89e5c0bfca639f39735572ee518e11f30ed8b20 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c89e5c0bfca639f39735572ee518e11f30ed8b20 commit c89e5c0bfca639f39735572ee518e11f30ed8b20 Author: Mark Johnston AuthorDate: 2025-08-21 14:06:34 +0000 Commit: Mark Johnston CommitDate: 2025-09-30 21:14:29 +0000 share/mk: Substitute reproducible prefixes in dwarf info Ensure that worlds/releases built from different source paths are reproducible. Currently they are not since src and obj paths are embedded in DWARF info. There are some uses of __FILE__ in the src tree as well, and they are similarly handled by this change. Use /usr/src and /usr/obj as the canonical src and obj paths when WITH_REPRODUCIBLE_BUILD is defined. Define a DEBUG_PREFIX variable which is used to ask the compiler to substitute paths in output files using -ffile-prefix-map. Compat builds (i.e., lib32) complicate things since they override OBJROOT to point to obj-${compat} but still refer to headers from the native objroot (e.g., llvm headers). MFC after: 1 month Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D50951 (cherry picked from commit 4f81c42fbd76e25c9fe696fa08296b79c55fbf09) --- share/mk/bsd.debug.mk | 22 ++++++++++++++++++++++ share/mk/bsd.opts.mk | 1 + 2 files changed, 23 insertions(+) diff --git a/share/mk/bsd.debug.mk b/share/mk/bsd.debug.mk index fc80bc103061..cf2fb4356aef 100644 --- a/share/mk/bsd.debug.mk +++ b/share/mk/bsd.debug.mk @@ -13,6 +13,28 @@ CFLAGS+= -DNDEBUG MK_WERROR= no .endif +# If reproducible build mode is enabled, map the root of the source +# directory to /usr/src and the root of the object directory to +# /usr/obj. +.if ${MK_REPRODUCIBLE_BUILD} != "no" && !defined(DEBUG_PREFIX) +.if defined(SRCTOP) +DEBUG_PREFIX+= ${SRCTOP:S,/$,,}=/usr/src +.endif +.if defined(OBJROOT) +# Strip off compat subdirectories, e.g., /usr/obj/usr/src/amd64.amd64/obj-lib32 +# becomes /usr/obj/usr/src/amd64.amd64, since object files compiled there might +# refer to something outside the root. +DEBUG_PREFIX+= ${OBJROOT:S,/$,,:C,/obj-[^/]*$,,}=/usr/obj +.endif +.endif + +.if defined(DEBUG_PREFIX) +.for map in ${DEBUG_PREFIX} +CFLAGS+= -ffile-prefix-map=${map} +CXXFLAGS+= -ffile-prefix-map=${map} +.endfor +.endif + .if defined(DEBUG_FLAGS) CFLAGS+=${DEBUG_FLAGS} CXXFLAGS+=${DEBUG_FLAGS} diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk index b4761333d8c5..b56afb89a44d 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -80,6 +80,7 @@ __DEFAULT_NO_OPTIONS = \ INIT_ALL_ZERO \ INSTALL_AS_USER \ PROFILE \ + REPRODUCIBLE_BUILD \ RETPOLINE \ STALE_STAGED \ UBSAN