Module Name: src Committed By: martin Date: Sun Sep 1 10:36:27 UTC 2019
Modified Files: src [netbsd-9]: Makefile src/distrib/sets/lists/base [netbsd-9]: md.amd64 src/distrib/sets/lists/comp [netbsd-9]: md.amd64 md.i386 src/external/bsd [netbsd-9]: Makefile src/external/bsd/compiler_rt [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd [netbsd-9]: Makefile sources.mk syms.mk src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64 [netbsd-9]: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-m64 [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by kamil in ticket #122): external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile: revision 1.2 distrib/sets/lists/base/md.amd64: revision 1.280 external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile: revision 1.2 distrib/sets/lists/comp/md.amd64: revision 1.272 external/bsd/compiler_rt/lib/clang/lib/Makefile: revision 1.2 external/bsd/compiler_rt/lib/clang/lib/Makefile: revision 1.3 distrib/sets/lists/comp/md.i386: revision 1.190 external/bsd/compiler_rt/lib/clang/Makefile: revision 1.2 Makefile: revision 1.330 external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-m64/Makefile: revision 1.2 external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32/Makefile: revision 1.2 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile: revision 1.2 distrib/sets/lists/base/md.i386: revision 1.153 distrib/sets/lists/base/md.i386: revision 1.154 external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile: revision 1.2 external/bsd/Makefile: revision 1.65 external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk: revision 1.2 external/bsd/compiler_rt/lib/clang/lib/netbsd/sources.mk: revision 1.2 external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile: revision 1.2 external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile: revision 1.2 external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m64/Makefile: revision 1.2 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile: revision 1.2 distrib/sets/lists/base/md.amd64: revision 1.279 external/bsd/compiler_rt/Makefile: revision 1.2 external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile: revision 1.2 external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile: revision 1.3 external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile: revision 1.2 Makefile: revision 1.328 Makefile: revision 1.329 external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile: revision 1.2 Fix building compiler_rt with MKCOMPAT=no; approved by kamil@ Enhance MKSANITIZER support Add i386 support for LLVM sanitizers. Add new build phases do-sanitizer-* for building LLVM sanitizers after libs and before other programs. This phase is important as sanitizers need to link with libs and sanitized programs must link with sanitizer runtimes. Fix LLVM sanitizer build by GCC (HAVE_LLVM=no) Do not error if a priority from 0 to 100 is used for constructor or destructor. Use -Wno-error to silence all errors from this warning type. There should be used -Wno-prio-ctor-dtor, but it's not supported by GCC7. Rework the LLVM compiler_rt build rules Register external/bsd/compiler_rt as a _SUBDIR. This will allow to handle properly includes specific for compiler_rt. Centralize build_install target for external/bsd/compiler_rt. With the above changes MKOBJDIR is now respected properly for me. Do not install LLVM sanitizers into TOOLDIR for !HAVE_LLVM. 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.327 -r1.327.2.1 src/Makefile cvs rdiff -u -r1.277.2.1 -r1.277.2.2 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.271 -r1.271.2.1 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.189 -r1.189.2.1 src/distrib/sets/lists/comp/md.i386 cvs rdiff -u -r1.63.2.1 -r1.63.2.2 src/external/bsd/Makefile cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/external/bsd/compiler_rt/Makefile cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \ src/external/bsd/compiler_rt/lib/clang/Makefile cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile \ 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.2.2 -r1.1.2.3 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32/Makefile cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m64/Makefile cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-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.327 src/Makefile:1.327.2.1 --- src/Makefile:1.327 Fri Jun 14 09:12:42 2019 +++ src/Makefile Sun Sep 1 10:36:26 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.327 2019/06/14 09:12:42 martin Exp $ +# $NetBSD: Makefile,v 1.327.2.1 2019/09/01 10:36:26 martin Exp $ # # This is the top-level makefile for building NetBSD. For an outline of @@ -136,7 +136,11 @@ _SRC_TOP_OBJ_= # _SUBDIR is used to set SUBDIR, after removing directories that have # BUILD_${dir}=no, or that have no ${dir}/Makefile. # -_SUBDIR= tools .WAIT lib include external crypto/external bin +_SUBDIR= tools .WAIT lib +.if ${MKLLVM} != "no" +_SUBDIR+= external/bsd/compiler_rt +.endif +_SUBDIR+= include external crypto/external bin _SUBDIR+= games libexec sbin usr.bin _SUBDIR+= usr.sbin share sys etc tests compat _SUBDIR+= .WAIT rescue .WAIT distrib regress @@ -235,6 +239,12 @@ BUILDTARGETS+= includes .endif BUILDTARGETS+= do-lib BUILDTARGETS+= do-compat-lib +.if ${MKLLVM} != "no" +BUILDTARGETS+= do-sanitizer +.if ${MKSANITIZER:Uno} == "yes" +BUILDTARGETS+= do-sanitizer-tools +.endif +.endif .if ${MKX11} != "no" BUILDTARGETS+= do-x11 .endif @@ -470,6 +480,16 @@ do-lib: .PHONY .MAKE do-compat-lib: .PHONY .MAKE ${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../lib" +do-sanitizer: .PHONY .MAKE + ${MAKEDIRTARGET} external/bsd/compiler_rt all + +do-sanitizer-tools: .PHONY .MAKE +.if !exists(${TOOLDIR}/lib/clang) && ${HAVE_LLVM:Uno} == "yes" + mkdir -p ${TOOLDIR}/lib/clang + cd ${DESTDIR}/usr/lib/clang && \ + ${TOOL_PAX} -rw . ${TOOLDIR}/lib/clang +.endif + do-top-obj: .PHONY .MAKE ${MAKEDIRTARGET} . obj NOSUBDIR= Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.277.2.1 src/distrib/sets/lists/base/md.amd64:1.277.2.2 --- src/distrib/sets/lists/base/md.amd64:1.277.2.1 Fri Aug 16 19:10:42 2019 +++ src/distrib/sets/lists/base/md.amd64 Sun Sep 1 10:36:25 2019 @@ -1,56 +1,10 @@ -# $NetBSD: md.amd64,v 1.277.2.1 2019/08/16 19:10:42 martin Exp $ +# $NetBSD: md.amd64,v 1.277.2.2 2019/09/01 10:36:25 martin 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 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 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-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 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 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 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 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 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_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 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 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-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 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/comp/md.amd64 diff -u src/distrib/sets/lists/comp/md.amd64:1.271 src/distrib/sets/lists/comp/md.amd64:1.271.2.1 --- src/distrib/sets/lists/comp/md.amd64:1.271 Wed Apr 3 15:12:44 2019 +++ src/distrib/sets/lists/comp/md.amd64 Sun Sep 1 10:36:25 2019 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.271 2019/04/03 15:12:44 joerg Exp $ +# $NetBSD: md.amd64,v 1.271.2.1 2019/09/01 10:36:25 martin 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.189.2.1 --- src/distrib/sets/lists/comp/md.i386:1.189 Sat May 11 13:41:52 2019 +++ src/distrib/sets/lists/comp/md.i386 Sun Sep 1 10:36:25 2019 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.189 2019/05/11 13:41:52 christos Exp $ +# $NetBSD: md.i386,v 1.189.2.1 2019/09/01 10:36:25 martin 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/Makefile diff -u src/external/bsd/Makefile:1.63.2.1 src/external/bsd/Makefile:1.63.2.2 --- src/external/bsd/Makefile:1.63.2.1 Fri Aug 16 19:10:42 2019 +++ src/external/bsd/Makefile Sun Sep 1 10:36:26 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63.2.1 2019/08/16 19:10:42 martin Exp $ +# $NetBSD: Makefile,v 1.63.2.2 2019/09/01 10:36:26 martin Exp $ .include <bsd.own.mk> @@ -30,9 +30,6 @@ SUBDIR+= libc++ .if (${MKLLVM} != "no" || ${MKLLVMRT} != "no") SUBDIR+= llvm .endif -.if (${MKLLVM} != "no") -SUBDIR+= compiler_rt -.endif .if (${MKNSD} != "no") SUBDIR+= nsd .endif Index: src/external/bsd/compiler_rt/Makefile diff -u src/external/bsd/compiler_rt/Makefile:1.1.2.2 src/external/bsd/compiler_rt/Makefile:1.1.2.3 --- src/external/bsd/compiler_rt/Makefile:1.1.2.2 Fri Aug 16 18:44:09 2019 +++ src/external/bsd/compiler_rt/Makefile Sun Sep 1 10:36:27 2019 @@ -1,5 +1,8 @@ -# $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:09 martin Exp $ +# $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:27 martin Exp $ + +.include <bsd.own.mk> SUBDIR+= lib +.include <bsd.buildinstall.mk> .include <bsd.subdir.mk> Index: src/external/bsd/compiler_rt/lib/clang/Makefile diff -u src/external/bsd/compiler_rt/lib/clang/Makefile:1.1.2.2 src/external/bsd/compiler_rt/lib/clang/Makefile:1.1.2.3 --- src/external/bsd/compiler_rt/lib/clang/Makefile:1.1.2.2 Fri Aug 16 18:44:06 2019 +++ src/external/bsd/compiler_rt/lib/clang/Makefile Sun Sep 1 10:36:25 2019 @@ -1,11 +1,6 @@ -# $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:06 martin Exp $ - -.include <bsd.own.mk> +# $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:25 martin Exp $ SUBDIR+= include share - -.if ${MACHINE_ARCH} == "x86_64" SUBDIR+= lib -.endif .include <bsd.subdir.mk> Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile:1.1.2.2 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile:1.1.2.3 --- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile:1.1.2.2 Fri Aug 16 18:44:06 2019 +++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile Sun Sep 1 10:36:26 2019 @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:06 martin Exp $ +# $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:26 martin Exp $ -SUBDIR+= asan-m32 +.include <bsd.own.mk> + +.if ${MACHINE_ARCH} == "x86_64" SUBDIR+= asan-m64 -SUBDIR+= asan-preinit-m32 SUBDIR+= asan-preinit-m64 -SUBDIR+= asan_cxx-m32 SUBDIR+= asan_cxx-m64 -SUBDIR+= asan-dynamic-m32 SUBDIR+= asan-dynamic-m64 SUBDIR+= dd-m64 SUBDIR+= dyndd-m64 @@ -14,23 +13,32 @@ SUBDIR+= fuzzer-m64 SUBDIR+= fuzzer_no_main-m64 SUBDIR+= msan-m64 SUBDIR+= msan_cxx-m64 -SUBDIR+= safestack-m32 SUBDIR+= safestack-m64 SUBDIR+= tsan-m64 SUBDIR+= tsan_cxx-m64 -SUBDIR+= ubsan_minimal-m32 SUBDIR+= ubsan_minimal-m64 -SUBDIR+= ubsan_minimal-dynamic-m32 SUBDIR+= ubsan_minimal-dynamic-m64 -SUBDIR+= ubsan_standalone-m32 SUBDIR+= ubsan_standalone-m64 -SUBDIR+= ubsan_standalone-dynamic-m32 SUBDIR+= ubsan_standalone-dynamic-m64 -SUBDIR+= ubsan_standalone_cxx-m32 SUBDIR+= ubsan_standalone_cxx-m64 SUBDIR+= xray-m64 SUBDIR+= xray-basic-m64 SUBDIR+= xray-fdr-m64 SUBDIR+= xray-profiling-m64 +.endif + +.if ${MACHINE_ARCH} == "i386" || \ + (${MACHINE_ARCH} == "x86_64" && ${MKCOMPAT} != "no") +SUBDIR+= asan-m32 +SUBDIR+= asan-preinit-m32 +SUBDIR+= asan_cxx-m32 +SUBDIR+= asan-dynamic-m32 +SUBDIR+= safestack-m32 +SUBDIR+= ubsan_minimal-m32 +SUBDIR+= ubsan_minimal-dynamic-m32 +SUBDIR+= ubsan_standalone-m32 +SUBDIR+= ubsan_standalone-dynamic-m32 +SUBDIR+= ubsan_standalone_cxx-m32 +.endif .include <bsd.subdir.mk> 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.2.2 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/sources.mk:1.1.2.3 --- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/sources.mk:1.1.2.2 Fri Aug 16 18:44:06 2019 +++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/sources.mk Sun Sep 1 10:36:26 2019 @@ -1,4 +1,4 @@ -# $NetBSD: sources.mk,v 1.1.2.2 2019/08/16 18:44:06 martin Exp $ +# $NetBSD: sources.mk,v 1.1.2.3 2019/09/01 10:36:26 martin 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.2.2 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk:1.1.2.3 --- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk:1.1.2.2 Fri Aug 16 18:44:06 2019 +++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk Sun Sep 1 10:36:26 2019 @@ -1,9 +1,11 @@ -.SUFFIXES: .a .syms -.a.syms: - ${SCRIPT_ENV} \ - NM=${NM} \ - AWK=${AWK} \ - FILE=${FILE} \ +# $NetBSD: syms.mk,v 1.1.2.3 2019/09/01 10:36:26 martin 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.2.2 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile:1.1.2.3 --- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile:1.1.2.2 Fri Aug 16 18:44:08 2019 +++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile Sun Sep 1 10:36:27 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:08 martin Exp $ +# $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:27 martin 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.2.2 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile:1.1.2.3 --- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile:1.1.2.2 Fri Aug 16 18:44:07 2019 +++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile Sun Sep 1 10:36:26 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:07 martin Exp $ +# $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:26 martin 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.2.2 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile:1.1.2.3 --- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile:1.1.2.2 Fri Aug 16 18:44:08 2019 +++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile Sun Sep 1 10:36:26 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:08 martin Exp $ +# $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:26 martin 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.2.2 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile:1.1.2.3 --- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile:1.1.2.2 Fri Aug 16 18:44:06 2019 +++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile Sun Sep 1 10:36:25 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:06 martin Exp $ +# $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:25 martin 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/safestack-m32/Makefile diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32/Makefile:1.1.2.2 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32/Makefile:1.1.2.3 --- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32/Makefile:1.1.2.2 Fri Aug 16 18:44:07 2019 +++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32/Makefile Sun Sep 1 10:36:26 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:07 martin Exp $ +# $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:26 martin Exp $ NOSANITIZER= # defined @@ -26,6 +26,8 @@ SRCS+= ${SANITIZER_NOLIBC_SOURCES} CXXFLAGS+= -fno-rtti -fno-exceptions -fno-builtin -fno-stack-protector +COPTS.safestack.cc+= ${${ACTIVE_CXX} == "gcc" :? -Wno-error :} + LIBDIR= /usr/lib/clang/${CLANG_VER}/lib/netbsd LIBISCXX= yes Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m64/Makefile diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m64/Makefile:1.1.2.2 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m64/Makefile:1.1.2.3 --- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m64/Makefile:1.1.2.2 Fri Aug 16 18:44:08 2019 +++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m64/Makefile Sun Sep 1 10:36:27 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:08 martin Exp $ +# $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:27 martin Exp $ NOSANITIZER= # defined @@ -26,6 +26,8 @@ SRCS+= ${SANITIZER_NOLIBC_SOURCES} CXXFLAGS+= -fno-rtti -fno-exceptions -fno-builtin -fno-stack-protector +COPTS.safestack.cc+= ${${ACTIVE_CXX} == "gcc" :? -Wno-error :} + LIBDIR= /usr/lib/clang/${CLANG_VER}/lib/netbsd LIBISCXX= yes 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.2.2 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile:1.1.2.3 --- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile:1.1.2.2 Fri Aug 16 18:44:09 2019 +++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile Sun Sep 1 10:36:27 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:09 martin Exp $ +# $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:27 martin 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.2.2 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile:1.1.2.3 --- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile:1.1.2.2 Fri Aug 16 18:44:09 2019 +++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile Sun Sep 1 10:36:27 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:09 martin Exp $ +# $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:27 martin 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.2.2 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile:1.1.2.3 --- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile:1.1.2.2 Fri Aug 16 18:44:10 2019 +++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile Sun Sep 1 10:36:25 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:10 martin Exp $ +# $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:25 martin 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.2.2 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile:1.1.2.3 --- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile:1.1.2.2 Fri Aug 16 18:44:08 2019 +++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile Sun Sep 1 10:36:26 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:08 martin Exp $ +# $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:26 martin 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.2.2 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile:1.1.2.3 --- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile:1.1.2.2 Fri Aug 16 18:44:08 2019 +++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile Sun Sep 1 10:36:26 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:08 martin Exp $ +# $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:26 martin 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> Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-m64/Makefile diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-m64/Makefile:1.1.2.2 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-m64/Makefile:1.1.2.3 --- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-m64/Makefile:1.1.2.2 Fri Aug 16 18:44:07 2019 +++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-m64/Makefile Sun Sep 1 10:36:26 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:07 martin Exp $ +# $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:26 martin Exp $ NOSANITIZER= # defined @@ -23,6 +23,8 @@ SRCS+= ${SANITIZER_LIBCDEP_SOURCES} CXXFLAGS+= -fno-rtti -fno-exceptions -fno-builtin -fno-stack-protector +COPTS.xray_init.cc+= ${${ACTIVE_CXX} == "gcc" :? -Wno-error :} + # Macro defined in newer builtin subdirectory, it has to be empty on NetBSD CPPFLAGS+= -DNO_EXEC_STACK_DIRECTIVE=""