From nobody Wed May 03 00:30:05 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 4Q9yWx6VcSz48NTT; Wed, 3 May 2023 00:30:05 +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 4Q9yWx4pDJz3p01; Wed, 3 May 2023 00:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683073805; 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=5DhhBiW9/4gWFtnegYY9hj5jZG4PFyMCoRwz/BXLM4c=; b=V4aMehMaVGdpkOHWWcOY1E/Ghgjp+TPI63jo12XN5yf61fKZhP4+B0O6OVv9+TWYR1MF1B JPGZxxUhITtz6LgPz2kFpUxAtyqmnTZX5xz28zBPvBunUjo5Xyf5JxkURl3Bq8dE6jzYxR yp1lF+WWn2jC0Ttqr5tkZZGseWs64jQLwlULLHyeIN7tOJtD7jttxHUtWUa5CUgPMwAkd1 zshx3dLoiInY9erQx98OaKz2aST5tANR0Ozwcc+195dY3upEAJpetc7OqVnIZsI92DOlMO eh0E+1SR8EgTn61swp7M9btHnXJUitcPQP7RNtjrz95aohT8VM9D8DBfhOnMIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683073805; 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=5DhhBiW9/4gWFtnegYY9hj5jZG4PFyMCoRwz/BXLM4c=; b=idy2bxHRzJRqY0p9Mw7wGU4tHo93CQAeCdJVvCAGhHD1gJuQHLIg7AWFe9bBTjyncWAxi6 1/XfdYHc1Hg7zoPQxM6O8slR8U8QUNx7hVk3m+BtnjbwI2dYCxkulsXiZ/Aj6wAz+1rYDW pqp50BMLDPQCTd+hFu8VJCytTurP+OjM4tJl9QnPL9uUKYS6q2pSydvB/kzDNsGRe5ApGk A59pyj9GVIjDJgpnq2T34FEAwuO5ugrd6MgqC/2oJiXP8cPjLHFjZjgptqeRLTYUMn/1k1 1LifW6OrPfLusjJVO9+K9maZ50q8x7jMkuDJYPtWgb7CxZhvfVg2cZYK/VgGOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683073805; a=rsa-sha256; cv=none; b=Nn+Z8DzPbS5UCNYTUYKahFG4DX8ZuxLSXz/mG6FklWlVi1jfwXVH/nFWJ5l0shE9JnPGZz 8U7hgIJhTdsta339/MVfocVBXvvg+3N+FpP0Bp9qcgW/mv8osF+XGShb88CHpknxdf2KUg +24u9CPFmCcYy2O5g/49WCnpBCcrL3M6oRPhqzL68weMQ48GtQJkQNti0RwLOZcBotqMSo yjgw87bH49b4kXWgX1olpBWuo8t4DkYD187ymccVCkz3c3sOkM0h6C4/HUVhGYkAH+L1tS Qb8KHRWqgvMvAEpRexCAdTx4A0r9MOI5JPMFRkc+6TpfNSjfkQSqqRT9uo5W3Q== 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 4Q9yWx3wC6z182j; Wed, 3 May 2023 00:30:05 +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 3430U5gh075188; Wed, 3 May 2023 00:30:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3430U5qd075186; Wed, 3 May 2023 00:30:05 GMT (envelope-from git) Date: Wed, 3 May 2023 00:30:05 GMT Message-Id: <202305030030.3430U5qd075186@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: ed3d14a5b0d0 - stable/13 - Fix spelling of NO_WINFINITE_RECURSION. 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: ed3d14a5b0d06ef856ad66627e8c8ebce4b73830 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ed3d14a5b0d06ef856ad66627e8c8ebce4b73830 commit ed3d14a5b0d06ef856ad66627e8c8ebce4b73830 Author: John Baldwin AuthorDate: 2022-12-21 22:45:29 +0000 Commit: John Baldwin CommitDate: 2023-05-03 00:25:58 +0000 Fix spelling of NO_WINFINITE_RECURSION. Reported by: dim Fixes: 2e08e4b75ea1 zfs: Fix build with GCC 12. (cherry picked from commit 3266131908914b3a359571dae75194fe6d330c1d) --- sys/conf/files | 2 +- sys/conf/kern.mk | 2 +- sys/modules/zfs/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 7c90279a261f..928289668166 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -177,7 +177,7 @@ contrib/openzfs/module/lua/lcompat.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/lua/lcorolib.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/lua/lctype.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/lua/ldebug.c optional zfs compile-with "${ZFS_C}" -contrib/openzfs/module/lua/ldo.c optional zfs compile-with "${ZFS_C} ${NO_WINFINTE_RECURSION}" +contrib/openzfs/module/lua/ldo.c optional zfs compile-with "${ZFS_C} ${NO_WINFINITE_RECURSION}" contrib/openzfs/module/lua/lfunc.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/lua/lgc.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/lua/llex.c optional zfs compile-with "${ZFS_C}" diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index 47f4b5c48243..25c6ad8d87ac 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -94,7 +94,7 @@ CWARNEXTRA+= -Wno-address-of-packed-member \ CWARNEXTRA+= -Wno-error=nonnull \ -Wno-dangling-pointer \ -Wno-zero-length-bounds -NO_WINFINTE_RECURSION= -Wno-infinite-recursion +NO_WINFINITE_RECURSION= -Wno-infinite-recursion NO_WSTRINGOP_OVERREAD= -Wno-stringop-overread .endif .endif diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index 9259a5f7e182..0cfc336aacb1 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -292,7 +292,7 @@ CFLAGS.gcc+= -Wno-pointer-to-int-cast CFLAGS.lapi.c= -Wno-cast-qual CFLAGS.lcompat.c= -Wno-cast-qual -CFLAGS.ldo.c= ${NO_WINFINTE_RECURSION} +CFLAGS.ldo.c= ${NO_WINFINITE_RECURSION} CFLAGS.lobject.c= -Wno-cast-qual CFLAGS.ltable.c= -Wno-cast-qual CFLAGS.lvm.c= -Wno-cast-qual