Index: sys/conf/files
===================================================================
--- sys/conf/files
+++ sys/conf/files
@@ -3808,7 +3808,7 @@
 kern/kern_intr.c		standard
 kern/kern_jail.c		standard
 kern/kern_kcov.c		optional kcov			\
-	compile-with		"${NORMAL_C} -fno-sanitize=all"
+	compile-with		"${NORMAL_C} ${NO_SANITIZE_COVERAGE}"
 kern/kern_khelp.c		standard
 kern/kern_kthread.c		standard
 kern/kern_ktr.c			optional ktr
@@ -3884,7 +3884,7 @@
 kern/subr_compressor.c		standard \
 	compile-with "${NORMAL_C} -I$S/contrib/zstd/lib/freebsd"
 kern/subr_coverage.c		optional coverage \
-	compile-with		"${NORMAL_C} -fno-sanitize=all"
+	compile-with		"${NORMAL_C} ${NO_SANITIZE_COVERAGE}"
 kern/subr_counter.c		standard
 kern/subr_devstat.c		standard
 kern/subr_disk.c		standard
Index: sys/conf/kern.mk
===================================================================
--- sys/conf/kern.mk
+++ sys/conf/kern.mk
@@ -25,6 +25,7 @@
 NO_WSOMETIMES_UNINITIALIZED=	-Wno-error-sometimes-uninitialized
 NO_WCAST_QUAL=			-Wno-error-cast-qual
 NO_WTAUTOLOGICAL_POINTER_COMPARE= -Wno-tautological-pointer-compare
+NO_SANITIZE_COVERAGE=		-fno-sanitize-coverage=trace-pc,trace-cmp
 # Several other warnings which might be useful in some cases, but not severe
 # enough to error out the whole kernel build.  Display them anyway, so there is
 # some incentive to fix them eventually.
@@ -68,6 +69,11 @@
 .endif
 .if ${COMPILER_VERSION} >= 80000
 CWARNEXTRA+=	-Wno-error=packed-not-aligned
+.endif
+.if ${COMPILER_VERSION} >= 80100
+NO_SANITIZE_COVERAGE=	-fno-sanitize-coverage=trace-pc,trace-cmp
+.else
+NO_SANITIZE_COVERAGE=	-fno-sanitize-coverage=trace-pc
 .endif
 .else
 # For gcc 4.2, eliminate the too-often-wrong warnings about uninitialized vars.