Module Name:    src
Committed By:   maxv
Date:           Sat Apr  4 07:03:57 UTC 2020

Modified Files:
        src/share/mk: bsd.sys.mk
        src/sys/arch/amd64/conf: Makefile.amd64

Log Message:
KCOV doesn't depend on specificdata and cpu_intr_p() anymore, so drop
references.


To generate a diff of this commit:
cvs rdiff -u -r1.299 -r1.300 src/share/mk/bsd.sys.mk
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/amd64/conf/Makefile.amd64

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.299 src/share/mk/bsd.sys.mk:1.300
--- src/share/mk/bsd.sys.mk:1.299	Sat Feb  8 07:07:06 2020
+++ src/share/mk/bsd.sys.mk	Sat Apr  4 07:03:57 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.sys.mk,v 1.299 2020/02/08 07:07:06 maxv Exp $
+#	$NetBSD: bsd.sys.mk,v 1.300 2020/04/04 07:03:57 maxv Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -238,9 +238,7 @@ AFLAGS+=	${CPUFLAGS}
 
 .if ${KCOV:U0} > 0
 KCOVFLAGS=	-fsanitize-coverage=trace-pc
-.for f in subr_kcov.c subr_lwp_specificdata.c subr_specificdata.c subr_asan.c \
-	subr_csan.c subr_msan.c x86_machdep.c
-# TODO Adapt the file list for !x86 or implement __nocov (missing in GCC 8)
+.for f in subr_kcov.c subr_asan.c subr_csan.c subr_msan.c
 KCOVFLAGS.${f}=		# empty
 .endfor
 CFLAGS+=	${KCOVFLAGS.${.IMPSRC:T}:U${KCOVFLAGS}}

Index: src/sys/arch/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.81 src/sys/arch/amd64/conf/Makefile.amd64:1.82
--- src/sys/arch/amd64/conf/Makefile.amd64:1.81	Fri Apr  3 18:12:39 2020
+++ src/sys/arch/amd64/conf/Makefile.amd64	Sat Apr  4 07:03:57 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.amd64,v 1.81 2020/04/03 18:12:39 maxv Exp $
+#	$NetBSD: Makefile.amd64,v 1.82 2020/04/04 07:03:57 maxv Exp $
 
 # Makefile for NetBSD
 #
@@ -55,7 +55,7 @@ KASANFLAGS=	-fsanitize=kernel-address \
 		--param asan-instrument-allocas=1 \
 		-fsanitize-address-use-after-scope \
 		-fasan-shadow-offset=0xDFFF900000000000
-.for f in subr_asan.c subr_kcov.c subr_lwp_specificdata.c subr_specificdata.c
+.for f in subr_asan.c subr_kcov.c
 KASANFLAGS.${f}=	# empty
 .endfor
 CFLAGS+=	${KASANFLAGS.${.IMPSRC:T}:U${KASANFLAGS}}
@@ -63,8 +63,7 @@ CFLAGS+=	${KASANFLAGS.${.IMPSRC:T}:U${KA
 
 .if ${KCSAN:U0} > 0 && ${HAVE_GCC:U0} > 0
 KCSANFLAGS=	-fsanitize=thread
-.for f in subr_csan.c clock.c lapic.c subr_kcov.c subr_lwp_specificdata.c \
-	subr_specificdata.c
+.for f in subr_csan.c subr_kcov.c clock.c lapic.c
 KCSANFLAGS.${f}=	# empty
 .endfor
 CFLAGS+=	${KCSANFLAGS.${.IMPSRC:T}:U${KCSANFLAGS}}

Reply via email to