Module Name:    src
Committed By:   kamil
Date:           Mon Aug 26 04:49:47 UTC 2019

Modified Files:
        src: Makefile
        src/distrib/sets/lists/base: md.amd64 md.i386
        src/distrib/sets/lists/comp: md.amd64 md.i386
        src/external/bsd/compiler_rt/lib/clang/lib/netbsd: sources.mk syms.mk
        src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64: Makefile
        src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64:
            Makefile
        src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64: Makefile
        src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64:
            Makefile
        src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64: Makefile
        src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64:
            Makefile
        src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64:
            Makefile
        src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64:
            Makefile
        
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64:
            Makefile

Log Message:
Correct the build rules of LLVM sanitizers

Fix generation of .a.syms files in LLVM sanitizers. The old rules weren't
functional and sometimes they were fatal in the build.

Add the .a.syms files to distribution sets.
These files are generated only in certain .a files in 64bit version of
sanitizers.

Correct the location of files with LLVM sanitizers. Move the LLVM sanitizer
entries from base to comp files.


To generate a diff of this commit:
cvs rdiff -u -r1.329 -r1.330 src/Makefile
cvs rdiff -u -r1.279 -r1.280 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.153 -r1.154 src/distrib/sets/lists/base/md.i386
cvs rdiff -u -r1.271 -r1.272 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.189 -r1.190 src/distrib/sets/lists/comp/md.i386
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/compiler_rt/lib/clang/lib/netbsd/sources.mk \
    src/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile

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

Modified files:

