From 692aa83d53f6039dfebae0b57ecaf6f858989b68 Mon Sep 17 00:00:00 2001 From: Matt Macy Date: Tue, 8 Sep 2020 17:47:30 +0000 Subject: [PATCH] ZFS: remove some extra defines When merging a number of defines that are needed in the standalone build made it in to the module makefile. Reported by: markj@ --- sys/modules/zfs/Makefile | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index e95cfdae287..dda324d6123 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -27,23 +27,14 @@ CFLAGS+= -include ${INCDIR}/os/freebsd/spl/sys/ccompile.h CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/static_ccompile.h CFLAGS+= -I${.CURDIR} -CFLAGS+= -D__KERNEL__ -DFREEBSD_NAMECACHE -DBUILDING_ZFS -D__BSD_VISIBLE=1 \ +CFLAGS+= -D__KERNEL__ -DFREEBSD_NAMECACHE -DBUILDING_ZFS \ -DHAVE_UIO_ZEROCOPY -DWITHOUT_NETDUMP -D__KERNEL -D_SYS_CONDVAR_H_ \ - -D_SYS_VMEM_H_ -DKDTRACE_HOOKS -DSMP -DIN_FREEBSD_BASE -DHAVE_KSID + -D_SYS_VMEM_H_ -DIN_FREEBSD_BASE -DHAVE_KSID .if ${MACHINE_ARCH} == "amd64" CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_SSE2 -DHAVE_AVX512F -DHAVE_AVX512BW -DHAVE_SSSE3 .endif -.if defined(WITH_VFS_DEBUG) && ${WITH_VFS_DEBUG} == "true" -# kernel must also be built with this option for this to work -CFLAGS+= -DDEBUG_VFS_LOCKS -.endif - -.if defined(WITH_GCOV) && ${WITH_GCOV} == "true" -CFLAGS+= -fprofile-arcs -ftest-coverage -.endif - .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \ ${MACHINE_ARCH} == "powerpcspe" || ${MACHINE_ARCH} == "arm" CFLAGS+= -DBITS_PER_LONG=32