Index: distrib/sets/lists/base/mi
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/base/mi,v
retrieving revision 1.1170
diff -u -r1.1170 mi
--- distrib/sets/lists/base/mi	24 Jan 2018 09:51:25 -0000	1.1170
+++ distrib/sets/lists/base/mi	1 Feb 2018 13:14:09 -0000
@@ -1168,6 +1168,7 @@
 ./usr/include/gcc-4.5				base-obsolete		obsolete
 ./usr/include/gcc-4.8				base-c-usr
 ./usr/include/gcc-5				base-c-usr
+./usr/include/gcc-5/sanitizer			base-c-usr
 ./usr/include/gssapi				base-c-usr
 ./usr/include/gssapi/rpc			base-obsolete		obsolete
 ./usr/include/isofs				base-c-usr
Index: distrib/sets/lists/comp/mi
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/comp/mi,v
retrieving revision 1.2171
diff -u -r1.2171 mi
--- distrib/sets/lists/comp/mi	24 Jan 2018 09:51:26 -0000	1.2171
+++ distrib/sets/lists/comp/mi	1 Feb 2018 13:14:09 -0000
@@ -1997,6 +1997,10 @@
 ./usr/include/gcc-5/omp.h			comp-gcc-include	gcc=53
 ./usr/include/gcc-5/openacc.h			comp-gcc-include	gcc=53
 ./usr/include/gcc-5/stdatomic.h			comp-gcc-include	gcc=53,gcccmds
+./usr/include/gcc-5/sanitizer/allocator_interface.h	comp-gcc-include	gcc=53
+./usr/include/gcc-5/sanitizer/asan_interface.h	comp-gcc-include	gcc=53
+./usr/include/gcc-5/sanitizer/common_interface_defs.h	comp-gcc-include	gcc=53
+./usr/include/gcc-5/sanitizer/tsan_interface_atomic.h	comp-gcc-include	gcc=53
 ./usr/include/gelf.h				comp-c-include
 ./usr/include/getopt.h				comp-c-include
 ./usr/include/glob.h				comp-c-include
Index: etc/mtree/NetBSD.dist.base
===================================================================
RCS file: /cvsroot/src/etc/mtree/NetBSD.dist.base,v
retrieving revision 1.167
diff -u -r1.167 NetBSD.dist.base
--- etc/mtree/NetBSD.dist.base	24 Jan 2018 09:04:41 -0000	1.167
+++ etc/mtree/NetBSD.dist.base	1 Feb 2018 13:14:09 -0000
@@ -193,6 +193,7 @@
 ./usr/include/g++/tr2
 ./usr/include/gcc-4.8
 ./usr/include/gcc-5
+./usr/include/gcc-5/sanitizer
 ./usr/include/gssapi
 ./usr/include/isofs
 ./usr/include/isofs/cd9660
Index: external/gpl3/gcc.old/usr.bin/include/Makefile
===================================================================
RCS file: /cvsroot/src/external/gpl3/gcc.old/usr.bin/include/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- external/gpl3/gcc.old/usr.bin/include/Makefile	5 Oct 2017 06:30:19 -0000	1.7
+++ external/gpl3/gcc.old/usr.bin/include/Makefile	1 Feb 2018 13:14:17 -0000
@@ -2,6 +2,8 @@
 
 .include "../Makefile.inc"
 
+SUBDIR=	sanitizer
+
 .if exists(${.CURDIR}/arch/${GCC_MACHINE_ARCH}.mk)
 .include "${.CURDIR}/arch/${GCC_MACHINE_ARCH}.mk"
 .endif
@@ -25,6 +27,7 @@
 
 INCSDIR=	/usr/include/gcc-5
 
+.include <bsd.subdir.mk>
 .include <bsd.prog.mk>
 
 .PATH: ${G_EXTRA_HEADERS:H:O:u}
Index: external/gpl3/gcc.old/usr.bin/include/sanitizer/Makefile
===================================================================
RCS file: external/gpl3/gcc.old/usr.bin/include/sanitizer/Makefile
diff -N external/gpl3/gcc.old/usr.bin/include/sanitizer/Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ external/gpl3/gcc.old/usr.bin/include/sanitizer/Makefile	1 Feb 2018 13:14:17 -0000
@@ -0,0 +1,25 @@
+#	$NetBSD$
+
+.include "../../../Makefile.gcc_path"
+
+NOOBJ=	#defined
+
+SANITIZER=	${GCCDIST}/libsanitizer
+
+.PATH:	${SANITIZER}/include/sanitizer
+
+INCS=	#
+INCS+=	allocator_interface.h
+INCS+=	asan_interface.h
+INCS+=	common_interface_defs.h
+#INCS+=	dfsan_interface.h # not supported
+#INCS+=	linux_syscall_hooks.h # Linux specific
+#INCS+=	lsan_interface.h # not supported
+#INCS+=	msan_interface.h # not ready in GCC
+INCS+=	tsan_interface_atomic.h
+
+.include <bsd.own.mk>
+
+INCSDIR=	/usr/include/gcc-5/sanitizer
+
+.include <bsd.prog.mk>