From nobody Sun Jul 17 18:39:13 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 4LmDQV13b0z4X0WX; Sun, 17 Jul 2022 18:39:14 +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 4LmDQV0XdPz46lh; Sun, 17 Jul 2022 18:39:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658083154; 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=Abm2jwpIViwT9JGPoOPT/T9goHJcy8gSpYqLv1DiEuU=; b=vP5BG34cgxFX1mhY2nkW9UBDUK6tRCzwKJmVt+E+vbvc4F4GCumNH9u15Yea/zor95Nj6W bAn6+Lt3G761ntHZR8dn3HGfHsnlz4VPI12ioNVd2UNU05HnH7/1Ml6MD4dE1TAkty9ykA L/eoP+fP/XCDaF7vZh+D7S0JYriIoXMh4f2yBv7TtFOUgwK1WDa1xMMxdz4ZkQ7wLaQK2c tICWEsKwoDVu9Q4yjqFZL5ShtoFaCbwQT7J8cukvzlaqutN5GJ43ztUR3xyZ/9i1/faoML o4tM0tYKQr3oFN9Er1eJM/PSBEmoj7gBwxcJV77eFuIosyUBhSnH4czS3fpLvA== 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 4LmDQT6bBvz18r9; Sun, 17 Jul 2022 18:39:13 +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 26HIdDbk098502; Sun, 17 Jul 2022 18:39:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26HIdDtD098501; Sun, 17 Jul 2022 18:39:13 GMT (envelope-from git) Date: Sun, 17 Jul 2022 18:39:13 GMT Message-Id: <202207171839.26HIdDtD098501@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: b9ba9906b869 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: b9ba9906b869e43533184e5239d0b62419dcc0fc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658083154; 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=Abm2jwpIViwT9JGPoOPT/T9goHJcy8gSpYqLv1DiEuU=; b=Cj6vIWNezzKQTyAa7v1UFBJAy8aLTN4yr8n9ZwZXwCsSBotoUAuFs8Zzt7DiGnD8FlEw9J JN0ZrdBWr8lYfnFDaJMs1wmcF0C6xuiZZcc9slYBPDp+TA0Ax6B4cbwVFcGTSBJYo+8qEx fPPkFwhu2cxOkJmPpZ5SJl9zw5TcfBejPPe5t5xV/FRuNwPkaPV2mGsuDtQhbTWuujMImp brmdZQ9IJG9k12W5X+NXrs+OsZpEHek9hQA9vEBnqJGH9n/pLvBPbm9obXnF/axa5WRLW0 2YjFeqFg/SIHQ+Au56stUicG5G5C3iByHA0scZlNGzF/qNqm6KRLaDRe7XFjZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658083154; a=rsa-sha256; cv=none; b=OTsL369StrwPXZZcRuDA/lAzHijSGxI6PLCBxAar5n+4OZ2OBlxDRiedhNcMCfGzN1Bu9C 44QBzdKOyiu2UHXaOr4EkysnIS6NX9pDAgYzu/KmrKuMs24yNTDg8VZfL87aVyNKdLO2H8 fGMQjxF7qUHypo5yMYLD4hZUM1kf5Kpv6wmdEIZJR2c+s9aKaljrxn/owdcPrX9IXFQfd3 jbQ7BMjE6YMEbHnGPYRus19CtM6R8Y8uVB0JgGAl9C4F6dOW8+fJIZkoYzZXP4Dhhc466h qDgghopVCXJBuBNknuyhqTMAOvRsWp+op8bQHacYQ4sUqWjeU6YhH/5gl9YbUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b9ba9906b869e43533184e5239d0b62419dcc0fc commit b9ba9906b869e43533184e5239d0b62419dcc0fc Author: Dimitry Andric AuthorDate: 2022-07-14 21:13:41 +0000 Commit: Dimitry Andric CommitDate: 2022-07-17 18:36:31 +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 (cherry picked from commit 93f5ab129a3d46f4f434a13306fc99f476456c00) --- Makefile.inc1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index cf135f6d9439..ab9510094049 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2300,9 +2300,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