diff options
| author | kamil <kamil@NetBSD.org> | 2019-08-26 04:49:45 +0000 |
|---|---|---|
| committer | kamil <kamil@NetBSD.org> | 2019-08-26 04:49:45 +0000 |
| commit | 3c9e8888c1629cdac0cc43390f2522bf4e047694 (patch) | |
| tree | 8f708831a645b47845826ad2cd198e2681ac6a12 | |
| parent | a884794d547aa318c976dd0c520f719a5f98d276 (diff) | |
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.
16 files changed, 151 insertions, 103 deletions
@@ -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" diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64 index e29862d6931..a4da0979410 100644 --- a/distrib/sets/lists/base/md.amd64 +++ b/distrib/sets/lists/base/md.amd64 @@ -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 diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386 index 386bf8af8bc..1a8059f75d7 100644 --- a/distrib/sets/lists/base/md.i386 +++ b/distrib/sets/lists/base/md.i386 @@ -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 diff --git a/distrib/sets/lists/comp/md.amd64 b/distrib/sets/lists/comp/md.amd64 index ad51f448c02..14b75384976 100644 --- a/distrib/sets/lists/comp/md.amd64 +++ b/distrib/sets/lists/comp/md.amd64 @@ -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 diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386 index 907a7857eb1..6d626b868e7 100644 --- a/distrib/sets/lists/comp/md.i386 +++ b/distrib/sets/lists/comp/md.i386 @@ -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 diff --git a/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile b/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile index 9f57ffbb54a..52da3b9b10a 100644 --- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile +++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile @@ -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> diff --git a/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile b/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile index 0668e613626..2e221f13727 100644 --- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile +++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile @@ -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> diff --git a/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile b/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile index ff9c50ed5a0..4e41da6d180 100644 --- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile +++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile @@ -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> diff --git a/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile b/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile index 0036bc3f0e2..0518580920e 100644 --- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile +++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile @@ -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> diff --git a/external/bsd/compiler_rt/lib/clang/lib/netbsd/sources.mk b/external/bsd/compiler_rt/lib/clang/lib/netbsd/sources.mk index 193b49a1ab4..6a35b9e2e27 100644 --- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/sources.mk +++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/sources.mk @@ -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_win.cc UBSAN_CXX_SOURCES+= ${UBSAN_CXXABI_SOURCES} .else UBSAN_CXX_SOURCES+= cxx_dummy.cc +CLEANFILES+= cxx_dummy.cc cxx_dummy.cc: touch ${.TARGET} diff --git a/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk b/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk index 6cafb9c5bbc..b2eefee9869 100644 --- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk +++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk @@ -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} diff --git a/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile b/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile index 1fb3c8a9d69..b73632d70d7 100644 --- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile +++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile @@ -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> diff --git a/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile b/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile index 114f055bff6..c399febd6d8 100644 --- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile +++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile @@ -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> diff --git a/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile b/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile index 06931e8f4dd..bd7e940e75d 100644 --- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile +++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile @@ -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> diff --git a/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile b/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile index 4f06b451d03..40633fce923 100644 --- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile +++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile @@ -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> diff --git a/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile b/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile index 4a5591cd1ac..914d6d77034 100644 --- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile +++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile @@ -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> |
