summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/conf/files14
-rw-r--r--sys/modules/xfs/Makefile9
2 files changed, 14 insertions, 9 deletions
diff --git a/sys/conf/files b/sys/conf/files
index e881a2a..48e8af2 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -3608,7 +3608,7 @@ xdr/xdr_reference.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl |
xdr/xdr_sizeof.c optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
#
gnu/fs/xfs/xfs_alloc.c optional xfs \
- compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" \
+ compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" \
warning "kernel contains GPL contaminated xfs filesystem"
gnu/fs/xfs/xfs_alloc_btree.c optional xfs \
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
@@ -3627,9 +3627,9 @@ gnu/fs/xfs/xfs_da_btree.c optional xfs \
gnu/fs/xfs/xfs_dir.c optional xfs \
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
gnu/fs/xfs/xfs_dir2.c optional xfs \
- compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+ compile-with "${NORMAL_C} ${NO_WARRAY_BOUNDS} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
gnu/fs/xfs/xfs_dir2_block.c optional xfs \
- compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+ compile-with "${NORMAL_C} ${NO_WARRAY_BOUNDS} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
gnu/fs/xfs/xfs_dir2_data.c optional xfs \
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
gnu/fs/xfs/xfs_dir2_leaf.c optional xfs \
@@ -3637,7 +3637,7 @@ gnu/fs/xfs/xfs_dir2_leaf.c optional xfs \
gnu/fs/xfs/xfs_dir2_node.c optional xfs \
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
gnu/fs/xfs/xfs_dir2_sf.c optional xfs \
- compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+ compile-with "${NORMAL_C} ${NO_WARRAY_BOUNDS} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
gnu/fs/xfs/xfs_dir2_trace.c optional xfs \
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
gnu/fs/xfs/xfs_dir_leaf.c optional xfs \
@@ -3685,7 +3685,7 @@ gnu/fs/xfs/xfs_trans_item.c optional xfs \
gnu/fs/xfs/xfs_utils.c optional xfs \
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
gnu/fs/xfs/xfs_vfsops.c optional xfs \
- compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+ compile-with "${NORMAL_C} ${NO_WFORMAT_SECURITY} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
gnu/fs/xfs/xfs_vnodeops.c optional xfs \
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
gnu/fs/xfs/xfs_rw.c optional xfs \
@@ -3715,9 +3715,9 @@ gnu/fs/xfs/FreeBSD/xfs_globals.c optional xfs \
gnu/fs/xfs/FreeBSD/xfs_dmistubs.c optional xfs \
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
gnu/fs/xfs/FreeBSD/xfs_super.c optional xfs \
- compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+ compile-with "${NORMAL_C} ${NO_WFORMAT_SECURITY} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
gnu/fs/xfs/FreeBSD/xfs_stats.c optional xfs \
- compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+ compile-with "${NORMAL_C} ${NO_WFORMAT_SECURITY} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
gnu/fs/xfs/FreeBSD/xfs_vfs.c optional xfs \
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
gnu/fs/xfs/FreeBSD/xfs_vnode.c optional xfs \
diff --git a/sys/modules/xfs/Makefile b/sys/modules/xfs/Makefile
index 7135019..c92d05f 100644
--- a/sys/modules/xfs/Makefile
+++ b/sys/modules/xfs/Makefile
@@ -6,8 +6,6 @@
KMOD= xfs
-WERROR=
-
SRCS = vnode_if.h \
xfs_alloc.c \
xfs_alloc_btree.c \
@@ -86,5 +84,12 @@ CFLAGS+= -I${.CURDIR}/../../gnu/fs/xfs/FreeBSD \
-I${.CURDIR}/../../gnu/fs/xfs/FreeBSD/support \
-I${.CURDIR}/../../gnu/fs/xfs
+CWARNFLAGS.xfs_alloc.c= ${NO_WSOMETIMES_UNINITIALIZED}
+CWARNFLAGS.xfs_dir2.c= ${NO_WARRAY_BOUNDS}
+CWARNFLAGS.xfs_dir2_block.c= ${NO_WARRAY_BOUNDS}
+CWARNFLAGS.xfs_dir2_sf.c= ${NO_WARRAY_BOUNDS}
CWARNFLAGS.xfs_ioctl.c= ${NO_WSELF_ASSIGN}
+CWARNFLAGS.xfs_stats.c= ${NO_WFORMAT_SECURITY}
+CWARNFLAGS.xfs_super.c= ${NO_WFORMAT_SECURITY}
+CWARNFLAGS.xfs_vfsops.c= ${NO_WFORMAT_SECURITY}
CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
OpenPOWER on IntegriCloud