Page MenuHomeFreeBSD
Files F102682559

D37631.diff
No OneTemporary
Actions

D37631.diff
View Options

diff --git a/sys/conf/files b/sys/conf/files
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -172,7 +172,7 @@
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 @@
# 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
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -81,6 +81,8 @@
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
--- a/sys/modules/zfs/Makefile
+++ b/sys/modules/zfs/Makefile
@@ -348,10 +348,11 @@
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

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 16, 7:39 PM (21 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14663595
Default Alt Text
D37631.diff (2 KB)

Event Timeline