From nobody Mon Nov 03 12:00:26 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 4d0VXB6lYKz6Fbth; Mon, 03 Nov 2025 12:00:26 +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 4d0VXB5j40z44sX; Mon, 03 Nov 2025 12:00:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762171226; 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=M5n4tH9g63Lrku1gdY9S9bUtJJAN41yj8cDpbEF3+h4=; b=xdjZESK1rZ+cxF6tUfSvX4Xi8kZPO+xNbiMt/F36P+TD0OOv5+kxKg+b13LiJTbuvBF9Qr LzKHTrM5LpxS0QWk1YeaSl9Jvnc9maY0FMe1A070513YH+w8E48atChqM9LSWCAXsDunn5 q/nYH+3n1aP/w8WpUJbDD1fYsup5GGnJsK8XmQx9HvyBumdJhIwn+d9wQKK7utwuVnjDz6 ckjVHiO5ktF/SRxQPzb/4dOax8a1gQxcDRWhGcbDWZ7uwgib8bo2ItweJR/C1V3XgE6aPI pJUXAXGv+FbSgFod8RWM3cnXqo8AbdTMjunrPeu2otOyu3I2Ttr+OWwYEVWw4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762171226; 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=M5n4tH9g63Lrku1gdY9S9bUtJJAN41yj8cDpbEF3+h4=; b=izWUOU9OewJkXovEQDMYsmjD5A0xKNQ3PBmOWXu0vAnl30NNhuQRWDtIaU5dCappbKWazd n1yWFuOlvwTeSCS11cEKec+/mca98D8+iMAv2jnNWCcQ9SPPxk5Nj16OdR/xHVija93pc0 OmQ6YbHnAKuMXEvLrG1eItT818KI03NUMTPPN/iDzCDwn9kuXtxCcMyALP80zUPC9Vx21R xQmsYFZKiv3x9M95jIf8+oFtZL9tL0+/iTLJAvD0kVAv3JqxFiPNakYepfRuXSHCREMwNN vAADZ414IF2Y9Xada4yfHBAwFiTVmyRvFexfmCZ0Y1qGmXoZH4guJ1sEGxM0JQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762171226; a=rsa-sha256; cv=none; b=e2uZ0nkJ49PbvvTkjSURulbmyxaYGay0Ab1LjJ+5z67tBN6ZteQntQZwjYMXWVZWi+Y1hQ uIvAiWf6E4PfnctaNjcQIR4tlMey3LrR2gKk/3yz3yayjuxeGiXPLZUfrS33bpLs6+bfrS LMdboyhKdUpKIygd4ZXt6hSJf7/wEBaZTZAsFBPVMqWb9A5nB3V2FOULMSTgBO3S1icTc4 cxVNxn/GXccNBaRY6nLrRHPnWYAIVOWIxlKeI1MHq4dB9knMm+SKw/WvHD27MqgN9ZCFlh 4gETz77D7bsGVjd0ikEruJngeXP+YlddczhiGnEGA6NRloFhplOxjBB3wIQ/DA== 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 4d0VXB57Wlz18Ps; Mon, 03 Nov 2025 12:00:26 +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 5A3C0QWf001596; Mon, 3 Nov 2025 12:00:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3C0QtQ001593; Mon, 3 Nov 2025 12:00:26 GMT (envelope-from git) Date: Mon, 3 Nov 2025 12:00:26 GMT Message-Id: <202511031200.5A3C0QtQ001593@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 1471af5110fc - stable/15 - 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1471af5110fc3bb6b1f1548e056f1717fb844ffd Auto-Submitted: auto-generated The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1471af5110fc3bb6b1f1548e056f1717fb844ffd commit 1471af5110fc3bb6b1f1548e056f1717fb844ffd Author: Ed Maste AuthorDate: 2025-10-31 15:53:42 +0000 Commit: Ed Maste CommitDate: 2025-11-03 12:00:07 +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. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53501 (cherry picked from commit e4f2a350955406ffd58dd3f0bb7610df0f36d647) --- 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"