From nobody Tue Oct 08 08:39:36 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 4XN8Zw6zbtz5Z9K6; Tue, 08 Oct 2024 08:39:36 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XN8Zw6K2cz4Ffx; Tue, 8 Oct 2024 08:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728376776; 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=gkJv0g3e2lGo7PxnO1ERbxERyP2jpKn22JDdDgrckzM=; b=Og18qgrc9FfqUTiLOUOP0S+KF6GVbAAzBcSFkXknSSf1IPeac/HmUTg0wpJYT9TBSwuZxm f1Z/8I/ZrYk6yL6Y/mn2LmhwUVcu7eSeT5/DNJjLA1JZtvJpL3Y3EKZlCjRlcsbXy56Rgy nzUFLBG4UzTHhHeR/5yd1HmEL958+vqQbKO3cchTxWN+W41VH+VaGMsGnwxK3P+ecegkuT gqywPO0z8Yxev4/Q1uAEf8joghNrK62b7a/RkylRRukZBIupsVVHWxUVpM4p9wuA2cjc4L EhOQdCJRNe1Hg6bnq/57nfc3dw9oY8d+DbOYdbNLWbOO+08EC0u+o+28wPgSyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728376776; 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=gkJv0g3e2lGo7PxnO1ERbxERyP2jpKn22JDdDgrckzM=; b=yNGDZjHTgLOWuLJcNnoKhiut9CgBiErRpnAJPAA3mPRv407yEyoIZ12ZTJ3EUGa9p6k/qu PpE6aejJa/1tJYmpCVy5RroPhg2hdLCGhmKR2dfIqsCLKCEpVI3enM19dDnONGQfZGz/DH O/d9davckB5wBr8zfK4WZXCTErZOMPXv6JXWFKXTUqpguHkNTqJxyitz8Ho8mTi7nJyWpC GwtV274t8MrLvZC5WTrB9HfVbQwrixJNYxhM3gtRG9Rep2brIsfY99DOIS8WIE7/4CS4JP qN0QqlqHCTq1GEwTa5NMr+LR15tOGOT/saSV2rsTw5oCD3Wkbi9D9NRGkMx+rA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728376776; a=rsa-sha256; cv=none; b=QWLV1ex8MY3MnbID5saYZMJGWwPpI7+fQaVQtzacRvSOzOC5GKDDwrrQ8vuQbUUeS3PL9g qxpcADNgT1/AT0jyfAjTtpeUD1nk4u96r9BmSUu+iHUGLyD3gx/Oo6k3en4ABR5TV7VJ+1 AakHeq1tVzEvgjKaKsyBxNhnHVMWTxG2WvakPz1AE+NvJ5zr8I1sLo3yLvCkUP1KNijrhD Subse5wZ5y72RIOKFDKNda8u8JXKoeTM5Mswl49+P5fPBkIHLdIjnlszn1FNArSfoeCg3B s52R2uY3VJT2hoLji1+dFYgmm8ZbPCVlW5o2zi6SVx5rTnhm6p7fGr5QwB1ooQ== 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 4XN8Zw5l7rzNr3; Tue, 8 Oct 2024 08:39:36 +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 4988dacB004797; Tue, 8 Oct 2024 08:39:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4988da0D004794; Tue, 8 Oct 2024 08:39:36 GMT (envelope-from git) Date: Tue, 8 Oct 2024 08:39:36 GMT Message-Id: <202410080839.4988da0D004794@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 342240c6e025 - stable/14 - Bump lld LINKER_FREEBSD_VERSION for reproducibility fix 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 342240c6e0257e798efc12c7e6aa9cdc6b22c9e1 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=342240c6e0257e798efc12c7e6aa9cdc6b22c9e1 commit 342240c6e0257e798efc12c7e6aa9cdc6b22c9e1 Author: Dimitry Andric AuthorDate: 2024-09-22 17:12:01 +0000 Commit: Dimitry Andric CommitDate: 2024-10-08 08:37:14 +0000 Bump lld LINKER_FREEBSD_VERSION for reproducibility fix The upstream fix to make lld output for our EFI loaders reproducible again was committed in 54521a2ff93a. Bump lld's LINKER_FREEBSD_VERSION to be able to check this in the EFI loader Makefile. MFC after: 3 days (cherry picked from commit f97c7fdc59d252cc8611968ffac541d4b8342b8b) --- lib/clang/include/lld/Common/Version.inc | 2 +- stand/efi/loader/Makefile | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc index 20f5fbe6e124..2e9f3e4e6330 100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@ -1,4 +1,4 @@ // Local identifier in __FreeBSD_version style -#define LLD_FREEBSD_VERSION 1400006 +#define LLD_FREEBSD_VERSION 1400007 #define LLD_VERSION_STRING "18.1.6 (FreeBSD llvmorg-18.1.6-0-g1118c2e05e67-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index 02563681c3e8..d2b872e0ca99 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -106,10 +106,17 @@ LDFLAGS+= -Wl,-T${LDSCRIPT},-Bsymbolic,-znotext -pie LDFLAGS+= -Wl,--no-dynamic-linker .endif +.include + +.if ${LINKER_TYPE} == "lld" && \ + (${LINKER_FREEBSD_VERSION} < 1400007 || \ + (${LINKER_FREEBSD_VERSION} >= 1500000 && \ + ${LINKER_FREEBSD_VERSION} < 1500001)) # When lld is using multiple threads, which it does by default, it can # result in non-reproducible output with the custom linker script. Work # around this by disabling threading. -LDFLAGS.lld+= -Wl,--threads=1 +LDFLAGS+= -Wl,--threads=1 +.endif CLEANFILES+= ${LOADER}.efi