From nobody Fri May 26 08:48:08 2023 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 4QSJV11XLZz4WRmp; Fri, 26 May 2023 08:48:09 +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 4QSJV10jbLz4Cm1; Fri, 26 May 2023 08:48:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685090889; 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=prxp6KLkJn88/cJTmk/VwS+kl/L5TpE1mhFIbuPNmEw=; b=XAsQUzgfPuLhMRmta7uV1rGWSDfAlg1+xt4qv5rCC6JLI8HN4JSbqfH6IfvVrKyqPy2cLw QvpP1m+hy7TysHBmnHGpG1guNdURCtaqILEsCdDeGwInQc3LQ14plcwUAUdPZ1nrVRSMcE jdpZhUkR6GmKAyWejr5EmURMFpt3rvCg1IibOWPDrDozkAQSl7y8CG+D8fpNBSk86b7RJV Zd/eipVtHO2JW5U6Y31QWphGPaZAoCK8BIe3eUMqVPa0zQMvFRRx/42bszEuqhcds8aROX 5GLTTNLWHMjuSAf7xXZ5ApsjJWzPigbCWmWGC7FQdxFY2drfaFzljqUpXN2VrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685090889; 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=prxp6KLkJn88/cJTmk/VwS+kl/L5TpE1mhFIbuPNmEw=; b=PnOgwptIhyv7huyOoPLtI7SlXOgRkZU8RA2jtlzlrnYtR8OvFIArfWnqtljJfiY8KhzeHl TqhRil7PTy+5N7rjtdvsNAPvk0zYcCpQvIZ2508xmGifj3Lccq7/j2RVKDsuTu3xcTn+Tp zU0wCSaCEv1nkowOi8/hKI7cfaPFRt6gkfJ09wegL2BOxoDuANBetqvYjV/VJLcd7qQUEI yUv7wvvEi7G/+atTeFXfXvXBF/tRsIQsSIFw7arhjpeFeyGYLUifsb/CRm7mtqUvOCRLJ4 /QQNkqAaPYejkLFFX6kGr+Fs2K7sEDQY8f7k7rudAA2u35l65rU3zRj073Mpzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685090889; a=rsa-sha256; cv=none; b=VuKSStRVSwQYQPhAoyHmo952xuzTutY7PBYyI433LKuQuxjr/iM4deZ/oihM1tmnyynisj 6J7N5eel5aREqM799b110tXlS9mT3/zqApOU8x6r9dijBbQGfR4BOna+ahaiQIskx3QEjF 5rGjuoaVA0gs4A0DXr2JppHTQ0nfjqCTb3JQODteU4HhnIHWU+btQIgHTS4B9bdLXDIwU5 YuBs/ECV9rRYGyC5bwRua/r1kKuF68Rg4OBPOBuJT3XqrH43pLkaR75R/mny0VmCmWnDps B/QMtB5ObxnJHAmwqcXB32mrkcsqmrDkwLMffnjLPUiGUx4A8JmM96sSokGrNw== 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 4QSJV06vpVz118Y; Fri, 26 May 2023 08:48:08 +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 34Q8m8HO078123; Fri, 26 May 2023 08:48:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34Q8m8xC078122; Fri, 26 May 2023 08:48:08 GMT (envelope-from git) Date: Fri, 26 May 2023 08:48:08 GMT Message-Id: <202305260848.34Q8m8xC078122@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: 9374af1b21e2 - stable/13 - Update -ftrivial-auto-var-init flags for clang >= 16 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 9374af1b21e2b87e44050569ad9779d7146467ce Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=9374af1b21e2b87e44050569ad9779d7146467ce commit 9374af1b21e2b87e44050569ad9779d7146467ce Author: Dimitry Andric AuthorDate: 2023-05-23 17:40:36 +0000 Commit: Dimitry Andric CommitDate: 2023-05-26 08:42:24 +0000 Update -ftrivial-auto-var-init flags for clang >= 16 As of clang 16, the -ftrivial-auto-var-init=zero option no longer needs -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang to enable the option. Only add it for older clang versions. PR: 271047 Reviewed by: emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D40208 (cherry picked from commit 3006f6df025f3afd0fb3cca1b820cdac1f1ed4c9) --- share/mk/bsd.lib.mk | 14 ++++++++------ share/mk/bsd.prog.mk | 14 ++++++++------ sys/conf/kern.mk | 6 ++++-- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 684a3df108fa..5cd5663e1ca7 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -95,19 +95,21 @@ LDFLAGS+= -Wl,-zretpolineplt # Initialize stack variables on function entry .if ${MK_INIT_ALL_ZERO} == "yes" .if ${COMPILER_FEATURES:Minit-all} -CFLAGS+= -ftrivial-auto-var-init=zero \ - -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang -CXXFLAGS+= -ftrivial-auto-var-init=zero \ - -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang +CFLAGS+= -ftrivial-auto-var-init=zero +CXXFLAGS+= -ftrivial-auto-var-init=zero +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 160000 +CFLAGS+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang +CXXFLAGS+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang +.endif .else -.warning InitAll (zeros) requested but not support by compiler +.warning InitAll (zeros) requested but not supported by compiler .endif .elif ${MK_INIT_ALL_PATTERN} == "yes" .if ${COMPILER_FEATURES:Minit-all} CFLAGS+= -ftrivial-auto-var-init=pattern CXXFLAGS+= -ftrivial-auto-var-init=pattern .else -.warning InitAll (pattern) requested but not support by compiler +.warning InitAll (pattern) requested but not supported by compiler .endif .endif diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index a55c2fd103fd..3b9b3277a241 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -70,19 +70,21 @@ LDFLAGS+= -Wl,-zretpolineplt # Initialize stack variables on function entry .if ${MK_INIT_ALL_ZERO} == "yes" .if ${COMPILER_FEATURES:Minit-all} -CFLAGS+= -ftrivial-auto-var-init=zero \ - -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang -CXXFLAGS+= -ftrivial-auto-var-init=zero \ - -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang +CFLAGS+= -ftrivial-auto-var-init=zero +CXXFLAGS+= -ftrivial-auto-var-init=zero +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 160000 +CFLAGS+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang +CXXFLAGS+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang +.endif .else -.warning InitAll (zeros) requested but not support by compiler +.warning InitAll (zeros) requested but not supported by compiler .endif .elif ${MK_INIT_ALL_PATTERN} == "yes" .if ${COMPILER_FEATURES:Minit-all} CFLAGS+= -ftrivial-auto-var-init=pattern CXXFLAGS+= -ftrivial-auto-var-init=pattern .else -.warning InitAll (pattern) requested but not support by compiler +.warning InitAll (pattern) requested but not supported by compiler .endif .endif diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index 25c6ad8d87ac..a79cc5a5ed60 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -266,8 +266,10 @@ CFLAGS+= -mretpoline # .if ${MK_INIT_ALL_ZERO} == "yes" .if ${COMPILER_FEATURES:Minit-all} -CFLAGS+= -ftrivial-auto-var-init=zero \ - -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang +CFLAGS+= -ftrivial-auto-var-init=zero +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 160000 +CFLAGS+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang +.endif .else .warning InitAll (zeros) requested but not support by compiler .endif