From nobody Wed May 03 00:30:04 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 4Q9yWw5V3lz48NcM; Wed, 3 May 2023 00:30:04 +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 4Q9yWw4mvTz3p47; Wed, 3 May 2023 00:30:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683073804; 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=J4SN+9VwQIBDqbWLlYQB+ab2r1lgN6QBj3x2EXcbuFk=; b=GstPrKTqvnnGp+ziLz9MzQ5VtojTtN9zjNrwiWmLLBPjNabEw6lIyWCjjWmNoUz7+R4IS5 X+ETOSLH0X7eUiTOyi+WRID7ZEBRfb253BL+MgOf7gbHRsIz6vT3xlWM9v3EXA+LdTyshl QxFhRC+fpt/5ZETziXUaG/bEG8yvvyy806fT63sXxwc48T9/nZjbIoO0I0xBcz6QHViZxE vBYvxSfB6KkL+wFWreZC/BtdJyko7FzjWIx/XhghxAiVUBC1l2atC8kvB2C7A2aOc9XoxZ q4SBayiY7WSrWeRJJ8Zu3wn+sokmSfhEFF3bv05Z5w77tTnU4C9QyCSXAo08jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683073804; 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=J4SN+9VwQIBDqbWLlYQB+ab2r1lgN6QBj3x2EXcbuFk=; b=b9G5xaxK6sgbf8X+N/4kl+lMcNp0EfrKGYtDGtUvbJsBiIaW65JpovBUutTtzNTUpneDze TXZIO2iUUtbLyNM0ueAGNMvQANqtJ134PT8mSuRgft6fXkl2twiE9TmkhBomtCOvr6lLan BD6PB14BXgeLagMJrxmCHgk+uB2gbIVw/+t6j9V038OU3JY0qoH316uz/Xm4k4OFZHaiHa fySY/E0efvgshX7z+4MRHc0iES2CCACfA98MdNU6ZOjhLcY0lObZ4IBL+iyV0lLJJwIxti yz3iex+QgIa+SEMSAcUHIFvCjq37l5MXe6pxhBmG9W5J310hCPPuSqiVVhXUxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683073804; a=rsa-sha256; cv=none; b=EXvOjii5+6M4qii9d5wMqGjXql0JKtOlRU1ll3XmWv5Gaw39rIj1mtZa7oP2+0PJZ5uwBp Yu000ijMb1vl6i7LY0hOkk3xTzPdylH4v1l/UoCjNkNLTl/h/tMo4oW9I1zfR+Vcdg5jZL IRotiImFQPupxYao0tdI5DWyFPiJNlBYyiQnt0FPOnFs4ErAKiRVSdgTWWktrK02YRzbny GWnCFH+4etVQDu1lDgrN0x2ZV14/humGPQqpGnX65bGTShrST+b8ek3+gGPUKKGdx1bL1d QkmowlAP40MndD2fQT2yfAQa5seC+Kt/VdP+r7Y7FVPVquwwnPipN5JBxwJVBQ== 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 4Q9yWw3WyHz18X1; Wed, 3 May 2023 00:30:04 +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 3430U4kp074933; Wed, 3 May 2023 00:30:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3430U4Mf074930; Wed, 3 May 2023 00:30:04 GMT (envelope-from git) Date: Wed, 3 May 2023 00:30:04 GMT Message-Id: <202305030030.3430U4Mf074930@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: 58b9432c405b - stable/13 - zfs: Fix build with GCC 12. 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: 58b9432c405b6542cf33e1b57ff87365180b4da7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=58b9432c405b6542cf33e1b57ff87365180b4da7 commit 58b9432c405b6542cf33e1b57ff87365180b4da7 Author: John Baldwin AuthorDate: 2022-12-21 18:49:23 +0000 Commit: John Baldwin CommitDate: 2023-05-03 00:25:48 +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 (cherry picked from commit 2e08e4b75ea1080c224a33baf62199d893dc322d) --- 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 5546925bccd8..7c90279a261f 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}" +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}" @@ -196,7 +196,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 d37d80793929..47f4b5c48243 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -94,6 +94,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 6321db2381d8..9259a5f7e182 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -292,10 +292,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