From nobody Wed May 03 00:29:26 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 4Q9yWB3wmgz48N7F; Wed, 3 May 2023 00:29: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q9yWB3P57z3lNZ; Wed, 3 May 2023 00:29:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683073766; 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=Ih4twoVq2tpR60SiDlDVdHedC7pDZKJdsxoJyovuVUM=; b=xoIg/LmHv3Mnca4GS7kMmLfu2evBwEmJ1XPopPaYAZr8KCGdIAb6EJFzoOaTHTnWtGGkMo OMBofgWEpMQiXLPUdMcTqL4vtBOhw9GVwSHKgRZ5vOeA4oaGGFg3WA2VoWmBiGWMReJULE gV6OjyxC4JNOE1IdOMhiLQ87EC0L3Eo5RKEwMiG+6sgyQCIBEpfN3ZBtxTPQoEX2mcwD3D P/5c47r2XagSxorcmpSZk91fJh3H7oYTGbGThb+aa7kRF9BmbeNspgBAYD+6OJJSkcnwOO HmHU4ELU4jybMn29tYjtRlYky4CXfiLP2BHsKFOlOUm3KmmkloUJfp7zoZR6Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683073766; 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=Ih4twoVq2tpR60SiDlDVdHedC7pDZKJdsxoJyovuVUM=; b=utELGyAXeIwCVvlWiG1P2swZs69SD3lk22G276q1p5Tc8Rdk4H5pVtMLQqMSAl3hbQZqtd jeo0KPQnZf5yTfBYbWazWYULbv8lED0YAzRzMa7wvHzpfz0K3SEoY3RJlsZsDiSrl05uu8 xz5WBw9xb0S/HIpHhoY7OcW9U8HQIiKskKI7i1H0R4E8+KULzIRwsldwHoONP30P4sIQbD qftcmd0mQH6xqy+5LEzFpsG6o+THu3ob6Pea/bFA0fbGBqpg4FMDuPhE8IjS0kBAy8Ovt2 Y4eaRxdYmR0K4SUGNPeEoQY7ZxSJb99/TMzPGuRT4V2QmXlTU+yyEQOk6fUQqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683073766; a=rsa-sha256; cv=none; b=sRTKKij24hsVvF5kkzz3wovc5/E/y19Czn8fdTEwmDjiw2VhqTtLRUvHOPoL+MPtQ29JO4 yr5FkDNzbDLGhmjGk2wJCYXNIbTK1n/SIVPIQzbLmEZmMsCoy/87kBo3LANmGdKinA+Aaq 9UUrah94+z1YDmVTXsjaKZm5H2iXEgs1Y6Jo61pIfCe2jKOMtpKKb4BskN8kCTgZ7vYYtt RyOn44ZqPorgpNJxVYyfafeoNJwDSgVqjVknlCTl0Z52aX88IexdzAc8sGa7pWTvorxY/X 59nB4tNu6DYAxg4ICvqnzMipanrOqqaVoQ/lzAzi19FhjBRzUEz/mmvLt6FFMA== 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 4Q9yWB2SQ7z189D; Wed, 3 May 2023 00:29:26 +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 3430TQkr071742; Wed, 3 May 2023 00:29:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3430TQYi071741; Wed, 3 May 2023 00:29:26 GMT (envelope-from git) Date: Wed, 3 May 2023 00:29:26 GMT Message-Id: <202305030029.3430TQYi071741@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 773bb4c45cac - stable/13 - Use __freebsd_kprintf__ with GCC 12+ similar to clang. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 773bb4c45cacfb2bd654cf3896f7875c5ee3f62c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=773bb4c45cacfb2bd654cf3896f7875c5ee3f62c commit 773bb4c45cacfb2bd654cf3896f7875c5ee3f62c Author: John Baldwin AuthorDate: 2022-11-22 16:36:12 +0000 Commit: John Baldwin CommitDate: 2023-05-02 23:41:50 +0000 Use __freebsd_kprintf__ with GCC 12+ similar to clang. (cherry picked from commit 5115511ed4941684bc82b8a3c4b95e9a8931b940) --- share/mk/bsd.sys.mk | 3 ++- sys/conf/kern.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index cb4399610d0e..ad359727c32f 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -238,7 +238,8 @@ CWARNFLAGS+= -Wno-system-headers .endif # gcc # How to handle FreeBSD custom printf format specifiers. -.if ${COMPILER_TYPE} == "clang" +.if ${COMPILER_TYPE} == "clang" || \ + (${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 120100) FORMAT_EXTENSIONS= -D__printf__=__freebsd_kprintf__ .else FORMAT_EXTENSIONS= -fformat-extensions diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index 87e788666efb..53eb49c95c4b 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -101,7 +101,8 @@ CWARNFLAGS+= -Wno-format-zero-length # to be disabled. WARNING: format checking is disabled in this case. .if ${MK_FORMAT_EXTENSIONS} == "no" FORMAT_EXTENSIONS= -Wno-format -.elif ${COMPILER_TYPE} == "clang" +.elif ${COMPILER_TYPE} == "clang" || \ + (${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 120100) FORMAT_EXTENSIONS= -D__printf__=__freebsd_kprintf__ .else FORMAT_EXTENSIONS= -fformat-extensions