From nobody Wed Dec 21 18:49:45 2022 X-Original-To: dev-commits-src-all@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 4NcjD93zLlz1Gl7M; Wed, 21 Dec 2022 18:49:45 +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 4NcjD92RLWz465m; Wed, 21 Dec 2022 18:49:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671648585; 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=PeXCGGXn8XMZQt5KMWywaAFs9ZbfgEAUg0ZjLf4DI/8=; b=MazmjuF6OXdGZeH7YSfAOFKpLF6QWHGq1OUxHT0RPt/4ScOJxW7ifpS/gtkikaNvt0sLqS Fx4ttBvV2jYi0QaK+Z2sigTXaOEPqjKwNlUhrJybSy5Xxd1Vx7SHw3948+s/Xmx4PMdn2c A3KnXS/a5emKfl7cGhT0bA8LjIWTBb35d6HMnAnl4ymqDZFyFctZLQqANGqM7+iVWWipwp akeGPG/YJwr4Xxp0rWpsqZdCJuSgTju+2fANsObWZzXCpSUcuiH0DJG/3FxmY1DEEJ/D9e MZ6SWBB+XpU1GR/Djet76Ohsppck0ps9NHARDtTSVZemAMnPIfeFf4UY7wl+KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671648585; 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=PeXCGGXn8XMZQt5KMWywaAFs9ZbfgEAUg0ZjLf4DI/8=; b=fLEbH8OexEgPhkEEsN2BLnw2f2drCGLrv+7YMLYBkL4g4A05pcgSs+BQhSl5XxUf+DrA3o eoRgXZ0auKlhQs9SHxAGN8pNxsCTPclrkfNNrFjF2X/1Rc4/wK+aWxRLm9b8uNv/llkGj5 LaF4H7hTyxic1njmjMWsqyhG4JfLKqo5qCVPRmpCLJoqQ6RJGbeXjmyXa45yE9Q/XmCdBJ s+Cys1fU/xLU2zgzAUkU5GJX2NE6X90zre1aA8VnSYAdQrkWOZYb7vy3k8rKccN1DuadUh mBY7uGGM3J/3isYu6Q+mJ5itYmXWytX8abBbHvsnzUCHCkHmXWo57gJp5KPezw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671648585; a=rsa-sha256; cv=none; b=wfPnEP7wv3fbw6c8BD5Qy5Hqy6RoP2N/jG78hlAs0nsJGYhLnnJjJo/UWmDYxzXDISDsn3 3t8TEwLVIkaz/oqyLLx/KmVGNz3MEwi6F256VgGi3tTh/nggyP5mQFHVnq9kGBhKj/zjVr oG4QqUcToWRcGtvJrFRTG1o467zo+heMLzYfgPXdP1QT4hkAjcjUjni/0rlUwCYTZ3ZuvI nbAmm6MHKiaZCceOj1Vrwr0BYMCtf+kWXKYyx2lHzQSfamyMMpM1j/94XAKt5wZOY7j87q Q7NlCCJLa8U19DtFSApaqUZelR7I7axhH9A3iFA6LZEzhNIukY8yPJZWU8DGnA== 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 4NcjD91XTqzQP3; Wed, 21 Dec 2022 18:49:45 +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 2BLInjan084644; Wed, 21 Dec 2022 18:49:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BLInjuQ084643; Wed, 21 Dec 2022 18:49:45 GMT (envelope-from git) Date: Wed, 21 Dec 2022 18:49:45 GMT Message-Id: <202212211849.2BLInjuQ084643@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 2e08e4b75ea1 - main - zfs: Fix build with GCC 12. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 2e08e4b75ea1080c224a33baf62199d893dc322d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2e08e4b75ea1080c224a33baf62199d893dc322d commit 2e08e4b75ea1080c224a33baf62199d893dc322d Author: John Baldwin AuthorDate: 2022-12-21 18:49:23 +0000 Commit: John Baldwin CommitDate: 2022-12-21 18:49:23 +0000 zfs: Fix build with GCC 12. Silence -Winfinite-recursion for ldo.c in lua and -Wstringop-overread for nvpair.c. Reviewed by: mm Differential Revision: https://reviews.freebsd.org/D37631 --- sys/conf/files | 4 ++-- sys/conf/kern.mk | 2 ++ sys/modules/zfs/Makefile | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 75644d689ff9..9e6456519259 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -172,7 +172,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}" +contrib/openzfs/module/lua/ldo.c optional zfs compile-with "${ZFS_C} ${NO_WINFINTE_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}" @@ -191,7 +191,7 @@ contrib/openzfs/module/lua/lzio.c optional zfs compile-with "${ZFS_C}" # zfs nvpair support contrib/openzfs/module/nvpair/fnvpair.c optional zfs compile-with "${ZFS_C}" -contrib/openzfs/module/nvpair/nvpair.c optional zfs compile-with "${ZFS_RPC_C}" +contrib/openzfs/module/nvpair/nvpair.c optional zfs compile-with "${ZFS_RPC_C} ${NO_WSTRINGOP_OVERREAD}" contrib/openzfs/module/nvpair/nvpair_alloc_fixed.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/nvpair/nvpair_alloc_spl.c optional zfs compile-with "${ZFS_C}" diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index 65cf86375cce..682463e8e0d5 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -81,6 +81,8 @@ CWARNEXTRA+= -Wno-address-of-packed-member \ CWARNEXTRA+= -Wno-error=nonnull \ -Wno-dangling-pointer \ -Wno-zero-length-bounds +NO_WINFINTE_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 71affa119f0b..510d3affb0d7 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -348,10 +348,11 @@ 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.lobject.c= -Wno-cast-qual CFLAGS.ltable.c= -Wno-cast-qual CFLAGS.lvm.c= -Wno-cast-qual -CFLAGS.nvpair.c= -Wno-cast-qual -DHAVE_RPC_TYPES +CFLAGS.nvpair.c= -Wno-cast-qual -DHAVE_RPC_TYPES ${NO_WSTRINGOP_OVERREAD} CFLAGS.spl_string.c= -Wno-cast-qual CFLAGS.spl_vm.c= -Wno-cast-qual CFLAGS.spl_zlib.c= -Wno-cast-qual