From nobody Tue Oct 08 08:45:25 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 4XN8jd71DQz5Z9Qn; Tue, 08 Oct 2024 08:45:25 +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 4XN8jd5jtVz4GWl; Tue, 8 Oct 2024 08:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728377125; 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=32lgEsox5mQo1nAyWW7iIRz9DkOw8PQF7Iqy4TzMb5A=; b=hgbf+3bGoo2s906Q9UDtKQ5NpYhgEy3IXx7Q4nPcp0INtzRYCeyTHvO9SCOl6UujHARAGN s5GMoN6r/pvGZCS/CBgtMHPHlfp2s7XqwiZmAbbjqZAUyCkgEbstRplJbyRgJ/JNaX0Db/ lOrHSZXFAfNLWbmOe9krrRkQiDSwzhK5SUqaUwH05Yz3UuUQbXrFJTxrRfMvqPzL8lmCDw yJ5i5xyQ13DkucxU+8sAfM3iM6oD1i1zQMFKvOe6sedqsRo2Kaqj/jPtNn8ZwWlkiwBIdH 6faVkyiIZ2ZgNPfRZjVGoVW6h2NW3uDLBq4FFUBe5DbbbRdxOesdqQM3ojcZOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728377125; 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=32lgEsox5mQo1nAyWW7iIRz9DkOw8PQF7Iqy4TzMb5A=; b=uUYB+E2swvwfU5sOPrQipvsb05ola3ciV49vo4TI68BvxaVuSi/PcdF5mBJj8Z/5zsEUZJ KVt7sfILUCzrloi/Q2coKmtijeer2xhHrxTYVauuaTYu/o0thXAcsK0pryvh2zyPQF5mh9 dbP/EKX3+tkDDW2vbMDtNF+OZxxTSiuOsj2bujaZBtI9YgxDjgh6E8Uhdl6wWRXOF7+aL7 sF3ZuAytPLxKE5plcf+r9c+e6nzZyYHab4zaKFj3T4YmJA3qmzO6Nv95ZvkdvBDnYWBoLT 2V4QId/zln8ZB0vZQeeAjDzw6sLvPs6hVfkpxEdcpsWcg/Zc6CU3oOXS+lnp1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728377125; a=rsa-sha256; cv=none; b=ePaOlm6LNMFAD1pZAhMbii/NkpIgneEJpTnQdnDcmeW6Wpa0QjZ1D4WYBIpDwMOlDiim7I IQyH0p7rW7OKHSo8qObUcxNNbzH3uOZycnMAyuy1Q5OBdH4qV5ECpkc6Kx017Fd7KhshRM ZN+li23Gvq5Ufc9Xb4aFCrkJOQ+fa45ASsDQuT3Vpnm0pT6D8OoEGJwYDmfAMPmyeLCXJ1 +sPIB3PCdNLH6obkYp8g6JE3+5zvmILSiz5TMsN1Iu0CqDWO8qPw6hdKx0/0JafFMAnovB dJcwsE1VrvQE6+1Nec0LTmNuMw6oeKN0kdjmu3SN+NXuclkHjY/l7QvuAMvEvg== 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 4XN8jd52cCzP1L; Tue, 8 Oct 2024 08:45:25 +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 4988jPDT021655; Tue, 8 Oct 2024 08:45:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4988jPrt021652; Tue, 8 Oct 2024 08:45:25 GMT (envelope-from git) Date: Tue, 8 Oct 2024 08:45:25 GMT Message-Id: <202410080845.4988jPrt021652@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: 04393db00313 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 04393db0031382a3b2d7de037e862b33e3ea4bbe Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=04393db0031382a3b2d7de037e862b33e3ea4bbe commit 04393db0031382a3b2d7de037e862b33e3ea4bbe Author: Dimitry Andric AuthorDate: 2024-09-22 17:12:01 +0000 Commit: Dimitry Andric CommitDate: 2024-10-08 08:37:09 +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 c5503da655f9..a2cb643dd4c4 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -105,10 +105,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