From nobody Sun Sep 22 17:13:20 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 4XBXl46tFwz5WNZw; Sun, 22 Sep 2024 17:13:20 +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 4XBXl45sPXz4Hm7; Sun, 22 Sep 2024 17:13:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727025200; 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=24DFdQPMnGrEqETGNiPKPStQ50g+EGXTSsieF2z91BY=; b=tTcmQrUlqqLqbcek/fR9h4l5KJzzT5TaqfRN2s+XDbVFfpSDNEJYUIB5KxYyNwOjqqhfmt mGqmYSTaH9M33ASunkkZCux68iZ4YCejn13XsVI+SoKDIPpgfVulvcuce2HmP10JqO2kO7 80Lad/tIQN5jmyIB6MTjAQeuQuxlW6yvU7wONx1lrVjBguinaLbsgw6FHeJhFuLjljfDsm 1rEepniKw+JCUR8Aa7WOERIkv7cB/WqzcRg5AXxJW6Do5dI1/cCcFOOO3whvFGFsvxSZou i/G0TYV0q6Zpgedk/e/xDIcT6dNvqtSZsBy2l+KJD86UP7cJzyuL3kvHRyXiSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727025200; a=rsa-sha256; cv=none; b=TZwQoFQLJwxknWStH/gMGWcmeTf42u1Ei0uH7653olUCnBT+2n4Pr8pRQ6hd/3tQH400M4 DizpyZ6z5sranZ+aulYgT5IbTBepfn1OQlz1UlQQ4JeBmzt7UkC/T0hXSoVee2RtF6kn+n LuDt3pM4qwcM+36D7e+NYYreXa1RrKBUK/xoprstirKtjeA/VwyQ/UGRYQoLwXfh+qjsW4 fcpbzXnXTGyXuaL02sF+b4jYVjWdXpIZMl79eQ6oeQUONDH/Q+12zeuvp/eY312aXXzpHs US5BbBwlBBmtDdkpdyY2divQ0fpUhUVFxJmkiH7CCMSzG2HRVOoqKfEgzSrwuA== 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=1727025200; 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=24DFdQPMnGrEqETGNiPKPStQ50g+EGXTSsieF2z91BY=; b=mouBWDI/ihOdMDP6TdYW+tsbGwSUWnGFy7zKuzxxSR6wZoelU6Jjd8GrQ7GfO6JP9inMXv cNo6TzQsldpHmEeVfstUfOc8jNnQFH/tfmGacFx20l2jF/bSw1UY/0JeaouQ+vpl0127yk V/1D7Oe4EfgUMr1t3ucHax+6hkOV8BNqRk4D7ztJ9Y5Xl+v+gnJs//geRNYW3uBbI05xrr jIrFdH0TAmXsoavfGVIbHejxjQeO+ruaH3w6tQDyiU90DgnHeBBKo1C/51c5VmaZLkK1Jg KClLWA/ylEw72QD70IOX4S6MoCclzLrLguDW6NdYjaMwFCaa95OIU6lpIvCq+A== 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 4XBXl45Sx8z1PZl; Sun, 22 Sep 2024 17:13:20 +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 48MHDK3i084515; Sun, 22 Sep 2024 17:13:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48MHDKTD084512; Sun, 22 Sep 2024 17:13:20 GMT (envelope-from git) Date: Sun, 22 Sep 2024 17:13:20 GMT Message-Id: <202409221713.48MHDKTD084512@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: f97c7fdc59d2 - main - 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/main X-Git-Reftype: branch X-Git-Commit: f97c7fdc59d252cc8611968ffac541d4b8342b8b Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f97c7fdc59d252cc8611968ffac541d4b8342b8b commit f97c7fdc59d252cc8611968ffac541d4b8342b8b Author: Dimitry Andric AuthorDate: 2024-09-22 17:12:01 +0000 Commit: Dimitry Andric CommitDate: 2024-09-22 17:12:38 +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 --- lib/clang/include/lld/Common/Version.inc | 2 +- stand/efi/loader/Makefile | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc index 1de090a4b4d0..86232cbccf4c 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 1500000 +#define LLD_FREEBSD_VERSION 1500001 #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 ae25910da2c5..e9d29e5a219e 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -111,10 +111,14 @@ LDFLAGS+= -Wl,-T${LDSCRIPT},-Bsymbolic,-znotext -pie LDFLAGS+= -Wl,--no-dynamic-linker .endif +.include + +.if ${LINKER_TYPE} == "lld" && ${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