From nobody Thu Jul 14 21:14:30 2022 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 4LkS123mjhz4TBnP; Thu, 14 Jul 2022 21:14:30 +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 4LkS123FD8z3ddG; Thu, 14 Jul 2022 21:14:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657833270; 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=WQMNx0bfWiKkyT2gXqwOiMKh+47AwBo6wLU6c+BYbyg=; b=QVyAbLlbpwgGuMZcQ8ReYnEA7KO/vsxkO9007z9knfvzbUH1UBybKN4/2O0xG23CbEc/t4 dJEhAvz4O1iF6vOxDXlUqzUxFOfLxrohuckWv422ZqNqGs2XDF4fBCtsVbxe4eNttHWNK6 RhbrUgF52ny+Vs0ugMbjvKt2hD88d3NpnrJM9NWEcBHFwzHdObuaArEmZoajIj92wlZAx8 LQv4OdkyukDtZPev3w6Ew1JiTtKLWlpA4HRx9W9HQ0kavx/OBvOEu7z+1LHv42XKzFdg22 MNI8HMDcNhzqbPexIsl+L24MfE5Qu9TsDyfchnRLg17DtgePbgMbwnKV8h1EKA== 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 4LkS122GrGzHnd; Thu, 14 Jul 2022 21:14:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26ELEUOI070409; Thu, 14 Jul 2022 21:14:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26ELEU27070408; Thu, 14 Jul 2022 21:14:30 GMT (envelope-from git) Date: Thu, 14 Jul 2022 21:14:30 GMT Message-Id: <202207142114.26ELEU27070408@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: 93f5ab129a3d - main - Bootstrap crunchgen after removing -dc from linker invocation 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93f5ab129a3d46f4f434a13306fc99f476456c00 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657833270; 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=WQMNx0bfWiKkyT2gXqwOiMKh+47AwBo6wLU6c+BYbyg=; b=yoCklKkH0BnuLJA6+Ai8lBBlkK2sY/YmGwKSmXJKD86nsuvK/FEbuKrydZkpMNcXuJ9czn NDMv8nabfXsU3PwqbQ0BPLTA58JH22WkWj+S7O0hytHmpt5TUfFN1FCRoZeScUDTzUOx9d cVSNFSpmD/W/zr6O0UE4sODsEYyGUSAPK0AA3osWuqur3D6LhM0PE2fPd90VGVMjldJLGW lEYtVmZbGSuczMa3yWx8x7SINRMT9m3WTlilmdsdwe0DzBPj2u6OfYUoLMMunhkw8uxB6+ tHHjT7O8sGm2kcXp+hMAAybujA3qXDm6ejOyjJlsV+kR0P0oCZEGNlfmMg5eBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657833270; a=rsa-sha256; cv=none; b=JmuS3T9L8EVUonfo6HZxI2WMr3mViBixT+Omou/frWyNKW2w8lSnlijpz5xDCB8qkq7F1u FjY38jB4UfbmCkjEYVmi4W2ODF0pCtBHzjDRFzvfHd3jqp9CR9r0jn1M3jd13yAWJbGWVb 23DG+RZkn/dCMqCYOZzoaoVcmUczQLYrlXt4ZEFc2FJMWl/p7X12N7AUs+JNBLZdfUSWmc /5WNA7DeBUkVqVsZD8t2zpDoWK0xXJ0ZdqwSc3QgVpqKaSTUjm/ATJKO8Gic34+Wtc2zt8 xiV4dcexS06Q7z4v0JnkQah+F/yKaq9lJYGJfEOLGlkgZMshFrYcl0gHsZzHiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=93f5ab129a3d46f4f434a13306fc99f476456c00 commit 93f5ab129a3d46f4f434a13306fc99f476456c00 Author: Dimitry Andric AuthorDate: 2022-07-14 21:13:41 +0000 Commit: Dimitry Andric CommitDate: 2022-07-14 21:14:18 +0000 Bootstrap crunchgen after removing -dc from linker invocation In ec81497cc726 crunchgen was updated to remove -dc from the linker invocations in its generated makefile output, as this flag is no longer necessary, and is going to be an error with lld 15. Update the BOOTSTRAPPING conditions for copying the crunchgen binary from the host, or actually bootstrapping it when necessary. Since ec81497cc726 did not bump __FreeBSD_version, I have chosen the nearest values. Fixes: ec81497cc726 MFC after: 3 days --- Makefile.inc1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 1b3471bb1433..73bbba7fef54 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2307,9 +2307,10 @@ _crunchide= usr.sbin/crunch/crunchide _bootstrap_tools_links+=crunchide .endif -# 1300115: Higher WARNS fixes -.if ${BOOTSTRAPPING} < 1202502 || \ - (${BOOTSTRAPPING} > 1300000 && ${BOOTSTRAPPING} < 1300131) +# 1400052, 1300526, 1203507: Removed -dc from linker invocation +.if ${BOOTSTRAPPING} < 1203507 || \ + (${BOOTSTRAPPING} > 1300000 && ${BOOTSTRAPPING} < 1300526) || \ + (${BOOTSTRAPPING} > 1400000 && ${BOOTSTRAPPING} < 1400052) _crunchgen= usr.sbin/crunch/crunchgen .else _bootstrap_tools_links+=crunchgen