From nobody Mon Nov 03 20:29:49 2025 X-Original-To: dev-commits-src-branches@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 4d0jqx513Hz6FjFG; Mon, 03 Nov 2025 20:29:49 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0jqx1YHvz3Kj3; Mon, 03 Nov 2025 20:29:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201789; 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=7UqnnLBN34Z4FlbkdgkYMmDTTrvGGZRHsXXGWHckv0E=; b=QV8TVOu37pZUajtyt1NBsmW8wcb5yFh6u3+11IUT24pCmvDl1w/3ZLMxAOYdb5s5kHeJtj KWD+YiM3+hIh8Ndr4oOIsCwsA2UUDGwMa/WXgOKSC3URTYDKYncp9qGde/q8tO9fC+ryAE UZxX5TtOBsShGgdC7t2lbGkp4f1ei05gULPP7Riw55OTxhviZJQMGaFzl0t6tW5OLA63pq pFnpc2znb1PVy9XdqSpAGHMOtsZYCe1cV/ALr1X5Gr3KZIAJ72ODDmYyx6x9T0ifcAuZsv AUJC4haWP8zPO8vgL+Q7m7EAqq2+rpnAD5cLZLcupnhOmH3UuQMTPw6sQ6F/MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201789; 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=7UqnnLBN34Z4FlbkdgkYMmDTTrvGGZRHsXXGWHckv0E=; b=dF77vEVhhMS8rGft2fyQ6yoD+Ey3q087BXWGk+KSNGVvGTpV0Ywgv/IRB4BR8oFv9/AEgE oWpM5eyfoG132MEWaXWRFGU9djP/0MmNMrXZyDoDmGCZ4jfWPVpSMRj/8xDtYtWucAmE+S ajnvdPt5hINjlFbaK8YoSTVR4IGJvaP4HduU0QN7M3Glf2vQfPlMuDZsBwOVvnuchMEYgL 0Yq9qctmqN6BDRFL+jxCniuc9IAvfhxxF681kcA7m8SMlM4jwDwU3GFUmlYDxAhmCQc03A UyS1xjQ282zLMK5I6dYULOXMCO0l7asszLOYN5bBPK4q3WKKpVBAcIhVUw4+Mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762201789; a=rsa-sha256; cv=none; b=aAq75Cuo5szHWJCTarf1pUFRtIsTRVBAkvMm5ir38fgs94QA47stjIlNt+trzWX3qoXRjF dt/YDzGo+IK4AWAMSiGkRzmgYI8YeOICvTiunOsyc9RZlJ+2+/DRDbXV9VPjF5jk43APXb X9GrT0i5ZMSRL6bBJ1nsoKkC4q5v6xewSCCztDl/DN2ipCYYwM7jTU80dmt5+M2BUvCy0Y Z8GwSsWXL5pSLmcEwW+o4PJ0kk9BS9DQ6efxConoW9LAdA+inGrlnVjDXtR6uYPUAq9BkC b3eFk2Z2xt/Sd9hcom3+xrRa3Iddzw2Y17a3H0nihYWSEiDqKekIIfHkHLdgeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d0jqx18ZKz9sN; Mon, 03 Nov 2025 20:29:49 +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 5A3KTnLA051191; Mon, 3 Nov 2025 20:29:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3KTnrY051188; Mon, 3 Nov 2025 20:29:49 GMT (envelope-from git) Date: Mon, 3 Nov 2025 20:29:49 GMT Message-Id: <202511032029.5A3KTnrY051188@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 6bbf1d23e2b5 - releng/15.0 - bsd.prog.mk: Skip warnings if compiler.mk was not included List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 6bbf1d23e2b5bfbe4ae854390b1aaec8714dfb87 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6bbf1d23e2b5bfbe4ae854390b1aaec8714dfb87 commit 6bbf1d23e2b5bfbe4ae854390b1aaec8714dfb87 Author: Ed Maste AuthorDate: 2025-10-31 15:53:42 +0000 Commit: Colin Percival CommitDate: 2025-11-03 20:29:11 +0000 bsd.prog.mk: Skip warnings if compiler.mk was not included We emit a warning if src.conf options WITH_RETPOLINE or INIT_ALL are in use, and the compiler or linker does not support the feature. For targets like `cleandir` we skip including bsd.compiler.mk, which leaves COMPILER_FEATURES unset and spurious warnings were emitted in early buildworld stages, if these options are in use. Commit 0837b2ebd570 ("pkg: Die if make -V BRANCH fails") added -W to usr.sbin/pkg's make flags, causing it to exit on warnings. As a result buildworld failed when these src.conf options were in use. Clean this up by omitting the warning if the magic _NO_INCLUDE_COMPILERMK flag is set, which indicates that COMPILER_FEATURES is not set. Approved by: re (cperciva) Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53501 (cherry picked from commit e4f2a350955406ffd58dd3f0bb7610df0f36d647) (cherry picked from commit 1471af5110fc3bb6b1f1548e056f1717fb844ffd) --- share/mk/bsd.prog.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 10e1c177e2b2..5697845079e2 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -49,9 +49,11 @@ CXXFLAGS+= -mretpoline LDFLAGS+= -Wl,-zretpolineplt .endif .else +.if !defined(_NO_INCLUDE_COMPILERMK) .warning Retpoline requested but not supported by compiler or linker .endif .endif +.endif # LLD sensibly defaults to -znoexecstack, so do the same for BFD LDFLAGS.bfd+= -Wl,-znoexecstack .if ${MK_BRANCH_PROTECTION} != "no" @@ -71,9 +73,11 @@ CFLAGS+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clan CXXFLAGS+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang .endif .else +.if !defined(_NO_INCLUDE_COMPILERMK) .warning INIT_ALL (${OPT_INIT_ALL}) requested but not supported by compiler .endif .endif +.endif # Zero used registers on return (mitigate some ROP) .if ${MK_ZEROREGS} != "no"