Index: src/Makefile
diff -u src/Makefile:1.329 src/Makefile:1.330
--- src/Makefile:1.329	Sun Aug 25 06:06:48 2019
+++ src/Makefile	Mon Aug 26 04:49:45 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.329 2019/08/25 06:06:48 kamil Exp $
+#	$NetBSD: Makefile,v 1.330 2019/08/26 04:49:45 kamil Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -481,7 +481,7 @@ do-compat-lib: .PHONY .MAKE
 	${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../lib"
 
 do-sanitizer: .PHONY .MAKE
-	${MAKEDIRTARGET} external/bsd/compiler_rt build_install
+	${MAKEDIRTARGET} external/bsd/compiler_rt all
 
 do-sanitizer-tools: .PHONY .MAKE
 .if !exists(${TOOLDIR}/lib/clang) && ${HAVE_LLVM:Uno} == "yes"

Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.279 src/distrib/sets/lists/base/md.amd64:1.280
--- src/distrib/sets/lists/base/md.amd64:1.279	Thu Aug 22 18:15:44 2019
+++ src/distrib/sets/lists/base/md.amd64	Mon Aug 26 04:49:45 2019
@@ -1,56 +1,10 @@
-# $NetBSD: md.amd64,v 1.279 2019/08/22 18:15:44 adam Exp $
+# $NetBSD: md.amd64,v 1.280 2019/08/26 04:49:45 kamil Exp $
 ./dev/lms0					base-obsolete		obsolete
 ./dev/mms0					base-obsolete		obsolete
 ./libexec/ld.elf_so-i386			base-sys-shlib		compat,pic
 ./usr/bin/fdformat				base-util-bin
 ./usr/bin/iasl					base-util-bin
 ./usr/bin/pmc					base-obsolete		obsolete
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.a	comp-cxx-lib	compat,llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.a	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so	comp-cxx-lib	compat,llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so.0	comp-cxx-lib	compat,llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so.0.0	comp-cxx-lib	compat,llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.so	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.so.0	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.so.0.0	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-preinit-i386.a	comp-cxx-lib	compat,llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-preinit-x86_64.a	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan_cxx-i386.a	comp-cxx-lib	compat,llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan_cxx-x86_64.a	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.dd-x86_64.a	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.dyndd-x86_64.so	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.dyndd-x86_64.so.0	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.dyndd-x86_64.so.0.0	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.fuzzer-x86_64.a	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.fuzzer_no_main-x86_64.a	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.msan-x86_64.a	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.msan_cxx-x86_64.a	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.safestack-i386.a	comp-cxx-lib	compat,llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.safestack-x86_64.a	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.tsan-x86_64.a	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.tsan_cxx-x86_64.a	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.a	comp-cxx-lib	compat,llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.a	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so	comp-cxx-lib	compat,llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so.0	comp-cxx-lib	compat,llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so.0.0	comp-cxx-lib	compat,llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.so	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.so.0	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.so.0.0	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.a	comp-cxx-lib	compat,llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-x86_64.a	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.so	comp-cxx-lib	compat,llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.so.0	comp-cxx-lib	compat,llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.so.0.0	comp-cxx-lib	compat,llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-x86_64.so	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-x86_64.so.0	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-x86_64.so.0.0	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone_cxx-i386.a	comp-cxx-lib	compat,llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone_cxx-x86_64.a	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.xray-basic-x86_64.a	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.xray-fdr-x86_64.a	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.xray-profiling-x86_64.a	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.xray-x86_64.a	comp-cxx-lib	llvm
 ./usr/lib/i386/libi386.so.2			base-compat-shlib	compat,pic
 ./usr/lib/i386/libi386.so.2.0			base-compat-shlib	compat,pic
 ./usr/lib/i386/libproc.so.1			base-compat-shlib	compat,pic,dtrace

Index: src/distrib/sets/lists/base/md.i386
diff -u src/distrib/sets/lists/base/md.i386:1.153 src/distrib/sets/lists/base/md.i386:1.154
--- src/distrib/sets/lists/base/md.i386:1.153	Fri Aug 23 06:38:27 2019
+++ src/distrib/sets/lists/base/md.i386	Mon Aug 26 04:49:45 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.153 2019/08/23 06:38:27 kamil Exp $
+# $NetBSD: md.i386,v 1.154 2019/08/26 04:49:45 kamil Exp $
 ./dev/lms0					base-obsolete		obsolete
 ./dev/mms0					base-obsolete		obsolete
 ./dev/pms0					base-obsolete		obsolete
@@ -19,22 +19,6 @@
 ./usr/bin/iasl					base-util-bin
 ./usr/bin/pmc					base-obsolete		obsolete
 ./usr/bin/vttest				base-obsolete		obsolete
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.a	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so.0	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so.0.0	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-preinit-i386.a	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan_cxx-i386.a	comp-cxx-lib    llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.safestack-i386.a	comp-cxx-lib    llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.a	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so      comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so.0	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so.0.0	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.a	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.so	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.so.0	comp-cxx-lib	llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.so.0.0	comp-cxx-lib    llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone_cxx-i386.a	comp-cxx-lib	llvm
 ./usr/lib/libi386.so				base-sys-shlib		pic
 ./usr/lib/libi386.so.2				base-sys-shlib		pic
 ./usr/lib/libi386.so.2.0			base-sys-shlib		pic

Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.271 src/distrib/sets/lists/comp/md.amd64:1.272
--- src/distrib/sets/lists/comp/md.amd64:1.271	Wed Apr  3 15:12:44 2019
+++ src/distrib/sets/lists/comp/md.amd64	Mon Aug 26 04:49:45 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.271 2019/04/03 15:12:44 joerg Exp $
+# $NetBSD: md.amd64,v 1.272 2019/08/26 04:49:45 kamil Exp $
 ./usr/include/amd64				comp-c-include
 ./usr/include/amd64/ansi.h			comp-c-include
 ./usr/include/amd64/aout_machdep.h		comp-c-include
@@ -842,6 +842,61 @@
 ./usr/include/xen/xenio.h			comp-c-include
 ./usr/include/xen/xenio3.h			comp-c-include
 ./usr/include/xmmintrin.h			comp-obsolete		obsolete
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.a	comp-cxx-lib	compat,llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.a	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.a.syms	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so	comp-cxx-lib	compat,llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so.0	comp-cxx-lib	compat,llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so.0.0	comp-cxx-lib	compat,llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.so	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.so.0	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.so.0.0	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-preinit-i386.a	comp-cxx-lib	compat,llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-preinit-x86_64.a	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan_cxx-i386.a	comp-cxx-lib	compat,llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan_cxx-x86_64.a	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan_cxx-x86_64.a.syms	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.dd-x86_64.a	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.dyndd-x86_64.so	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.dyndd-x86_64.so.0	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.dyndd-x86_64.so.0.0	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.fuzzer-x86_64.a	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.fuzzer_no_main-x86_64.a	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.msan-x86_64.a	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.msan-x86_64.a.syms	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.msan_cxx-x86_64.a	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.msan_cxx-x86_64.a.syms	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.safestack-i386.a	comp-cxx-lib	compat,llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.safestack-x86_64.a	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.tsan-x86_64.a	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.tsan-x86_64.a.syms	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.tsan_cxx-x86_64.a	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.tsan_cxx-x86_64.a.syms	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.a	comp-cxx-lib	compat,llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.a	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.a.syms	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so	comp-cxx-lib	compat,llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so.0	comp-cxx-lib	compat,llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so.0.0	comp-cxx-lib	compat,llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.so	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.so.0	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.so.0.0	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.a	comp-cxx-lib	compat,llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-x86_64.a	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-x86_64.a.syms	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.so	comp-cxx-lib	compat,llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.so.0	comp-cxx-lib	compat,llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.so.0.0	comp-cxx-lib	compat,llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-x86_64.so	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-x86_64.so.0	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-x86_64.so.0.0	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone_cxx-i386.a	comp-cxx-lib	compat,llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone_cxx-x86_64.a	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone_cxx-x86_64.a.syms	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.xray-basic-x86_64.a	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.xray-fdr-x86_64.a	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.xray-profiling-x86_64.a	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.xray-x86_64.a	comp-cxx-lib	llvm
 ./usr/lib/i386/libi386.a			comp-c-lib		compat
 ./usr/lib/i386/libi386.so			comp-sys-shlib		compat,pic
 ./usr/lib/i386/libi386_p.a			comp-c-proflib		compat,profile

Index: src/distrib/sets/lists/comp/md.i386
diff -u src/distrib/sets/lists/comp/md.i386:1.189 src/distrib/sets/lists/comp/md.i386:1.190
--- src/distrib/sets/lists/comp/md.i386:1.189	Sat May 11 13:41:52 2019
+++ src/distrib/sets/lists/comp/md.i386	Mon Aug 26 04:49:45 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.189 2019/05/11 13:41:52 christos Exp $
+# $NetBSD: md.i386,v 1.190 2019/08/26 04:49:45 kamil Exp $
 ./usr/include/clang-3.4/__wmmintrin_aes.h	comp-obsolete		obsolete
 ./usr/include/clang-3.4/__wmmintrin_pclmul.h	comp-obsolete		obsolete
 ./usr/include/clang-3.4/ammintrin.h		comp-obsolete		obsolete
@@ -711,6 +711,22 @@
 ./usr/include/xen/xenio.h			comp-c-include
 ./usr/include/xen/xenio3.h			comp-c-include
 ./usr/include/xmmintrin.h			comp-obsolete		obsolete
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.a	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so.0	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so.0.0	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-preinit-i386.a	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan_cxx-i386.a	comp-cxx-lib    llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.safestack-i386.a	comp-cxx-lib    llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.a	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so      comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so.0	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so.0.0	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.a	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.so	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.so.0	comp-cxx-lib	llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.so.0.0	comp-cxx-lib    llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone_cxx-i386.a	comp-cxx-lib	llvm
 ./usr/lib/libi386.a				comp-c-lib
 ./usr/lib/libi386_p.a				comp-c-proflib		profile
 ./usr/lib/libi386_pic.a				comp-c-piclib		pic,picinstall

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/sources.mk
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/sources.mk:1.1 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/sources.mk:1.2
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/sources.mk:1.1	Thu Aug  8 14:00:28 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/sources.mk	Mon Aug 26 04:49:45 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: sources.mk,v 1.1 2019/08/08 14:00:28 kamil Exp $
+#	$NetBSD: sources.mk,v 1.2 2019/08/26 04:49:45 kamil Exp $
 
 # RTInterception
 INTERCEPTION_SOURCES+=	interception_linux.cc
@@ -236,6 +236,7 @@ UBSAN_CXXABI_SOURCES+=	ubsan_type_hash_w
 UBSAN_CXX_SOURCES+=	${UBSAN_CXXABI_SOURCES}
 .else
 UBSAN_CXX_SOURCES+=	cxx_dummy.cc
+CLEANFILES+=		cxx_dummy.cc
 
 cxx_dummy.cc:
 	touch ${.TARGET}
Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk:1.1 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk:1.2
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk:1.1	Thu Aug  8 14:00:28 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk	Mon Aug 26 04:49:45 2019
@@ -1,9 +1,11 @@
-.SUFFIXES: .a .syms
-.a.syms:
-	${SCRIPT_ENV} \
-		NM=${NM} \
-		AWK=${AWK} \
-		FILE=${FILE} \
+#	$NetBSD: syms.mk,v 1.2 2019/08/26 04:49:45 kamil Exp $
+
+here := ${.PARSEDIR}
+
+.SUFFIXES: .a .a.syms
+.a.a.syms:
+	${_MKTARGET_CREATE}
+	NM=${NM:Q} AWK=${TOOL_AWK:Q} FILE=${TOOL_MKMAGIC:Q} \
 		${HOST_SH} \
-		${.PARSEDIR}/gen_dynamic_list.sh \
+		${here}/gen_dynamic_list.sh \
 		${.IMPSRC} > ${.TARGET}

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile:1.1 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile:1.2
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile:1.1	Thu Aug  8 14:00:29 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile	Mon Aug 26 04:49:45 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/08/08 14:00:29 kamil Exp $
+#	$NetBSD: Makefile,v 1.2 2019/08/26 04:49:45 kamil Exp $
 
 NOSANITIZER=    # defined
 
@@ -52,10 +52,14 @@ CPPFLAGS+=	-I${TOPDIR}/lib
 COPTS+=		-fPIC
 
 .include "../m64.mk"
-
 .include "../syms.mk"
 
-FILES=		libclang_rt.asan-x86_64.a.syms
+SYMS=		libclang_rt.asan-x86_64.a.syms
+
+realall: ${SYMS}
+
+CLEANFILES+=	${SYMS}
+FILES=		${SYMS}
 FILESDIR=	${LIBDIR}
 
 .include <bsd.lib.mk>

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile:1.1 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile:1.2
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile:1.1	Thu Aug  8 14:00:29 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile	Mon Aug 26 04:49:46 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/08/08 14:00:29 kamil Exp $
+#	$NetBSD: Makefile,v 1.2 2019/08/26 04:49:46 kamil Exp $
 
 NOSANITIZER=    # defined
 
@@ -35,10 +35,14 @@ CPPFLAGS+=	-I${TOPDIR}/lib
 COPTS+=		-fPIC
 
 .include "../m64.mk"
-
 .include "../syms.mk"
 
-FILES=		libclang_rt.asan_cxx-x86_64.a.syms
+SYMS=	libclang_rt.asan_cxx-x86_64.a.syms
+
+realall: ${SYMS}
+
+CLEANFILES+=	${SYMS}
+FILES=		${SYMS}
 FILESDIR=	${LIBDIR}
 
 .include <bsd.lib.mk>

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile:1.1 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile:1.2
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile:1.1	Thu Aug  8 14:00:30 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile	Mon Aug 26 04:49:46 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/08/08 14:00:30 kamil Exp $
+#	$NetBSD: Makefile,v 1.2 2019/08/26 04:49:46 kamil Exp $
 
 NOSANITIZER=    # defined
 
@@ -47,10 +47,14 @@ CPPFLAGS+=	-I${TOPDIR}/lib
 COPTS+=		-fPIC
 
 .include "../m64.mk"
-
 .include "../syms.mk"
 
-FILES=		libclang_rt.msan-x86_64.a.syms
+SYMS=		libclang_rt.msan-x86_64.a.syms
+
+realall: ${SYMS}
+
+CLEANFILES+=	${SYMS}
+FILES=		${SYMS}
 FILESDIR=	${LIBDIR}
 
 .include <bsd.lib.mk>

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile:1.1 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile:1.2
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile:1.1	Thu Aug  8 14:00:30 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile	Mon Aug 26 04:49:46 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/08/08 14:00:30 kamil Exp $
+#	$NetBSD: Makefile,v 1.2 2019/08/26 04:49:46 kamil Exp $
 
 NOSANITIZER=    # defined
 
@@ -36,10 +36,14 @@ CPPFLAGS+=	-I${TOPDIR}/lib
 COPTS+=		-fPIC
 
 .include "../m64.mk"
-
 .include "../syms.mk"
 
-FILES=		libclang_rt.msan_cxx-x86_64.a.syms
+SYMS=		libclang_rt.msan_cxx-x86_64.a.syms
+
+realall: ${SYMS}
+
+CLEANFILES+=	${SYMS}
+FILES=		${SYMS}
 FILESDIR=	${LIBDIR}
 
 .include <bsd.lib.mk>

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile:1.1 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile:1.2
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile:1.1	Thu Aug  8 14:00:30 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile	Mon Aug 26 04:49:46 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/08/08 14:00:30 kamil Exp $
+#	$NetBSD: Makefile,v 1.2 2019/08/26 04:49:46 kamil Exp $
 
 NOSANITIZER=    # defined
 
@@ -47,10 +47,14 @@ COPTS+=		-fPIC
 CPPFLAGS+=	-I${TOPDIR}/lib
 
 .include "../m64.mk"
-
 .include "../syms.mk"
 
-FILES=		libclang_rt.tsan-x86_64.a.syms
+SYMS=		libclang_rt.tsan-x86_64.a.syms
+
+realall: ${SYMS}
+
+CLEANFILES+=	${SYMS}
+FILES=		${SYMS}
 FILESDIR=	${LIBDIR}
 
 .include <bsd.lib.mk>

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile:1.1 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile:1.2
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile:1.1	Thu Aug  8 14:00:31 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile	Mon Aug 26 04:49:46 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/08/08 14:00:31 kamil Exp $
+#	$NetBSD: Makefile,v 1.2 2019/08/26 04:49:46 kamil Exp $
 
 NOSANITIZER=    # defined
 
@@ -35,10 +35,14 @@ COPTS+=		-fPIC
 CPPFLAGS+=	-I${TOPDIR}/lib
 
 .include "../m64.mk"
-
 .include "../syms.mk"
 
-FILES=		libclang_rt.tsan_cxx-x86_64.a.syms
+SYMS=		libclang_rt.tsan_cxx-x86_64.a.syms
+
+realall: ${SYMS}
+
+CLEANFILES+=	${SYMS}
+FILES=		${SYMS}
 FILESDIR=	${LIBDIR}
 
 .include <bsd.lib.mk>

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile:1.1 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile:1.2
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile:1.1	Thu Aug  8 14:00:31 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile	Mon Aug 26 04:49:46 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/08/08 14:00:31 kamil Exp $
+#	$NetBSD: Makefile,v 1.2 2019/08/26 04:49:46 kamil Exp $
 
 NOSANITIZER=    # defined
 
@@ -31,10 +31,14 @@ COPTS+=		-fPIC
 CPPFLAGS+=	-I${TOPDIR}/lib
 
 .include "../m64.mk"
-
 .include "../syms.mk"
 
-FILES=		libclang_rt.ubsan_minimal-x86_64.a.syms
+SYMS=		libclang_rt.ubsan_minimal-x86_64.a.syms
+
+realall: ${SYMS}
+
+CLEANFILES+=	${SYMS}
+FILES=		${SYMS}
 FILESDIR=	${LIBDIR}
 
 .include <bsd.lib.mk>

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile:1.1 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile:1.2
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile:1.1	Thu Aug  8 14:00:32 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile	Mon Aug 26 04:49:46 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/08/08 14:00:32 kamil Exp $
+#	$NetBSD: Makefile,v 1.2 2019/08/26 04:49:46 kamil Exp $
 
 NOSANITIZER=    # defined
 
@@ -45,10 +45,14 @@ COPTS+=		-fPIC
 CPPFLAGS+=	-I${TOPDIR}/lib
 
 .include "../m64.mk"
-
 .include "../syms.mk"
 
-FILES=		libclang_rt.ubsan_standalone-x86_64.a.syms
+SYMS=		libclang_rt.ubsan_standalone-x86_64.a.syms
+
+realall: ${SYMS}
+
+CLEANFILES+=	${SYMS}
+FILES=		${SYMS}
 FILESDIR=	${LIBDIR}
 
 .include <bsd.lib.mk>

Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile:1.1 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile:1.2
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile:1.1	Thu Aug  8 14:00:32 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile	Mon Aug 26 04:49:46 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/08/08 14:00:32 kamil Exp $
+#	$NetBSD: Makefile,v 1.2 2019/08/26 04:49:46 kamil Exp $
 
 NOSANITIZER=    # defined
 
@@ -31,10 +31,14 @@ COPTS+=		-fPIC
 CPPFLAGS+=	-I${TOPDIR}/lib
 
 .include "../m64.mk"
-
 .include "../syms.mk"
 
-FILES=		libclang_rt.ubsan_standalone_cxx-x86_64.a.syms
+SYMS=		libclang_rt.ubsan_standalone_cxx-x86_64.a.syms
+
+realall: ${SYMS}
+
+CLEANFILES+=	${SYMS}
+FILES=		${SYMS}
 FILESDIR=	${LIBDIR}
 
 .include <bsd.lib.mk>

Reply via email to