diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2022-12-21 18:49:23 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2023-05-03 00:25:48 +0000 |
| commit | 58b9432c405b6542cf33e1b57ff87365180b4da7 (patch) | |
| tree | b1b51f148ee742a0f98fb10740c2d4825c6b4a19 /sys/conf | |
| parent | 6ddbd237cc8055037162ed4a0ef47779ad553b0c (diff) | |
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)
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files | 4 | ||||
| -rw-r--r-- | sys/conf/kern.mk | 2 |
2 files changed, 4 insertions, 2 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 |