aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/openzfs/module/Makefile.bsd
diff options
context:
space:
mode:
authorMatt Macy <mmacy@FreeBSD.org>2021-01-07 23:27:17 +0000
committerMatt Macy <mmacy@FreeBSD.org>2021-01-08 00:55:59 +0000
commit7877fdebeeb35fad1cbbafce22598b1bdf97c786 (patch)
tree10ccc0bab059d6f48a221045b92416fc347fe784 /sys/contrib/openzfs/module/Makefile.bsd
parent84089de83e79a0f748c6e22b1aacb59156e153d2 (diff)
downloadsrc-7877fdebeeb35fad1cbbafce22598b1bdf97c786.tar.gz
src-7877fdebeeb35fad1cbbafce22598b1bdf97c786.zip
OpenZFS merge main-gf11b09
- add dRAID support - fix duplicate close handling - fix memory leak in prefetch - fix problem with SIMD benchmarking on FreeBSD boot ...
Diffstat (limited to 'sys/contrib/openzfs/module/Makefile.bsd')
-rw-r--r--sys/contrib/openzfs/module/Makefile.bsd39
1 files changed, 24 insertions, 15 deletions
diff --git a/sys/contrib/openzfs/module/Makefile.bsd b/sys/contrib/openzfs/module/Makefile.bsd
index 4feb9e1eaf0c..e7cddcc5bb5e 100644
--- a/sys/contrib/openzfs/module/Makefile.bsd
+++ b/sys/contrib/openzfs/module/Makefile.bsd
@@ -24,7 +24,6 @@ KMOD= openzfs
CFLAGS+= -I${.OBJDIR:H}/include
CFLAGS+= -I${INCDIR}
-CFLAGS+= -I${INCDIR}/spl
CFLAGS+= -I${INCDIR}/os/freebsd
CFLAGS+= -I${INCDIR}/os/freebsd/spl
CFLAGS+= -I${INCDIR}/os/freebsd/zfs
@@ -40,7 +39,13 @@ CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_SSE2 -DHAVE_AVX512F -DHAVE_SSS
.endif
.if defined(WITH_DEBUG) && ${WITH_DEBUG} == "true"
-CFLAGS+= -DINVARIANTS -DWITNESS -g -O0 -DZFS_DEBUG -DOPENSOLARIS_WITNESS
+CFLAGS+= -DZFS_DEBUG -g
+.if defined(WITH_INVARIANTS) && ${WITH_INVARIANTS} == "true"
+ CFLAGS+= -DINVARIANTS -DWITNESS -DOPENSOLARIS_WITNESS
+.endif
+.if defined(WITH_O0) && ${WITH_O0} == "true"
+ CFLAGS+= -O0
+.endif
.else
CFLAGS += -DNDEBUG
.endif
@@ -102,9 +107,10 @@ SRCS+= nvpair.c \
#os/freebsd/spl
SRCS+= acl_common.c \
- btree.c \
callb.c \
list.c \
+ sha256c.c \
+ sha512c.c \
spl_acl.c \
spl_cmn_err.c \
spl_dtrace.c \
@@ -112,6 +118,7 @@ SRCS+= acl_common.c \
spl_kstat.c \
spl_misc.c \
spl_policy.c \
+ spl_procfs_list.c \
spl_string.c \
spl_sunddi.c \
spl_sysevent.c \
@@ -119,11 +126,8 @@ SRCS+= acl_common.c \
spl_uio.c \
spl_vfs.c \
spl_vm.c \
- spl_zone.c \
- sha256c.c \
- sha512c.c \
- spl_procfs_list.c \
- spl_zlib.c
+ spl_zlib.c \
+ spl_zone.c
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \
@@ -133,6 +137,7 @@ SRCS+= spl_atomic.c
#os/freebsd/zfs
SRCS+= abd_os.c \
+ arc_os.c \
crypto_os.c \
dmu_os.c \
hkdf.c \
@@ -140,17 +145,16 @@ SRCS+= abd_os.c \
spa_os.c \
sysctl_os.c \
vdev_file.c \
- vdev_label_os.c \
vdev_geom.c \
+ vdev_label_os.c \
zfs_acl.c \
zfs_ctldir.c \
+ zfs_debug.c \
zfs_dir.c \
zfs_ioctl_compat.c \
zfs_ioctl_os.c \
- zfs_log.c \
- zfs_replay.c \
zfs_vfsops.c \
- zfs_vnops.c \
+ zfs_vnops_os.c \
zfs_znode.c \
zio_crypt.c \
zvol_os.c
@@ -178,10 +182,10 @@ SRCS+= zfeature_common.c \
SRCS+= abd.c \
aggsum.c \
arc.c \
- arc_os.c \
blkptr.c \
bplist.c \
bpobj.c \
+ btree.c \
cityhash.c \
dbuf.c \
dbuf_stats.c \
@@ -245,6 +249,8 @@ SRCS+= abd.c \
unique.c \
vdev.c \
vdev_cache.c \
+ vdev_draid.c \
+ vdev_draid_rand.c \
vdev_indirect.c \
vdev_indirect_births.c \
vdev_indirect_mapping.c \
@@ -276,16 +282,18 @@ SRCS+= abd.c \
zcp_synctask.c \
zfeature.c \
zfs_byteswap.c \
- zfs_debug.c \
zfs_file_os.c \
zfs_fm.c \
zfs_fuid.c \
zfs_ioctl.c \
+ zfs_log.c \
zfs_onexit.c \
zfs_quota.c \
zfs_ratelimit.c \
+ zfs_replay.c \
zfs_rlock.c \
zfs_sa.c \
+ zfs_vnops.c \
zil.c \
zio.c \
zio_checksum.c \
@@ -323,7 +331,7 @@ CFLAGS.spl_vm.c= -Wno-cast-qual
CFLAGS.spl_zlib.c= -Wno-cast-qual
CFLAGS.abd.c= -Wno-cast-qual
CFLAGS.zfs_log.c= -Wno-cast-qual
-CFLAGS.zfs_vnops.c= -Wno-pointer-arith
+CFLAGS.zfs_vnops_os.c= -Wno-pointer-arith
CFLAGS.u8_textprep.c= -Wno-cast-qual
CFLAGS.zfs_fletcher.c= -Wno-cast-qual -Wno-pointer-arith
CFLAGS.zfs_fletcher_intel.c= -Wno-cast-qual -Wno-pointer-arith
@@ -341,6 +349,7 @@ CFLAGS.lz4.c= -Wno-cast-qual
CFLAGS.spa.c= -Wno-cast-qual
CFLAGS.spa_misc.c= -Wno-cast-qual
CFLAGS.sysctl_os.c= -include ../zfs_config.h
+CFLAGS.vdev_draid.c= -Wno-cast-qual
CFLAGS.vdev_raidz.c= -Wno-cast-qual
CFLAGS.vdev_raidz_math.c= -Wno-cast-qual
CFLAGS.vdev_raidz_math_scalar.c= -Wno-cast-qual