summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authorkamil <kamil@NetBSD.org>2019-05-22 08:31:25 +0000
committerkamil <kamil@NetBSD.org>2019-05-22 08:31:25 +0000
commitdc20b626cf1a02526218ea55f904d99202ae9b78 (patch)
tree2f4e02e80effaedab2f451df6c3b9353f2cff907 /sys/arch/amd64
parent6236218b29d67341579ca2e376ab0ce4d65c54d9 (diff)
Allow to use KCOV + kASan together
Stop instrumenting KCOV files with kASan and the other way around. This fixes booting of the setup of using them together. In theory the checks could be more fine grained, however there is no good reason (except extra DIAGNISTIC) for running a kernel sanitizer without kernel coverage. Patch by <R3x>
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/conf/Makefile.amd644
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index 0cc2088aa9c..af71b0627e4 100644
--- a/sys/arch/amd64/conf/Makefile.amd64
+++ b/sys/arch/amd64/conf/Makefile.amd64
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.76 2019/02/24 08:02:45 maxv Exp $
+# $NetBSD: Makefile.amd64,v 1.77 2019/05/22 08:31:25 kamil Exp $
# Makefile for NetBSD
#
@@ -54,7 +54,7 @@ KASANFLAGS= -fsanitize=kernel-address \
--param asan-globals=1 --param asan-stack=1 \
-fsanitize-address-use-after-scope \
-fasan-shadow-offset=0xDFFF900000000000
-.for f in subr_asan.c
+.for f in subr_asan.c subr_kcov.c subr_lwp_specificdata.c subr_specificdata.c
KASANFLAGS.${f}= # empty
.endfor
CFLAGS+= ${KASANFLAGS.${.IMPSRC:T}:U${KASANFLAGS}}