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.diff -r1.327 -r1.327.2.1 src/Makefile
(martin)
--- src/Makefile 2019/06/14 09:12:42 1.327
+++ src/Makefile 2019/09/01 10:36:26 1.327.2.1
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.327 2019/06/14 09:12:42 martin Exp $ | 1 | # $NetBSD: Makefile,v 1.327.2.1 2019/09/01 10:36:26 martin Exp $ | |
2 | 2 | |||
3 | # | 3 | # | |
4 | # This is the top-level makefile for building NetBSD. For an outline of | 4 | # This is the top-level makefile for building NetBSD. For an outline of | |
5 | # how to build a snapshot or release, as well as other release engineering | 5 | # how to build a snapshot or release, as well as other release engineering | |
6 | # information, see http://www.NetBSD.org/developers/releng/index.html | 6 | # information, see http://www.NetBSD.org/developers/releng/index.html | |
7 | # | 7 | # | |
8 | # Not everything you can set or do is documented in this makefile. In | 8 | # Not everything you can set or do is documented in this makefile. In | |
9 | # particular, you should review the files in /usr/share/mk (especially | 9 | # particular, you should review the files in /usr/share/mk (especially | |
10 | # bsd.README) for general information on building programs and writing | 10 | # bsd.README) for general information on building programs and writing | |
11 | # Makefiles within this structure, and see the comments in src/etc/Makefile | 11 | # Makefiles within this structure, and see the comments in src/etc/Makefile | |
12 | # for further information on installation and release set options. | 12 | # for further information on installation and release set options. | |
13 | # | 13 | # | |
14 | # Variables listed below can be set on the make command line (highest | 14 | # Variables listed below can be set on the make command line (highest | |
@@ -126,27 +126,31 @@ _SRC_TOP_OBJ_= | @@ -126,27 +126,31 @@ _SRC_TOP_OBJ_= | |||
126 | .for targ in ${TARGETS:Nobj:Ncleandir} | 126 | .for targ in ${TARGETS:Nobj:Ncleandir} | |
127 | .if make(${targ}) && !target(.BEGIN) | 127 | .if make(${targ}) && !target(.BEGIN) | |
128 | .BEGIN: | 128 | .BEGIN: | |
129 | @echo 'BUILD ABORTED: "make build" and "make ${targ}" are mutually exclusive.' | 129 | @echo 'BUILD ABORTED: "make build" and "make ${targ}" are mutually exclusive.' | |
130 | @false | 130 | @false | |
131 | .endif | 131 | .endif | |
132 | .endfor | 132 | .endfor | |
133 | .endif | 133 | .endif | |
134 | 134 | |||
135 | # | 135 | # | |
136 | # _SUBDIR is used to set SUBDIR, after removing directories that have | 136 | # _SUBDIR is used to set SUBDIR, after removing directories that have | |
137 | # BUILD_${dir}=no, or that have no ${dir}/Makefile. | 137 | # BUILD_${dir}=no, or that have no ${dir}/Makefile. | |
138 | # | 138 | # | |
139 | _SUBDIR= tools .WAIT lib include external crypto/external bin | 139 | _SUBDIR= tools .WAIT lib | |
140 | .if ${MKLLVM} != "no" | |||
141 | _SUBDIR+= external/bsd/compiler_rt | |||
142 | .endif | |||
143 | _SUBDIR+= include external crypto/external bin | |||
140 | _SUBDIR+= games libexec sbin usr.bin | 144 | _SUBDIR+= games libexec sbin usr.bin | |
141 | _SUBDIR+= usr.sbin share sys etc tests compat | 145 | _SUBDIR+= usr.sbin share sys etc tests compat | |
142 | _SUBDIR+= .WAIT rescue .WAIT distrib regress | 146 | _SUBDIR+= .WAIT rescue .WAIT distrib regress | |
143 | 147 | |||
144 | .for dir in ${_SUBDIR} | 148 | .for dir in ${_SUBDIR} | |
145 | .if "${dir}" == ".WAIT" \ | 149 | .if "${dir}" == ".WAIT" \ | |
146 | || (${BUILD_${dir}:Uyes} != "no" && exists(${dir}/Makefile)) | 150 | || (${BUILD_${dir}:Uyes} != "no" && exists(${dir}/Makefile)) | |
147 | SUBDIR+= ${dir} | 151 | SUBDIR+= ${dir} | |
148 | .endif | 152 | .endif | |
149 | .endfor | 153 | .endfor | |
150 | 154 | |||
151 | .if exists(regress) | 155 | .if exists(regress) | |
152 | regression-tests: .PHONY .MAKE | 156 | regression-tests: .PHONY .MAKE | |
@@ -225,26 +229,32 @@ BUILDTARGETS+= do-tools | @@ -225,26 +229,32 @@ BUILDTARGETS+= do-tools | |||
225 | BUILDTARGETS+= params | 229 | BUILDTARGETS+= params | |
226 | .if ${MKOBJDIRS} != "no" | 230 | .if ${MKOBJDIRS} != "no" | |
227 | BUILDTARGETS+= obj | 231 | BUILDTARGETS+= obj | |
228 | .endif | 232 | .endif | |
229 | BUILDTARGETS+= clean_METALOG | 233 | BUILDTARGETS+= clean_METALOG | |
230 | .if !defined(NODISTRIBDIRS) | 234 | .if !defined(NODISTRIBDIRS) | |
231 | BUILDTARGETS+= do-distrib-dirs | 235 | BUILDTARGETS+= do-distrib-dirs | |
232 | .endif | 236 | .endif | |
233 | .if !defined(NOINCLUDES) | 237 | .if !defined(NOINCLUDES) | |
234 | BUILDTARGETS+= includes | 238 | BUILDTARGETS+= includes | |
235 | .endif | 239 | .endif | |
236 | BUILDTARGETS+= do-lib | 240 | BUILDTARGETS+= do-lib | |
237 | BUILDTARGETS+= do-compat-lib | 241 | BUILDTARGETS+= do-compat-lib | |
242 | .if ${MKLLVM} != "no" | |||
243 | BUILDTARGETS+= do-sanitizer | |||
244 | .if ${MKSANITIZER:Uno} == "yes" | |||
245 | BUILDTARGETS+= do-sanitizer-tools | |||
246 | .endif | |||
247 | .endif | |||
238 | .if ${MKX11} != "no" | 248 | .if ${MKX11} != "no" | |
239 | BUILDTARGETS+= do-x11 | 249 | BUILDTARGETS+= do-x11 | |
240 | .endif | 250 | .endif | |
241 | .if !defined(NOBINARIES) | 251 | .if !defined(NOBINARIES) | |
242 | BUILDTARGETS+= do-build | 252 | BUILDTARGETS+= do-build | |
243 | .if ${MKEXTSRC} != "no" | 253 | .if ${MKEXTSRC} != "no" | |
244 | BUILDTARGETS+= do-extsrc | 254 | BUILDTARGETS+= do-extsrc | |
245 | .endif | 255 | .endif | |
246 | BUILDTARGETS+= do-obsolete | 256 | BUILDTARGETS+= do-obsolete | |
247 | .endif | 257 | .endif | |
248 | 258 | |||
249 | # | 259 | # | |
250 | # Enforce proper ordering of some rules. | 260 | # Enforce proper ordering of some rules. | |
@@ -460,26 +470,36 @@ do-distrib-dirs: .PHONY .MAKE | @@ -460,26 +470,36 @@ do-distrib-dirs: .PHONY .MAKE | |||
460 | do-${targ}: .PHONY ${targ} | 470 | do-${targ}: .PHONY ${targ} | |
461 | @true | 471 | @true | |
462 | .endfor | 472 | .endfor | |
463 | 473 | |||
464 | do-tools: .PHONY .MAKE | 474 | do-tools: .PHONY .MAKE | |
465 | ${MAKEDIRTARGET} tools build_install | 475 | ${MAKEDIRTARGET} tools build_install | |
466 | 476 | |||
467 | do-lib: .PHONY .MAKE | 477 | do-lib: .PHONY .MAKE | |
468 | ${MAKEDIRTARGET} lib build_install | 478 | ${MAKEDIRTARGET} lib build_install | |
469 | 479 | |||
470 | do-compat-lib: .PHONY .MAKE | 480 | do-compat-lib: .PHONY .MAKE | |
471 | ${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../lib" | 481 | ${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../lib" | |
472 | 482 | |||
483 | do-sanitizer: .PHONY .MAKE | |||
484 | ${MAKEDIRTARGET} external/bsd/compiler_rt all | |||
485 | ||||
486 | do-sanitizer-tools: .PHONY .MAKE | |||
487 | .if !exists(${TOOLDIR}/lib/clang) && ${HAVE_LLVM:Uno} == "yes" | |||
488 | mkdir -p ${TOOLDIR}/lib/clang | |||
489 | cd ${DESTDIR}/usr/lib/clang && \ | |||
490 | ${TOOL_PAX} -rw . ${TOOLDIR}/lib/clang | |||
491 | .endif | |||
492 | ||||
473 | do-top-obj: .PHONY .MAKE | 493 | do-top-obj: .PHONY .MAKE | |
474 | ${MAKEDIRTARGET} . obj NOSUBDIR= | 494 | ${MAKEDIRTARGET} . obj NOSUBDIR= | |
475 | 495 | |||
476 | do-tools-obj: .PHONY .MAKE | 496 | do-tools-obj: .PHONY .MAKE | |
477 | ${MAKEDIRTARGET} tools obj | 497 | ${MAKEDIRTARGET} tools obj | |
478 | 498 | |||
479 | do-build: .PHONY .MAKE | 499 | do-build: .PHONY .MAKE | |
480 | .for targ in dependall install | 500 | .for targ in dependall install | |
481 | ${MAKEDIRTARGET} . ${targ} BUILD_tools=no BUILD_lib=no | 501 | ${MAKEDIRTARGET} . ${targ} BUILD_tools=no BUILD_lib=no | |
482 | .endfor | 502 | .endfor | |
483 | 503 | |||
484 | do-x11: .PHONY .MAKE | 504 | do-x11: .PHONY .MAKE | |
485 | .if ${MKX11} != "no" | 505 | .if ${MKX11} != "no" |
--- src/distrib/sets/lists/base/md.amd64 2019/08/16 19:10:42 1.277.2.1
+++ src/distrib/sets/lists/base/md.amd64 2019/09/01 10:36:25 1.277.2.2
@@ -1,66 +1,20 @@ | @@ -1,66 +1,20 @@ | |||
1 | # $NetBSD: md.amd64,v 1.277.2.1 2019/08/16 19:10:42 martin Exp $ | 1 | # $NetBSD: md.amd64,v 1.277.2.2 2019/09/01 10:36:25 martin Exp $ | |
2 | ./dev/lms0 base-obsolete obsolete | 2 | ./dev/lms0 base-obsolete obsolete | |
3 | ./dev/mms0 base-obsolete obsolete | 3 | ./dev/mms0 base-obsolete obsolete | |
4 | ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic | 4 | ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic | |
5 | ./usr/bin/fdformat base-util-bin | 5 | ./usr/bin/fdformat base-util-bin | |
6 | ./usr/bin/iasl base-util-bin | 6 | ./usr/bin/iasl base-util-bin | |
7 | ./usr/bin/pmc base-obsolete obsolete | 7 | ./usr/bin/pmc base-obsolete obsolete | |
8 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.a comp-cxx-lib llvm | |||
9 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.a comp-cxx-lib llvm | |||
10 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so comp-cxx-lib llvm | |||
11 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so.0 comp-cxx-lib llvm | |||
12 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so.0.0 comp-cxx-lib llvm | |||
13 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.so comp-cxx-lib llvm | |||
14 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.so.0 comp-cxx-lib llvm | |||
15 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.so.0.0 comp-cxx-lib llvm | |||
16 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-preinit-i386.a comp-cxx-lib llvm | |||
17 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-preinit-x86_64.a comp-cxx-lib llvm | |||
18 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan_cxx-i386.a comp-cxx-lib llvm | |||
19 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan_cxx-x86_64.a comp-cxx-lib llvm | |||
20 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.dd-x86_64.a comp-cxx-lib llvm | |||
21 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.dyndd-x86_64.so comp-cxx-lib llvm | |||
22 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.dyndd-x86_64.so.0 comp-cxx-lib llvm | |||
23 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.dyndd-x86_64.so.0.0 comp-cxx-lib llvm | |||
24 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.fuzzer-x86_64.a comp-cxx-lib llvm | |||
25 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.fuzzer_no_main-x86_64.a comp-cxx-lib llvm | |||
26 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.msan-x86_64.a comp-cxx-lib llvm | |||
27 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.msan_cxx-x86_64.a comp-cxx-lib llvm | |||
28 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.safestack-i386.a comp-cxx-lib llvm | |||
29 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.safestack-x86_64.a comp-cxx-lib llvm | |||
30 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.tsan-x86_64.a comp-cxx-lib llvm | |||
31 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.tsan_cxx-x86_64.a comp-cxx-lib llvm | |||
32 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.a comp-cxx-lib llvm | |||
33 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.a comp-cxx-lib llvm | |||
34 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so comp-cxx-lib llvm | |||
35 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so.0 comp-cxx-lib llvm | |||
36 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so.0.0 comp-cxx-lib llvm | |||
37 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.so comp-cxx-lib llvm | |||
38 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.so.0 comp-cxx-lib llvm | |||
39 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.so.0.0 comp-cxx-lib llvm | |||
40 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.a comp-cxx-lib llvm | |||
41 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-x86_64.a comp-cxx-lib llvm | |||
42 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.so comp-cxx-lib llvm | |||
43 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.so.0 comp-cxx-lib llvm | |||
44 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.so.0.0 comp-cxx-lib llvm | |||
45 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-x86_64.so comp-cxx-lib llvm | |||
46 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-x86_64.so.0 comp-cxx-lib llvm | |||
47 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-x86_64.so.0.0 comp-cxx-lib llvm | |||
48 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone_cxx-i386.a comp-cxx-lib llvm | |||
49 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone_cxx-x86_64.a comp-cxx-lib llvm | |||
50 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.xray-basic-x86_64.a comp-cxx-lib llvm | |||
51 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.xray-fdr-x86_64.a comp-cxx-lib llvm | |||
52 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.xray-profiling-x86_64.a comp-cxx-lib llvm | |||
53 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.xray-x86_64.a comp-cxx-lib llvm | |||
54 | ./usr/lib/i386/libi386.so.2 base-compat-shlib compat,pic | 8 | ./usr/lib/i386/libi386.so.2 base-compat-shlib compat,pic | |
55 | ./usr/lib/i386/libi386.so.2.0 base-compat-shlib compat,pic | 9 | ./usr/lib/i386/libi386.so.2.0 base-compat-shlib compat,pic | |
56 | ./usr/lib/i386/libproc.so.1 base-compat-shlib compat,pic,dtrace | 10 | ./usr/lib/i386/libproc.so.1 base-compat-shlib compat,pic,dtrace | |
57 | ./usr/lib/i386/libproc.so.1.0 base-compat-shlib compat,pic,dtrace | 11 | ./usr/lib/i386/libproc.so.1.0 base-compat-shlib compat,pic,dtrace | |
58 | ./usr/lib/i386/librtld_db.so.0 base-compat-shlib compat,pic,dtrace | 12 | ./usr/lib/i386/librtld_db.so.0 base-compat-shlib compat,pic,dtrace | |
59 | ./usr/lib/i386/librtld_db.so.0.0 base-compat-shlib compat,pic,dtrace | 13 | ./usr/lib/i386/librtld_db.so.0.0 base-compat-shlib compat,pic,dtrace | |
60 | ./usr/lib/libnvmm.so base-sys-shlib pic | 14 | ./usr/lib/libnvmm.so base-sys-shlib pic | |
61 | ./usr/lib/libnvmm.so.0 base-sys-shlib pic | 15 | ./usr/lib/libnvmm.so.0 base-sys-shlib pic | |
62 | ./usr/lib/libnvmm.so.0.1 base-sys-shlib pic | 16 | ./usr/lib/libnvmm.so.0.1 base-sys-shlib pic | |
63 | ./usr/lib/libx86_64.so base-sys-shlib pic | 17 | ./usr/lib/libx86_64.so base-sys-shlib pic | |
64 | ./usr/lib/libx86_64.so.0 base-sys-shlib pic | 18 | ./usr/lib/libx86_64.so.0 base-sys-shlib pic | |
65 | ./usr/lib/libx86_64.so.0.0 base-sys-shlib pic | 19 | ./usr/lib/libx86_64.so.0.0 base-sys-shlib pic | |
66 | ./usr/libexec/ld.elf_so-i386 base-sys-shlib compat,pic | 20 | ./usr/libexec/ld.elf_so-i386 base-sys-shlib compat,pic |
--- src/distrib/sets/lists/comp/md.amd64 2019/04/03 15:12:44 1.271
+++ src/distrib/sets/lists/comp/md.amd64 2019/09/01 10:36:25 1.271.2.1
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: md.amd64,v 1.271 2019/04/03 15:12:44 joerg Exp $ | 1 | # $NetBSD: md.amd64,v 1.271.2.1 2019/09/01 10:36:25 martin Exp $ | |
2 | ./usr/include/amd64 comp-c-include | 2 | ./usr/include/amd64 comp-c-include | |
3 | ./usr/include/amd64/ansi.h comp-c-include | 3 | ./usr/include/amd64/ansi.h comp-c-include | |
4 | ./usr/include/amd64/aout_machdep.h comp-c-include | 4 | ./usr/include/amd64/aout_machdep.h comp-c-include | |
5 | ./usr/include/amd64/asm.h comp-c-include | 5 | ./usr/include/amd64/asm.h comp-c-include | |
6 | ./usr/include/amd64/atomic.h comp-obsolete obsolete | 6 | ./usr/include/amd64/atomic.h comp-obsolete obsolete | |
7 | ./usr/include/amd64/autoconf.h comp-obsolete obsolete | 7 | ./usr/include/amd64/autoconf.h comp-obsolete obsolete | |
8 | ./usr/include/amd64/bootinfo.h comp-c-include | 8 | ./usr/include/amd64/bootinfo.h comp-c-include | |
9 | ./usr/include/amd64/bswap.h comp-c-include | 9 | ./usr/include/amd64/bswap.h comp-c-include | |
10 | ./usr/include/amd64/bus.h comp-obsolete obsolete | 10 | ./usr/include/amd64/bus.h comp-obsolete obsolete | |
11 | ./usr/include/amd64/byte_swap.h comp-c-include | 11 | ./usr/include/amd64/byte_swap.h comp-c-include | |
12 | ./usr/include/amd64/cdefs.h comp-c-include | 12 | ./usr/include/amd64/cdefs.h comp-c-include | |
13 | ./usr/include/amd64/cpu.h comp-c-include | 13 | ./usr/include/amd64/cpu.h comp-c-include | |
14 | ./usr/include/amd64/cpu_rng.h comp-c-include | 14 | ./usr/include/amd64/cpu_rng.h comp-c-include | |
@@ -832,26 +832,81 @@ | @@ -832,26 +832,81 @@ | |||
832 | ./usr/include/x86/pmap.h comp-c-include | 832 | ./usr/include/x86/pmap.h comp-c-include | |
833 | ./usr/include/x86/pmap_pv.h comp-c-include | 833 | ./usr/include/x86/pmap_pv.h comp-c-include | |
834 | ./usr/include/x86/psl.h comp-c-include | 834 | ./usr/include/x86/psl.h comp-c-include | |
835 | ./usr/include/x86/pte.h comp-c-include | 835 | ./usr/include/x86/pte.h comp-c-include | |
836 | ./usr/include/x86/rwlock.h comp-c-include | 836 | ./usr/include/x86/rwlock.h comp-c-include | |
837 | ./usr/include/x86/specialreg.h comp-c-include | 837 | ./usr/include/x86/specialreg.h comp-c-include | |
838 | ./usr/include/x86/sysarch.h comp-c-include | 838 | ./usr/include/x86/sysarch.h comp-c-include | |
839 | ./usr/include/x86/trap.h comp-c-include | 839 | ./usr/include/x86/trap.h comp-c-include | |
840 | ./usr/include/x86/via_padlock.h comp-c-include | 840 | ./usr/include/x86/via_padlock.h comp-c-include | |
841 | ./usr/include/xen comp-c-include | 841 | ./usr/include/xen comp-c-include | |
842 | ./usr/include/xen/xenio.h comp-c-include | 842 | ./usr/include/xen/xenio.h comp-c-include | |
843 | ./usr/include/xen/xenio3.h comp-c-include | 843 | ./usr/include/xen/xenio3.h comp-c-include | |
844 | ./usr/include/xmmintrin.h comp-obsolete obsolete | 844 | ./usr/include/xmmintrin.h comp-obsolete obsolete | |
845 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.a comp-cxx-lib compat,llvm | |||
846 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.a comp-cxx-lib llvm | |||
847 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.a.syms comp-cxx-lib llvm | |||
848 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so comp-cxx-lib compat,llvm | |||
849 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so.0 comp-cxx-lib compat,llvm | |||
850 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so.0.0 comp-cxx-lib compat,llvm | |||
851 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.so comp-cxx-lib llvm | |||
852 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.so.0 comp-cxx-lib llvm | |||
853 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.so.0.0 comp-cxx-lib llvm | |||
854 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-preinit-i386.a comp-cxx-lib compat,llvm | |||
855 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-preinit-x86_64.a comp-cxx-lib llvm | |||
856 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan_cxx-i386.a comp-cxx-lib compat,llvm | |||
857 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan_cxx-x86_64.a comp-cxx-lib llvm | |||
858 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan_cxx-x86_64.a.syms comp-cxx-lib llvm | |||
859 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.dd-x86_64.a comp-cxx-lib llvm | |||
860 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.dyndd-x86_64.so comp-cxx-lib llvm | |||
861 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.dyndd-x86_64.so.0 comp-cxx-lib llvm | |||
862 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.dyndd-x86_64.so.0.0 comp-cxx-lib llvm | |||
863 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.fuzzer-x86_64.a comp-cxx-lib llvm | |||
864 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.fuzzer_no_main-x86_64.a comp-cxx-lib llvm | |||
865 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.msan-x86_64.a comp-cxx-lib llvm | |||
866 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.msan-x86_64.a.syms comp-cxx-lib llvm | |||
867 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.msan_cxx-x86_64.a comp-cxx-lib llvm | |||
868 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.msan_cxx-x86_64.a.syms comp-cxx-lib llvm | |||
869 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.safestack-i386.a comp-cxx-lib compat,llvm | |||
870 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.safestack-x86_64.a comp-cxx-lib llvm | |||
871 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.tsan-x86_64.a comp-cxx-lib llvm | |||
872 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.tsan-x86_64.a.syms comp-cxx-lib llvm | |||
873 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.tsan_cxx-x86_64.a comp-cxx-lib llvm | |||
874 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.tsan_cxx-x86_64.a.syms comp-cxx-lib llvm | |||
875 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.a comp-cxx-lib compat,llvm | |||
876 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.a comp-cxx-lib llvm | |||
877 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.a.syms comp-cxx-lib llvm | |||
878 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so comp-cxx-lib compat,llvm | |||
879 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so.0 comp-cxx-lib compat,llvm | |||
880 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so.0.0 comp-cxx-lib compat,llvm | |||
881 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.so comp-cxx-lib llvm | |||
882 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.so.0 comp-cxx-lib llvm | |||
883 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.so.0.0 comp-cxx-lib llvm | |||
884 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.a comp-cxx-lib compat,llvm | |||
885 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-x86_64.a comp-cxx-lib llvm | |||
886 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-x86_64.a.syms comp-cxx-lib llvm | |||
887 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.so comp-cxx-lib compat,llvm | |||
888 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.so.0 comp-cxx-lib compat,llvm | |||
889 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.so.0.0 comp-cxx-lib compat,llvm | |||
890 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-x86_64.so comp-cxx-lib llvm | |||
891 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-x86_64.so.0 comp-cxx-lib llvm | |||
892 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-x86_64.so.0.0 comp-cxx-lib llvm | |||
893 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone_cxx-i386.a comp-cxx-lib compat,llvm | |||
894 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone_cxx-x86_64.a comp-cxx-lib llvm | |||
895 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone_cxx-x86_64.a.syms comp-cxx-lib llvm | |||
896 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.xray-basic-x86_64.a comp-cxx-lib llvm | |||
897 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.xray-fdr-x86_64.a comp-cxx-lib llvm | |||
898 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.xray-profiling-x86_64.a comp-cxx-lib llvm | |||
899 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.xray-x86_64.a comp-cxx-lib llvm | |||
845 | ./usr/lib/i386/libi386.a comp-c-lib compat | 900 | ./usr/lib/i386/libi386.a comp-c-lib compat | |
846 | ./usr/lib/i386/libi386.so comp-sys-shlib compat,pic | 901 | ./usr/lib/i386/libi386.so comp-sys-shlib compat,pic | |
847 | ./usr/lib/i386/libi386_p.a comp-c-proflib compat,profile | 902 | ./usr/lib/i386/libi386_p.a comp-c-proflib compat,profile | |
848 | ./usr/lib/i386/libi386_pic.a comp-c-piclib compat,pic,picinstall | 903 | ./usr/lib/i386/libi386_pic.a comp-c-piclib compat,pic,picinstall | |
849 | ./usr/lib/libnvmm.a comp-c-lib | 904 | ./usr/lib/libnvmm.a comp-c-lib | |
850 | ./usr/lib/libnvmm_p.a comp-c-proflib profile | 905 | ./usr/lib/libnvmm_p.a comp-c-proflib profile | |
851 | ./usr/lib/libnvmm_pic.a comp-c-piclib pic,picinstall | 906 | ./usr/lib/libnvmm_pic.a comp-c-piclib pic,picinstall | |
852 | ./usr/lib/libx86_64.a comp-c-lib | 907 | ./usr/lib/libx86_64.a comp-c-lib | |
853 | ./usr/lib/libx86_64_p.a comp-c-proflib profile | 908 | ./usr/lib/libx86_64_p.a comp-c-proflib profile | |
854 | ./usr/lib/libx86_64_pic.a comp-c-piclib pic,picinstall | 909 | ./usr/lib/libx86_64_pic.a comp-c-piclib pic,picinstall | |
855 | ./usr/libdata/ldscripts/elf_i386.x comp-util-bin binutils | 910 | ./usr/libdata/ldscripts/elf_i386.x comp-util-bin binutils | |
856 | ./usr/libdata/ldscripts/elf_i386.xbn comp-util-bin binutils | 911 | ./usr/libdata/ldscripts/elf_i386.xbn comp-util-bin binutils | |
857 | ./usr/libdata/ldscripts/elf_i386.xc comp-util-bin binutils | 912 | ./usr/libdata/ldscripts/elf_i386.xc comp-util-bin binutils |
--- src/distrib/sets/lists/comp/md.i386 2019/05/11 13:41:52 1.189
+++ src/distrib/sets/lists/comp/md.i386 2019/09/01 10:36:25 1.189.2.1
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: md.i386,v 1.189 2019/05/11 13:41:52 christos Exp $ | 1 | # $NetBSD: md.i386,v 1.189.2.1 2019/09/01 10:36:25 martin Exp $ | |
2 | ./usr/include/clang-3.4/__wmmintrin_aes.h comp-obsolete obsolete | 2 | ./usr/include/clang-3.4/__wmmintrin_aes.h comp-obsolete obsolete | |
3 | ./usr/include/clang-3.4/__wmmintrin_pclmul.h comp-obsolete obsolete | 3 | ./usr/include/clang-3.4/__wmmintrin_pclmul.h comp-obsolete obsolete | |
4 | ./usr/include/clang-3.4/ammintrin.h comp-obsolete obsolete | 4 | ./usr/include/clang-3.4/ammintrin.h comp-obsolete obsolete | |
5 | ./usr/include/clang-3.4/avx2intrin.h comp-obsolete obsolete | 5 | ./usr/include/clang-3.4/avx2intrin.h comp-obsolete obsolete | |
6 | ./usr/include/clang-3.4/avxintrin.h comp-obsolete obsolete | 6 | ./usr/include/clang-3.4/avxintrin.h comp-obsolete obsolete | |
7 | ./usr/include/clang-3.4/bmi2intrin.h comp-obsolete obsolete | 7 | ./usr/include/clang-3.4/bmi2intrin.h comp-obsolete obsolete | |
8 | ./usr/include/clang-3.4/bmiintrin.h comp-obsolete obsolete | 8 | ./usr/include/clang-3.4/bmiintrin.h comp-obsolete obsolete | |
9 | ./usr/include/clang-3.4/emmintrin.h comp-obsolete obsolete | 9 | ./usr/include/clang-3.4/emmintrin.h comp-obsolete obsolete | |
10 | ./usr/include/clang-3.4/f16cintrin.h comp-obsolete obsolete | 10 | ./usr/include/clang-3.4/f16cintrin.h comp-obsolete obsolete | |
11 | ./usr/include/clang-3.4/fma4intrin.h comp-obsolete obsolete | 11 | ./usr/include/clang-3.4/fma4intrin.h comp-obsolete obsolete | |
12 | ./usr/include/clang-3.4/fmaintrin.h comp-obsolete obsolete | 12 | ./usr/include/clang-3.4/fmaintrin.h comp-obsolete obsolete | |
13 | ./usr/include/clang-3.4/immintrin.h comp-obsolete obsolete | 13 | ./usr/include/clang-3.4/immintrin.h comp-obsolete obsolete | |
14 | ./usr/include/clang-3.4/lzcntintrin.h comp-obsolete obsolete | 14 | ./usr/include/clang-3.4/lzcntintrin.h comp-obsolete obsolete | |
@@ -701,24 +701,40 @@ | @@ -701,24 +701,40 @@ | |||
701 | ./usr/include/x86/pmap.h comp-c-include | 701 | ./usr/include/x86/pmap.h comp-c-include | |
702 | ./usr/include/x86/pmap_pv.h comp-c-include | 702 | ./usr/include/x86/pmap_pv.h comp-c-include | |
703 | ./usr/include/x86/psl.h comp-c-include | 703 | ./usr/include/x86/psl.h comp-c-include | |
704 | ./usr/include/x86/pte.h comp-c-include | 704 | ./usr/include/x86/pte.h comp-c-include | |
705 | ./usr/include/x86/rwlock.h comp-c-include | 705 | ./usr/include/x86/rwlock.h comp-c-include | |
706 | ./usr/include/x86/specialreg.h comp-c-include | 706 | ./usr/include/x86/specialreg.h comp-c-include | |
707 | ./usr/include/x86/sysarch.h comp-c-include | 707 | ./usr/include/x86/sysarch.h comp-c-include | |
708 | ./usr/include/x86/trap.h comp-c-include | 708 | ./usr/include/x86/trap.h comp-c-include | |
709 | ./usr/include/x86/via_padlock.h comp-c-include | 709 | ./usr/include/x86/via_padlock.h comp-c-include | |
710 | ./usr/include/xen comp-c-include | 710 | ./usr/include/xen comp-c-include | |
711 | ./usr/include/xen/xenio.h comp-c-include | 711 | ./usr/include/xen/xenio.h comp-c-include | |
712 | ./usr/include/xen/xenio3.h comp-c-include | 712 | ./usr/include/xen/xenio3.h comp-c-include | |
713 | ./usr/include/xmmintrin.h comp-obsolete obsolete | 713 | ./usr/include/xmmintrin.h comp-obsolete obsolete | |
714 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.a comp-cxx-lib llvm | |||
715 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so comp-cxx-lib llvm | |||
716 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so.0 comp-cxx-lib llvm | |||
717 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so.0.0 comp-cxx-lib llvm | |||
718 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-preinit-i386.a comp-cxx-lib llvm | |||
719 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan_cxx-i386.a comp-cxx-lib llvm | |||
720 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.safestack-i386.a comp-cxx-lib llvm | |||
721 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.a comp-cxx-lib llvm | |||
722 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so comp-cxx-lib llvm | |||
723 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so.0 comp-cxx-lib llvm | |||
724 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so.0.0 comp-cxx-lib llvm | |||
725 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.a comp-cxx-lib llvm | |||
726 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.so comp-cxx-lib llvm | |||
727 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.so.0 comp-cxx-lib llvm | |||
728 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.so.0.0 comp-cxx-lib llvm | |||
729 | ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone_cxx-i386.a comp-cxx-lib llvm | |||
714 | ./usr/lib/libi386.a comp-c-lib | 730 | ./usr/lib/libi386.a comp-c-lib | |
715 | ./usr/lib/libi386_p.a comp-c-proflib profile | 731 | ./usr/lib/libi386_p.a comp-c-proflib profile | |
716 | ./usr/lib/libi386_pic.a comp-c-piclib pic,picinstall | 732 | ./usr/lib/libi386_pic.a comp-c-piclib pic,picinstall | |
717 | ./usr/lib/libm387.a comp-c-lib | 733 | ./usr/lib/libm387.a comp-c-lib | |
718 | ./usr/lib/libm387_p.a comp-c-proflib profile | 734 | ./usr/lib/libm387_p.a comp-c-proflib profile | |
719 | ./usr/lib/libm387_pic.a comp-c-piclib pic,picinstall | 735 | ./usr/lib/libm387_pic.a comp-c-piclib pic,picinstall | |
720 | ./usr/lib/libpmc.a comp-obsolete obsolete | 736 | ./usr/lib/libpmc.a comp-obsolete obsolete | |
721 | ./usr/lib/libpmc_p.a comp-obsolete obsolete | 737 | ./usr/lib/libpmc_p.a comp-obsolete obsolete | |
722 | ./usr/lib/libpmc_pic.a comp-obsolete obsolete | 738 | ./usr/lib/libpmc_pic.a comp-obsolete obsolete | |
723 | ./usr/libdata/lint/llib-li386.ln comp-c-lintlib lint | 739 | ./usr/libdata/lint/llib-li386.ln comp-c-lintlib lint | |
724 | ./usr/libdata/lint/llib-lpmc.ln comp-obsolete obsolete | 740 | ./usr/libdata/lint/llib-lpmc.ln comp-obsolete obsolete |
--- src/external/bsd/Makefile 2019/08/16 19:10:42 1.63.2.1
+++ src/external/bsd/Makefile 2019/09/01 10:36:26 1.63.2.2
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.63.2.1 2019/08/16 19:10:42 martin Exp $ | 1 | # $NetBSD: Makefile,v 1.63.2.2 2019/09/01 10:36:26 martin Exp $ | |
2 | 2 | |||
3 | .include <bsd.own.mk> | 3 | .include <bsd.own.mk> | |
4 | 4 | |||
5 | SUBDIR= acpica am-utils bc byacc cron dhcpcd ekermit elftosb \ | 5 | SUBDIR= acpica am-utils bc byacc cron dhcpcd ekermit elftosb \ | |
6 | fetch file flex jemalloc less \ | 6 | fetch file flex jemalloc less \ | |
7 | libarchive libevent liblzf libpcap mdocml \ | 7 | libarchive libevent liblzf libpcap mdocml \ | |
8 | ntp openresolv tcpdump tmux top tre wpa | 8 | ntp openresolv tcpdump tmux top tre wpa | |
9 | 9 | |||
10 | .if (${MKATF} != "no") | 10 | .if (${MKATF} != "no") | |
11 | SUBDIR+= atf | 11 | SUBDIR+= atf | |
12 | .endif | 12 | .endif | |
13 | SUBDIR+= pkg_install | 13 | SUBDIR+= pkg_install | |
14 | # IP Filter | 14 | # IP Filter | |
@@ -20,29 +20,26 @@ SUBDIR+= iscsi | @@ -20,29 +20,26 @@ SUBDIR+= iscsi | |||
20 | .endif | 20 | .endif | |
21 | .if (${MKKYUA} != "no") | 21 | .if (${MKKYUA} != "no") | |
22 | SUBDIR+= lutok kyua-testers kyua-cli kyua-atf-compat | 22 | SUBDIR+= lutok kyua-testers kyua-cli kyua-atf-compat | |
23 | .endif | 23 | .endif | |
24 | .if (${MKLDAP} != "no") | 24 | .if (${MKLDAP} != "no") | |
25 | SUBDIR+= openldap | 25 | SUBDIR+= openldap | |
26 | .endif | 26 | .endif | |
27 | .if (${MKLIBCXX} != "no") | 27 | .if (${MKLIBCXX} != "no") | |
28 | SUBDIR+= libc++ | 28 | SUBDIR+= libc++ | |
29 | .endif | 29 | .endif | |
30 | .if (${MKLLVM} != "no" || ${MKLLVMRT} != "no") | 30 | .if (${MKLLVM} != "no" || ${MKLLVMRT} != "no") | |
31 | SUBDIR+= llvm | 31 | SUBDIR+= llvm | |
32 | .endif | 32 | .endif | |
33 | .if (${MKLLVM} != "no") | |||
34 | SUBDIR+= compiler_rt | |||
35 | .endif | |||
36 | .if (${MKNSD} != "no") | 33 | .if (${MKNSD} != "no") | |
37 | SUBDIR+= nsd | 34 | SUBDIR+= nsd | |
38 | .endif | 35 | .endif | |
39 | .if (${MKPCC} != "no") | 36 | .if (${MKPCC} != "no") | |
40 | SUBDIR+= pcc | 37 | SUBDIR+= pcc | |
41 | .endif | 38 | .endif | |
42 | .if (${MKDTRACE} != "no") | 39 | .if (${MKDTRACE} != "no") | |
43 | SUBDIR+= libproc | 40 | SUBDIR+= libproc | |
44 | SUBDIR+= librtld_db | 41 | SUBDIR+= librtld_db | |
45 | .endif | 42 | .endif | |
46 | .if ${MKUNBOUND} != "no" | 43 | .if ${MKUNBOUND} != "no" | |
47 | SUBDIR+= unbound | 44 | SUBDIR+= unbound | |
48 | .endif | 45 | .endif |
--- src/external/bsd/compiler_rt/Makefile 2019/08/16 18:44:09 1.1.2.2
+++ src/external/bsd/compiler_rt/Makefile 2019/09/01 10:36:27 1.1.2.3
@@ -1,5 +1,8 @@ | @@ -1,5 +1,8 @@ | |||
1 | # $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:09 martin Exp $ | 1 | # $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:27 martin Exp $ | |
2 | ||||
3 | .include <bsd.own.mk> | |||
2 | 4 | |||
3 | SUBDIR+= lib | 5 | SUBDIR+= lib | |
4 | 6 | |||
7 | .include <bsd.buildinstall.mk> | |||
5 | .include <bsd.subdir.mk> | 8 | .include <bsd.subdir.mk> |
--- src/external/bsd/compiler_rt/lib/clang/Makefile 2019/08/16 18:44:06 1.1.2.2
+++ src/external/bsd/compiler_rt/lib/clang/Makefile 2019/09/01 10:36:25 1.1.2.3
@@ -1,11 +1,6 @@ | @@ -1,11 +1,6 @@ | |||
1 | # $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:06 martin Exp $ | 1 | # $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:25 martin Exp $ | |
2 | ||||
3 | .include <bsd.own.mk> | |||
4 | 2 | |||
5 | SUBDIR+= include share | 3 | SUBDIR+= include share | |
6 | ||||
7 | .if ${MACHINE_ARCH} == "x86_64" | |||
8 | SUBDIR+= lib | 4 | SUBDIR+= lib | |
9 | .endif | |||
10 | 5 | |||
11 | .include <bsd.subdir.mk> | 6 | .include <bsd.subdir.mk> |
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile 2019/08/16 18:44:06 1.1.2.2
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile 2019/09/01 10:36:26 1.1.2.3
@@ -1,36 +1,44 @@ | @@ -1,36 +1,44 @@ | |||
1 | # $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:06 martin Exp $ | 1 | # $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:26 martin Exp $ | |
2 | 2 | |||
3 | SUBDIR+= asan-m32 | 3 | .include <bsd.own.mk> | |
4 | ||||
5 | .if ${MACHINE_ARCH} == "x86_64" | |||
4 | SUBDIR+= asan-m64 | 6 | SUBDIR+= asan-m64 | |
5 | SUBDIR+= asan-preinit-m32 | |||
6 | SUBDIR+= asan-preinit-m64 | 7 | SUBDIR+= asan-preinit-m64 | |
7 | SUBDIR+= asan_cxx-m32 | |||
8 | SUBDIR+= asan_cxx-m64 | 8 | SUBDIR+= asan_cxx-m64 | |
9 | SUBDIR+= asan-dynamic-m32 | |||
10 | SUBDIR+= asan-dynamic-m64 | 9 | SUBDIR+= asan-dynamic-m64 | |
11 | SUBDIR+= dd-m64 | 10 | SUBDIR+= dd-m64 | |
12 | SUBDIR+= dyndd-m64 | 11 | SUBDIR+= dyndd-m64 | |
13 | SUBDIR+= fuzzer-m64 | 12 | SUBDIR+= fuzzer-m64 | |
14 | SUBDIR+= fuzzer_no_main-m64 | 13 | SUBDIR+= fuzzer_no_main-m64 | |
15 | SUBDIR+= msan-m64 | 14 | SUBDIR+= msan-m64 | |
16 | SUBDIR+= msan_cxx-m64 | 15 | SUBDIR+= msan_cxx-m64 | |
17 | SUBDIR+= safestack-m32 | |||
18 | SUBDIR+= safestack-m64 | 16 | SUBDIR+= safestack-m64 | |
19 | SUBDIR+= tsan-m64 | 17 | SUBDIR+= tsan-m64 | |
20 | SUBDIR+= tsan_cxx-m64 | 18 | SUBDIR+= tsan_cxx-m64 | |
21 | SUBDIR+= ubsan_minimal-m32 | |||
22 | SUBDIR+= ubsan_minimal-m64 | 19 | SUBDIR+= ubsan_minimal-m64 | |
23 | SUBDIR+= ubsan_minimal-dynamic-m32 | |||
24 | SUBDIR+= ubsan_minimal-dynamic-m64 | 20 | SUBDIR+= ubsan_minimal-dynamic-m64 | |
25 | SUBDIR+= ubsan_standalone-m32 | |||
26 | SUBDIR+= ubsan_standalone-m64 | 21 | SUBDIR+= ubsan_standalone-m64 | |
27 | SUBDIR+= ubsan_standalone-dynamic-m32 | |||
28 | SUBDIR+= ubsan_standalone-dynamic-m64 | 22 | SUBDIR+= ubsan_standalone-dynamic-m64 | |
29 | SUBDIR+= ubsan_standalone_cxx-m32 | |||
30 | SUBDIR+= ubsan_standalone_cxx-m64 | 23 | SUBDIR+= ubsan_standalone_cxx-m64 | |
31 | SUBDIR+= xray-m64 | 24 | SUBDIR+= xray-m64 | |
32 | SUBDIR+= xray-basic-m64 | 25 | SUBDIR+= xray-basic-m64 | |
33 | SUBDIR+= xray-fdr-m64 | 26 | SUBDIR+= xray-fdr-m64 | |
34 | SUBDIR+= xray-profiling-m64 | 27 | SUBDIR+= xray-profiling-m64 | |
28 | .endif | |||
29 | ||||
30 | .if ${MACHINE_ARCH} == "i386" || \ | |||
31 | (${MACHINE_ARCH} == "x86_64" && ${MKCOMPAT} != "no") | |||
32 | SUBDIR+= asan-m32 | |||
33 | SUBDIR+= asan-preinit-m32 | |||
34 | SUBDIR+= asan_cxx-m32 | |||
35 | SUBDIR+= asan-dynamic-m32 | |||
36 | SUBDIR+= safestack-m32 | |||
37 | SUBDIR+= ubsan_minimal-m32 | |||
38 | SUBDIR+= ubsan_minimal-dynamic-m32 | |||
39 | SUBDIR+= ubsan_standalone-m32 | |||
40 | SUBDIR+= ubsan_standalone-dynamic-m32 | |||
41 | SUBDIR+= ubsan_standalone_cxx-m32 | |||
42 | .endif | |||
35 | 43 | |||
36 | .include <bsd.subdir.mk> | 44 | .include <bsd.subdir.mk> |
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/sources.mk 2019/08/16 18:44:06 1.1.2.2
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/sources.mk 2019/09/01 10:36:26 1.1.2.3
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: sources.mk,v 1.1.2.2 2019/08/16 18:44:06 martin Exp $ | 1 | # $NetBSD: sources.mk,v 1.1.2.3 2019/09/01 10:36:26 martin Exp $ | |
2 | 2 | |||
3 | # RTInterception | 3 | # RTInterception | |
4 | INTERCEPTION_SOURCES+= interception_linux.cc | 4 | INTERCEPTION_SOURCES+= interception_linux.cc | |
5 | INTERCEPTION_SOURCES+= interception_mac.cc | 5 | INTERCEPTION_SOURCES+= interception_mac.cc | |
6 | INTERCEPTION_SOURCES+= interception_win.cc | 6 | INTERCEPTION_SOURCES+= interception_win.cc | |
7 | INTERCEPTION_SOURCES+= interception_type_test.cc | 7 | INTERCEPTION_SOURCES+= interception_type_test.cc | |
8 | 8 | |||
9 | # RTSanitizerCommonNoTermination | 9 | # RTSanitizerCommonNoTermination | |
10 | SANITIZER_SOURCES_NOTERMINATION+= sanitizer_allocator.cc | 10 | SANITIZER_SOURCES_NOTERMINATION+= sanitizer_allocator.cc | |
11 | SANITIZER_SOURCES_NOTERMINATION+= sanitizer_common.cc | 11 | SANITIZER_SOURCES_NOTERMINATION+= sanitizer_common.cc | |
12 | SANITIZER_SOURCES_NOTERMINATION+= sanitizer_deadlock_detector1.cc | 12 | SANITIZER_SOURCES_NOTERMINATION+= sanitizer_deadlock_detector1.cc | |
13 | SANITIZER_SOURCES_NOTERMINATION+= sanitizer_deadlock_detector2.cc | 13 | SANITIZER_SOURCES_NOTERMINATION+= sanitizer_deadlock_detector2.cc | |
14 | SANITIZER_SOURCES_NOTERMINATION+= sanitizer_errno.cc | 14 | SANITIZER_SOURCES_NOTERMINATION+= sanitizer_errno.cc | |
@@ -226,26 +226,27 @@ UBSAN_STANDALONE_SOURCES+= ubsan_init_st | @@ -226,26 +226,27 @@ UBSAN_STANDALONE_SOURCES+= ubsan_init_st | |||
226 | UBSAN_STANDALONE_SOURCES+= ubsan_signals_standalone.cc | 226 | UBSAN_STANDALONE_SOURCES+= ubsan_signals_standalone.cc | |
227 | 227 | |||
228 | UBSAN_STANDALONE_SOURCES_STATIC+= ubsan_init_standalone_preinit.cc | 228 | UBSAN_STANDALONE_SOURCES_STATIC+= ubsan_init_standalone_preinit.cc | |
229 | 229 | |||
230 | UBSAN_CXXABI_SOURCES+= ubsan_handlers_cxx.cc | 230 | UBSAN_CXXABI_SOURCES+= ubsan_handlers_cxx.cc | |
231 | UBSAN_CXXABI_SOURCES+= ubsan_type_hash.cc | 231 | UBSAN_CXXABI_SOURCES+= ubsan_type_hash.cc | |
232 | UBSAN_CXXABI_SOURCES+= ubsan_type_hash_itanium.cc | 232 | UBSAN_CXXABI_SOURCES+= ubsan_type_hash_itanium.cc | |
233 | UBSAN_CXXABI_SOURCES+= ubsan_type_hash_win.cc | 233 | UBSAN_CXXABI_SOURCES+= ubsan_type_hash_win.cc | |
234 | 234 | |||
235 | .if 0 # ${MKCXXABI:U} == "yes" | 235 | .if 0 # ${MKCXXABI:U} == "yes" | |
236 | UBSAN_CXX_SOURCES+= ${UBSAN_CXXABI_SOURCES} | 236 | UBSAN_CXX_SOURCES+= ${UBSAN_CXXABI_SOURCES} | |
237 | .else | 237 | .else | |
238 | UBSAN_CXX_SOURCES+= cxx_dummy.cc | 238 | UBSAN_CXX_SOURCES+= cxx_dummy.cc | |
239 | CLEANFILES+= cxx_dummy.cc | |||
239 | 240 | |||
240 | cxx_dummy.cc: | 241 | cxx_dummy.cc: | |
241 | touch ${.TARGET} | 242 | touch ${.TARGET} | |
242 | .endif | 243 | .endif | |
243 | 244 | |||
244 | XRAY_SOURCES+= xray_buffer_queue.cc | 245 | XRAY_SOURCES+= xray_buffer_queue.cc | |
245 | XRAY_SOURCES+= xray_init.cc | 246 | XRAY_SOURCES+= xray_init.cc | |
246 | XRAY_SOURCES+= xray_flags.cc | 247 | XRAY_SOURCES+= xray_flags.cc | |
247 | XRAY_SOURCES+= xray_interface.cc | 248 | XRAY_SOURCES+= xray_interface.cc | |
248 | XRAY_SOURCES+= xray_log_interface.cc | 249 | XRAY_SOURCES+= xray_log_interface.cc | |
249 | XRAY_SOURCES+= xray_utils.cc | 250 | XRAY_SOURCES+= xray_utils.cc | |
250 | 251 | |||
251 | XRAY_FDR_MODE_SOURCES+= xray_fdr_flags.cc | 252 | XRAY_FDR_MODE_SOURCES+= xray_fdr_flags.cc |
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk 2019/08/16 18:44:06 1.1.2.2
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/syms.mk 2019/09/01 10:36:26 1.1.2.3
@@ -1,9 +1,11 @@ | @@ -1,9 +1,11 @@ | |||
1 | .SUFFIXES: .a .syms | 1 | # $NetBSD: syms.mk,v 1.1.2.3 2019/09/01 10:36:26 martin Exp $ | |
2 | .a.syms: | 2 | ||
3 | ${SCRIPT_ENV} \ | 3 | here := ${.PARSEDIR} | |
4 | NM=${NM} \ | 4 | ||
5 | AWK=${AWK} \ | 5 | .SUFFIXES: .a .a.syms | |
6 | FILE=${FILE} \ | 6 | .a.a.syms: | |
7 | ${_MKTARGET_CREATE} | |||
8 | NM=${NM:Q} AWK=${TOOL_AWK:Q} FILE=${TOOL_MKMAGIC:Q} \ | |||
7 | ${HOST_SH} \ | 9 | ${HOST_SH} \ | |
8 | ${.PARSEDIR}/gen_dynamic_list.sh \ | 10 | ${here}/gen_dynamic_list.sh \ | |
9 | ${.IMPSRC} > ${.TARGET} | 11 | ${.IMPSRC} > ${.TARGET} |
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile 2019/08/16 18:44:08 1.1.2.2
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile 2019/09/01 10:36:27 1.1.2.3
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:08 martin Exp $ | 1 | # $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:27 martin Exp $ | |
2 | 2 | |||
3 | NOSANITIZER= # defined | 3 | NOSANITIZER= # defined | |
4 | 4 | |||
5 | .include "../common.mk" | 5 | .include "../common.mk" | |
6 | .include "../sources.mk" | 6 | .include "../sources.mk" | |
7 | 7 | |||
8 | .include <bsd.own.mk> | 8 | .include <bsd.own.mk> | |
9 | 9 | |||
10 | TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist | 10 | TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist | |
11 | 11 | |||
12 | LIB= libclang_rt.asan-x86_64 | 12 | LIB= libclang_rt.asan-x86_64 | |
13 | 13 | |||
14 | .PATH: ${TOPDIR}/lib/interception | 14 | .PATH: ${TOPDIR}/lib/interception | |
@@ -42,20 +42,24 @@ LIBISCXX= yes | @@ -42,20 +42,24 @@ LIBISCXX= yes | |||
42 | 42 | |||
43 | _LIB_PREFIX= | 43 | _LIB_PREFIX= | |
44 | MKDEBUGLIB= no | 44 | MKDEBUGLIB= no | |
45 | MKLINT= no | 45 | MKLINT= no | |
46 | MKPICINSTALL= no | 46 | MKPICINSTALL= no | |
47 | MKPROFILE= no | 47 | MKPROFILE= no | |
48 | MKSTATICLIB= yes | 48 | MKSTATICLIB= yes | |
49 | 49 | |||
50 | CPPFLAGS+= -I${TOPDIR}/lib | 50 | CPPFLAGS+= -I${TOPDIR}/lib | |
51 | 51 | |||
52 | COPTS+= -fPIC | 52 | COPTS+= -fPIC | |
53 | 53 | |||
54 | .include "../m64.mk" | 54 | .include "../m64.mk" | |
55 | ||||
56 | .include "../syms.mk" | 55 | .include "../syms.mk" | |
57 | 56 | |||
58 | FILES= libclang_rt.asan-x86_64.a.syms | 57 | SYMS= libclang_rt.asan-x86_64.a.syms | |
58 | ||||
59 | realall: ${SYMS} | |||
60 | ||||
61 | CLEANFILES+= ${SYMS} | |||
62 | FILES= ${SYMS} | |||
59 | FILESDIR= ${LIBDIR} | 63 | FILESDIR= ${LIBDIR} | |
60 | 64 | |||
61 | .include <bsd.lib.mk> | 65 | .include <bsd.lib.mk> |
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile 2019/08/16 18:44:07 1.1.2.2
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile 2019/09/01 10:36:26 1.1.2.3
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:07 martin Exp $ | 1 | # $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:26 martin Exp $ | |
2 | 2 | |||
3 | NOSANITIZER= # defined | 3 | NOSANITIZER= # defined | |
4 | 4 | |||
5 | .include "../common.mk" | 5 | .include "../common.mk" | |
6 | .include "../sources.mk" | 6 | .include "../sources.mk" | |
7 | 7 | |||
8 | .include <bsd.own.mk> | 8 | .include <bsd.own.mk> | |
9 | 9 | |||
10 | TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist | 10 | TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist | |
11 | 11 | |||
12 | LIB= libclang_rt.asan_cxx-x86_64 | 12 | LIB= libclang_rt.asan_cxx-x86_64 | |
13 | 13 | |||
14 | .PATH: ${TOPDIR}/lib/asan | 14 | .PATH: ${TOPDIR}/lib/asan | |
@@ -25,20 +25,24 @@ LIBDIR= /usr/lib/clang/${CLANG_VER}/lib | @@ -25,20 +25,24 @@ LIBDIR= /usr/lib/clang/${CLANG_VER}/lib | |||
25 | LIBISCXX= yes | 25 | LIBISCXX= yes | |
26 | 26 | |||
27 | _LIB_PREFIX= | 27 | _LIB_PREFIX= | |
28 | MKDEBUGLIB= no | 28 | MKDEBUGLIB= no | |
29 | MKLINT= no | 29 | MKLINT= no | |
30 | MKPICINSTALL= no | 30 | MKPICINSTALL= no | |
31 | MKPROFILE= no | 31 | MKPROFILE= no | |
32 | MKSTATICLIB= yes | 32 | MKSTATICLIB= yes | |
33 | 33 | |||
34 | CPPFLAGS+= -I${TOPDIR}/lib | 34 | CPPFLAGS+= -I${TOPDIR}/lib | |
35 | COPTS+= -fPIC | 35 | COPTS+= -fPIC | |
36 | 36 | |||
37 | .include "../m64.mk" | 37 | .include "../m64.mk" | |
38 | ||||
39 | .include "../syms.mk" | 38 | .include "../syms.mk" | |
40 | 39 | |||
41 | FILES= libclang_rt.asan_cxx-x86_64.a.syms | 40 | SYMS= libclang_rt.asan_cxx-x86_64.a.syms | |
41 | ||||
42 | realall: ${SYMS} | |||
43 | ||||
44 | CLEANFILES+= ${SYMS} | |||
45 | FILES= ${SYMS} | |||
42 | FILESDIR= ${LIBDIR} | 46 | FILESDIR= ${LIBDIR} | |
43 | 47 | |||
44 | .include <bsd.lib.mk> | 48 | .include <bsd.lib.mk> |
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile 2019/08/16 18:44:08 1.1.2.2
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile 2019/09/01 10:36:26 1.1.2.3
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:08 martin Exp $ | 1 | # $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:26 martin Exp $ | |
2 | 2 | |||
3 | NOSANITIZER= # defined | 3 | NOSANITIZER= # defined | |
4 | 4 | |||
5 | .include "../common.mk" | 5 | .include "../common.mk" | |
6 | .include "../sources.mk" | 6 | .include "../sources.mk" | |
7 | 7 | |||
8 | .include <bsd.own.mk> | 8 | .include <bsd.own.mk> | |
9 | 9 | |||
10 | TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist | 10 | TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist | |
11 | 11 | |||
12 | LIB= libclang_rt.msan-x86_64 | 12 | LIB= libclang_rt.msan-x86_64 | |
13 | 13 | |||
14 | .PATH: ${TOPDIR}/lib/ubsan | 14 | .PATH: ${TOPDIR}/lib/ubsan | |
@@ -37,20 +37,24 @@ LIBISCXX= yes | @@ -37,20 +37,24 @@ LIBISCXX= yes | |||
37 | 37 | |||
38 | _LIB_PREFIX= | 38 | _LIB_PREFIX= | |
39 | MKDEBUGLIB= no | 39 | MKDEBUGLIB= no | |
40 | MKLINT= no | 40 | MKLINT= no | |
41 | MKPICINSTALL= no | 41 | MKPICINSTALL= no | |
42 | MKPROFILE= no | 42 | MKPROFILE= no | |
43 | MKSTATICLIB= yes | 43 | MKSTATICLIB= yes | |
44 | 44 | |||
45 | CPPFLAGS+= -I${TOPDIR}/lib | 45 | CPPFLAGS+= -I${TOPDIR}/lib | |
46 | 46 | |||
47 | COPTS+= -fPIC | 47 | COPTS+= -fPIC | |
48 | 48 | |||
49 | .include "../m64.mk" | 49 | .include "../m64.mk" | |
50 | ||||
51 | .include "../syms.mk" | 50 | .include "../syms.mk" | |
52 | 51 | |||
53 | FILES= libclang_rt.msan-x86_64.a.syms | 52 | SYMS= libclang_rt.msan-x86_64.a.syms | |
53 | ||||
54 | realall: ${SYMS} | |||
55 | ||||
56 | CLEANFILES+= ${SYMS} | |||
57 | FILES= ${SYMS} | |||
54 | FILESDIR= ${LIBDIR} | 58 | FILESDIR= ${LIBDIR} | |
55 | 59 | |||
56 | .include <bsd.lib.mk> | 60 | .include <bsd.lib.mk> |
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile 2019/08/16 18:44:06 1.1.2.2
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile 2019/09/01 10:36:25 1.1.2.3
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:06 martin Exp $ | 1 | # $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:25 martin Exp $ | |
2 | 2 | |||
3 | NOSANITIZER= # defined | 3 | NOSANITIZER= # defined | |
4 | 4 | |||
5 | .include "../common.mk" | 5 | .include "../common.mk" | |
6 | .include "../sources.mk" | 6 | .include "../sources.mk" | |
7 | 7 | |||
8 | .include <bsd.own.mk> | 8 | .include <bsd.own.mk> | |
9 | 9 | |||
10 | TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist | 10 | TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist | |
11 | 11 | |||
12 | LIB= libclang_rt.msan_cxx-x86_64 | 12 | LIB= libclang_rt.msan_cxx-x86_64 | |
13 | 13 | |||
14 | .PATH: ${TOPDIR}/lib/ubsan | 14 | .PATH: ${TOPDIR}/lib/ubsan | |
@@ -26,20 +26,24 @@ LIBISCXX= yes | @@ -26,20 +26,24 @@ LIBISCXX= yes | |||
26 | 26 | |||
27 | _LIB_PREFIX= | 27 | _LIB_PREFIX= | |
28 | MKDEBUGLIB= no | 28 | MKDEBUGLIB= no | |
29 | MKLINT= no | 29 | MKLINT= no | |
30 | MKPICINSTALL= no | 30 | MKPICINSTALL= no | |
31 | MKPROFILE= no | 31 | MKPROFILE= no | |
32 | MKSTATICLIB= yes | 32 | MKSTATICLIB= yes | |
33 | 33 | |||
34 | CPPFLAGS+= -I${TOPDIR}/lib | 34 | CPPFLAGS+= -I${TOPDIR}/lib | |
35 | 35 | |||
36 | COPTS+= -fPIC | 36 | COPTS+= -fPIC | |
37 | 37 | |||
38 | .include "../m64.mk" | 38 | .include "../m64.mk" | |
39 | ||||
40 | .include "../syms.mk" | 39 | .include "../syms.mk" | |
41 | 40 | |||
42 | FILES= libclang_rt.msan_cxx-x86_64.a.syms | 41 | SYMS= libclang_rt.msan_cxx-x86_64.a.syms | |
42 | ||||
43 | realall: ${SYMS} | |||
44 | ||||
45 | CLEANFILES+= ${SYMS} | |||
46 | FILES= ${SYMS} | |||
43 | FILESDIR= ${LIBDIR} | 47 | FILESDIR= ${LIBDIR} | |
44 | 48 | |||
45 | .include <bsd.lib.mk> | 49 | .include <bsd.lib.mk> |
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32/Makefile 2019/08/16 18:44:07 1.1.2.2
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32/Makefile 2019/09/01 10:36:26 1.1.2.3
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:07 martin Exp $ | 1 | # $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:26 martin Exp $ | |
2 | 2 | |||
3 | NOSANITIZER= # defined | 3 | NOSANITIZER= # defined | |
4 | 4 | |||
5 | .include "../common.mk" | 5 | .include "../common.mk" | |
6 | .include "../sources.mk" | 6 | .include "../sources.mk" | |
7 | 7 | |||
8 | .include <bsd.own.mk> | 8 | .include <bsd.own.mk> | |
9 | 9 | |||
10 | TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist | 10 | TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist | |
11 | 11 | |||
12 | LIB= libclang_rt.safestack-i386 | 12 | LIB= libclang_rt.safestack-i386 | |
13 | 13 | |||
14 | .PATH: ${TOPDIR}/lib/safestack | 14 | .PATH: ${TOPDIR}/lib/safestack | |
@@ -16,26 +16,28 @@ LIB= libclang_rt.safestack-i386 | @@ -16,26 +16,28 @@ LIB= libclang_rt.safestack-i386 | |||
16 | SRCS+= ${SAFESTACK_SOURCES} | 16 | SRCS+= ${SAFESTACK_SOURCES} | |
17 | 17 | |||
18 | .PATH: ${TOPDIR}/lib/interception | 18 | .PATH: ${TOPDIR}/lib/interception | |
19 | 19 | |||
20 | SRCS+= ${INTERCEPTION_SOURCES} | 20 | SRCS+= ${INTERCEPTION_SOURCES} | |
21 | 21 | |||
22 | .PATH: ${TOPDIR}/lib/sanitizer_common | 22 | .PATH: ${TOPDIR}/lib/sanitizer_common | |
23 | 23 | |||
24 | SRCS+= ${SANITIZER_SOURCES} | 24 | SRCS+= ${SANITIZER_SOURCES} | |
25 | SRCS+= ${SANITIZER_NOLIBC_SOURCES} | 25 | SRCS+= ${SANITIZER_NOLIBC_SOURCES} | |
26 | 26 | |||
27 | CXXFLAGS+= -fno-rtti -fno-exceptions -fno-builtin -fno-stack-protector | 27 | CXXFLAGS+= -fno-rtti -fno-exceptions -fno-builtin -fno-stack-protector | |
28 | 28 | |||
29 | COPTS.safestack.cc+= ${${ACTIVE_CXX} == "gcc" :? -Wno-error :} | |||
30 | ||||
29 | LIBDIR= /usr/lib/clang/${CLANG_VER}/lib/netbsd | 31 | LIBDIR= /usr/lib/clang/${CLANG_VER}/lib/netbsd | |
30 | LIBISCXX= yes | 32 | LIBISCXX= yes | |
31 | 33 | |||
32 | _LIB_PREFIX= | 34 | _LIB_PREFIX= | |
33 | MKDEBUGLIB= no | 35 | MKDEBUGLIB= no | |
34 | MKLINT= no | 36 | MKLINT= no | |
35 | MKPICINSTALL= no | 37 | MKPICINSTALL= no | |
36 | MKPROFILE= no | 38 | MKPROFILE= no | |
37 | MKSTATICLIB= yes | 39 | MKSTATICLIB= yes | |
38 | 40 | |||
39 | COPTS+= -fPIC | 41 | COPTS+= -fPIC | |
40 | CPPFLAGS+= -I${TOPDIR}/lib | 42 | CPPFLAGS+= -I${TOPDIR}/lib | |
41 | 43 |
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m64/Makefile 2019/08/16 18:44:08 1.1.2.2
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m64/Makefile 2019/09/01 10:36:27 1.1.2.3
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:08 martin Exp $ | 1 | # $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:27 martin Exp $ | |
2 | 2 | |||
3 | NOSANITIZER= # defined | 3 | NOSANITIZER= # defined | |
4 | 4 | |||
5 | .include "../common.mk" | 5 | .include "../common.mk" | |
6 | .include "../sources.mk" | 6 | .include "../sources.mk" | |
7 | 7 | |||
8 | .include <bsd.own.mk> | 8 | .include <bsd.own.mk> | |
9 | 9 | |||
10 | TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist | 10 | TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist | |
11 | 11 | |||
12 | LIB= libclang_rt.safestack-x86_64 | 12 | LIB= libclang_rt.safestack-x86_64 | |
13 | 13 | |||
14 | .PATH: ${TOPDIR}/lib/safestack | 14 | .PATH: ${TOPDIR}/lib/safestack | |
@@ -16,26 +16,28 @@ LIB= libclang_rt.safestack-x86_64 | @@ -16,26 +16,28 @@ LIB= libclang_rt.safestack-x86_64 | |||
16 | SRCS+= ${SAFESTACK_SOURCES} | 16 | SRCS+= ${SAFESTACK_SOURCES} | |
17 | 17 | |||
18 | .PATH: ${TOPDIR}/lib/interception | 18 | .PATH: ${TOPDIR}/lib/interception | |
19 | 19 | |||
20 | SRCS+= ${INTERCEPTION_SOURCES} | 20 | SRCS+= ${INTERCEPTION_SOURCES} | |
21 | 21 | |||
22 | .PATH: ${TOPDIR}/lib/sanitizer_common | 22 | .PATH: ${TOPDIR}/lib/sanitizer_common | |
23 | 23 | |||
24 | SRCS+= ${SANITIZER_SOURCES} | 24 | SRCS+= ${SANITIZER_SOURCES} | |
25 | SRCS+= ${SANITIZER_NOLIBC_SOURCES} | 25 | SRCS+= ${SANITIZER_NOLIBC_SOURCES} | |
26 | 26 | |||
27 | CXXFLAGS+= -fno-rtti -fno-exceptions -fno-builtin -fno-stack-protector | 27 | CXXFLAGS+= -fno-rtti -fno-exceptions -fno-builtin -fno-stack-protector | |
28 | 28 | |||
29 | COPTS.safestack.cc+= ${${ACTIVE_CXX} == "gcc" :? -Wno-error :} | |||
30 | ||||
29 | LIBDIR= /usr/lib/clang/${CLANG_VER}/lib/netbsd | 31 | LIBDIR= /usr/lib/clang/${CLANG_VER}/lib/netbsd | |
30 | LIBISCXX= yes | 32 | LIBISCXX= yes | |
31 | 33 | |||
32 | _LIB_PREFIX= | 34 | _LIB_PREFIX= | |
33 | MKDEBUGLIB= no | 35 | MKDEBUGLIB= no | |
34 | MKLINT= no | 36 | MKLINT= no | |
35 | MKPICINSTALL= no | 37 | MKPICINSTALL= no | |
36 | MKPROFILE= no | 38 | MKPROFILE= no | |
37 | MKSTATICLIB= yes | 39 | MKSTATICLIB= yes | |
38 | 40 | |||
39 | COPTS+= -fPIC | 41 | COPTS+= -fPIC | |
40 | CPPFLAGS+= -I${TOPDIR}/lib | 42 | CPPFLAGS+= -I${TOPDIR}/lib | |
41 | 43 |
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile 2019/08/16 18:44:09 1.1.2.2
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile 2019/09/01 10:36:27 1.1.2.3
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:09 martin Exp $ | 1 | # $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:27 martin Exp $ | |
2 | 2 | |||
3 | NOSANITIZER= # defined | 3 | NOSANITIZER= # defined | |
4 | 4 | |||
5 | .include "../common.mk" | 5 | .include "../common.mk" | |
6 | .include "../sources.mk" | 6 | .include "../sources.mk" | |
7 | 7 | |||
8 | .include <bsd.own.mk> | 8 | .include <bsd.own.mk> | |
9 | 9 | |||
10 | TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist | 10 | TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist | |
11 | 11 | |||
12 | LIB= libclang_rt.tsan-x86_64 | 12 | LIB= libclang_rt.tsan-x86_64 | |
13 | 13 | |||
14 | .PATH: ${TOPDIR}/lib/ubsan | 14 | .PATH: ${TOPDIR}/lib/ubsan | |
@@ -37,20 +37,24 @@ LIBDIR= /usr/lib/clang/${CLANG_VER}/lib | @@ -37,20 +37,24 @@ LIBDIR= /usr/lib/clang/${CLANG_VER}/lib | |||
37 | LIBISCXX= yes | 37 | LIBISCXX= yes | |
38 | 38 | |||
39 | _LIB_PREFIX= | 39 | _LIB_PREFIX= | |
40 | MKDEBUGLIB= no | 40 | MKDEBUGLIB= no | |
41 | MKLINT= no | 41 | MKLINT= no | |
42 | MKPICINSTALL= no | 42 | MKPICINSTALL= no | |
43 | MKPROFILE= no | 43 | MKPROFILE= no | |
44 | MKSTATICLIB= yes | 44 | MKSTATICLIB= yes | |
45 | 45 | |||
46 | COPTS+= -fPIC | 46 | COPTS+= -fPIC | |
47 | CPPFLAGS+= -I${TOPDIR}/lib | 47 | CPPFLAGS+= -I${TOPDIR}/lib | |
48 | 48 | |||
49 | .include "../m64.mk" | 49 | .include "../m64.mk" | |
50 | ||||
51 | .include "../syms.mk" | 50 | .include "../syms.mk" | |
52 | 51 | |||
53 | FILES= libclang_rt.tsan-x86_64.a.syms | 52 | SYMS= libclang_rt.tsan-x86_64.a.syms | |
53 | ||||
54 | realall: ${SYMS} | |||
55 | ||||
56 | CLEANFILES+= ${SYMS} | |||
57 | FILES= ${SYMS} | |||
54 | FILESDIR= ${LIBDIR} | 58 | FILESDIR= ${LIBDIR} | |
55 | 59 | |||
56 | .include <bsd.lib.mk> | 60 | .include <bsd.lib.mk> |
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile 2019/08/16 18:44:09 1.1.2.2
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile 2019/09/01 10:36:27 1.1.2.3
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:09 martin Exp $ | 1 | # $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:27 martin Exp $ | |
2 | 2 | |||
3 | NOSANITIZER= # defined | 3 | NOSANITIZER= # defined | |
4 | 4 | |||
5 | .include "../common.mk" | 5 | .include "../common.mk" | |
6 | .include "../sources.mk" | 6 | .include "../sources.mk" | |
7 | 7 | |||
8 | .include <bsd.own.mk> | 8 | .include <bsd.own.mk> | |
9 | 9 | |||
10 | TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist | 10 | TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist | |
11 | 11 | |||
12 | LIB= libclang_rt.tsan_cxx-x86_64 | 12 | LIB= libclang_rt.tsan_cxx-x86_64 | |
13 | 13 | |||
14 | .PATH: ${TOPDIR}/lib/tsan/rtl | 14 | .PATH: ${TOPDIR}/lib/tsan/rtl | |
@@ -25,20 +25,24 @@ LIBDIR= /usr/lib/clang/${CLANG_VER}/lib | @@ -25,20 +25,24 @@ LIBDIR= /usr/lib/clang/${CLANG_VER}/lib | |||
25 | LIBISCXX= yes | 25 | LIBISCXX= yes | |
26 | 26 | |||
27 | _LIB_PREFIX= | 27 | _LIB_PREFIX= | |
28 | MKDEBUGLIB= no | 28 | MKDEBUGLIB= no | |
29 | MKLINT= no | 29 | MKLINT= no | |
30 | MKPICINSTALL= no | 30 | MKPICINSTALL= no | |
31 | MKPROFILE= no | 31 | MKPROFILE= no | |
32 | MKSTATICLIB= yes | 32 | MKSTATICLIB= yes | |
33 | 33 | |||
34 | COPTS+= -fPIC | 34 | COPTS+= -fPIC | |
35 | CPPFLAGS+= -I${TOPDIR}/lib | 35 | CPPFLAGS+= -I${TOPDIR}/lib | |
36 | 36 | |||
37 | .include "../m64.mk" | 37 | .include "../m64.mk" | |
38 | ||||
39 | .include "../syms.mk" | 38 | .include "../syms.mk" | |
40 | 39 | |||
41 | FILES= libclang_rt.tsan_cxx-x86_64.a.syms | 40 | SYMS= libclang_rt.tsan_cxx-x86_64.a.syms | |
41 | ||||
42 | realall: ${SYMS} | |||
43 | ||||
44 | CLEANFILES+= ${SYMS} | |||
45 | FILES= ${SYMS} | |||
42 | FILESDIR= ${LIBDIR} | 46 | FILESDIR= ${LIBDIR} | |
43 | 47 | |||
44 | .include <bsd.lib.mk> | 48 | .include <bsd.lib.mk> |
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile 2019/08/16 18:44:10 1.1.2.2
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile 2019/09/01 10:36:25 1.1.2.3
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:10 martin Exp $ | 1 | # $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:25 martin Exp $ | |
2 | 2 | |||
3 | NOSANITIZER= # defined | 3 | NOSANITIZER= # defined | |
4 | 4 | |||
5 | .include "../common.mk" | 5 | .include "../common.mk" | |
6 | .include "../sources.mk" | 6 | .include "../sources.mk" | |
7 | 7 | |||
8 | .include <bsd.own.mk> | 8 | .include <bsd.own.mk> | |
9 | 9 | |||
10 | TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist | 10 | TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist | |
11 | 11 | |||
12 | LIB= libclang_rt.ubsan_minimal-x86_64 | 12 | LIB= libclang_rt.ubsan_minimal-x86_64 | |
13 | 13 | |||
14 | .PATH: ${TOPDIR}/lib/ubsan_minimal | 14 | .PATH: ${TOPDIR}/lib/ubsan_minimal | |
@@ -21,20 +21,24 @@ LIBDIR= /usr/lib/clang/${CLANG_VER}/lib | @@ -21,20 +21,24 @@ LIBDIR= /usr/lib/clang/${CLANG_VER}/lib | |||
21 | LIBISCXX= yes | 21 | LIBISCXX= yes | |
22 | 22 | |||
23 | _LIB_PREFIX= | 23 | _LIB_PREFIX= | |
24 | MKDEBUGLIB= no | 24 | MKDEBUGLIB= no | |
25 | MKLINT= no | 25 | MKLINT= no | |
26 | MKPICINSTALL= no | 26 | MKPICINSTALL= no | |
27 | MKPROFILE= no | 27 | MKPROFILE= no | |
28 | MKSTATICLIB= yes | 28 | MKSTATICLIB= yes | |
29 | 29 | |||
30 | COPTS+= -fPIC | 30 | COPTS+= -fPIC | |
31 | CPPFLAGS+= -I${TOPDIR}/lib | 31 | CPPFLAGS+= -I${TOPDIR}/lib | |
32 | 32 | |||
33 | .include "../m64.mk" | 33 | .include "../m64.mk" | |
34 | ||||
35 | .include "../syms.mk" | 34 | .include "../syms.mk" | |
36 | 35 | |||
37 | FILES= libclang_rt.ubsan_minimal-x86_64.a.syms | 36 | SYMS= libclang_rt.ubsan_minimal-x86_64.a.syms | |
37 | ||||
38 | realall: ${SYMS} | |||
39 | ||||
40 | CLEANFILES+= ${SYMS} | |||
41 | FILES= ${SYMS} | |||
38 | FILESDIR= ${LIBDIR} | 42 | FILESDIR= ${LIBDIR} | |
39 | 43 | |||
40 | .include <bsd.lib.mk> | 44 | .include <bsd.lib.mk> |
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile 2019/08/16 18:44:08 1.1.2.2
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile 2019/09/01 10:36:26 1.1.2.3
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:08 martin Exp $ | 1 | # $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:26 martin Exp $ | |
2 | 2 | |||
3 | NOSANITIZER= # defined | 3 | NOSANITIZER= # defined | |
4 | 4 | |||
5 | .include "../common.mk" | 5 | .include "../common.mk" | |
6 | .include "../sources.mk" | 6 | .include "../sources.mk" | |
7 | 7 | |||
8 | .include <bsd.own.mk> | 8 | .include <bsd.own.mk> | |
9 | 9 | |||
10 | TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist | 10 | TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist | |
11 | 11 | |||
12 | LIB= libclang_rt.ubsan_standalone-x86_64 | 12 | LIB= libclang_rt.ubsan_standalone-x86_64 | |
13 | 13 | |||
14 | .PATH: ${TOPDIR}/lib/interception | 14 | .PATH: ${TOPDIR}/lib/interception | |
@@ -35,20 +35,24 @@ LIBDIR= /usr/lib/clang/${CLANG_VER}/lib | @@ -35,20 +35,24 @@ LIBDIR= /usr/lib/clang/${CLANG_VER}/lib | |||
35 | LIBISCXX= yes | 35 | LIBISCXX= yes | |
36 | 36 | |||
37 | _LIB_PREFIX= | 37 | _LIB_PREFIX= | |
38 | MKDEBUGLIB= no | 38 | MKDEBUGLIB= no | |
39 | MKLINT= no | 39 | MKLINT= no | |
40 | MKPICINSTALL= no | 40 | MKPICINSTALL= no | |
41 | MKPROFILE= no | 41 | MKPROFILE= no | |
42 | MKSTATICLIB= yes | 42 | MKSTATICLIB= yes | |
43 | 43 | |||
44 | COPTS+= -fPIC | 44 | COPTS+= -fPIC | |
45 | CPPFLAGS+= -I${TOPDIR}/lib | 45 | CPPFLAGS+= -I${TOPDIR}/lib | |
46 | 46 | |||
47 | .include "../m64.mk" | 47 | .include "../m64.mk" | |
48 | ||||
49 | .include "../syms.mk" | 48 | .include "../syms.mk" | |
50 | 49 | |||
51 | FILES= libclang_rt.ubsan_standalone-x86_64.a.syms | 50 | SYMS= libclang_rt.ubsan_standalone-x86_64.a.syms | |
51 | ||||
52 | realall: ${SYMS} | |||
53 | ||||
54 | CLEANFILES+= ${SYMS} | |||
55 | FILES= ${SYMS} | |||
52 | FILESDIR= ${LIBDIR} | 56 | FILESDIR= ${LIBDIR} | |
53 | 57 | |||
54 | .include <bsd.lib.mk> | 58 | .include <bsd.lib.mk> |
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile 2019/08/16 18:44:08 1.1.2.2
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile 2019/09/01 10:36:26 1.1.2.3
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:08 martin Exp $ | 1 | # $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:26 martin Exp $ | |
2 | 2 | |||
3 | NOSANITIZER= # defined | 3 | NOSANITIZER= # defined | |
4 | 4 | |||
5 | .include "../common.mk" | 5 | .include "../common.mk" | |
6 | .include "../sources.mk" | 6 | .include "../sources.mk" | |
7 | 7 | |||
8 | .include <bsd.own.mk> | 8 | .include <bsd.own.mk> | |
9 | 9 | |||
10 | TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist | 10 | TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist | |
11 | 11 | |||
12 | LIB= libclang_rt.ubsan_standalone_cxx-x86_64 | 12 | LIB= libclang_rt.ubsan_standalone_cxx-x86_64 | |
13 | 13 | |||
14 | .PATH: ${TOPDIR}/lib/ubsan | 14 | .PATH: ${TOPDIR}/lib/ubsan | |
@@ -21,20 +21,24 @@ LIBDIR= /usr/lib/clang/${CLANG_VER}/lib | @@ -21,20 +21,24 @@ LIBDIR= /usr/lib/clang/${CLANG_VER}/lib | |||
21 | LIBISCXX= yes | 21 | LIBISCXX= yes | |
22 | 22 | |||
23 | _LIB_PREFIX= | 23 | _LIB_PREFIX= | |
24 | MKDEBUGLIB= no | 24 | MKDEBUGLIB= no | |
25 | MKLINT= no | 25 | MKLINT= no | |
26 | MKPICINSTALL= no | 26 | MKPICINSTALL= no | |
27 | MKPROFILE= no | 27 | MKPROFILE= no | |
28 | MKSTATICLIB= yes | 28 | MKSTATICLIB= yes | |
29 | 29 | |||
30 | COPTS+= -fPIC | 30 | COPTS+= -fPIC | |
31 | CPPFLAGS+= -I${TOPDIR}/lib | 31 | CPPFLAGS+= -I${TOPDIR}/lib | |
32 | 32 | |||
33 | .include "../m64.mk" | 33 | .include "../m64.mk" | |
34 | ||||
35 | .include "../syms.mk" | 34 | .include "../syms.mk" | |
36 | 35 | |||
37 | FILES= libclang_rt.ubsan_standalone_cxx-x86_64.a.syms | 36 | SYMS= libclang_rt.ubsan_standalone_cxx-x86_64.a.syms | |
37 | ||||
38 | realall: ${SYMS} | |||
39 | ||||
40 | CLEANFILES+= ${SYMS} | |||
41 | FILES= ${SYMS} | |||
38 | FILESDIR= ${LIBDIR} | 42 | FILESDIR= ${LIBDIR} | |
39 | 43 | |||
40 | .include <bsd.lib.mk> | 44 | .include <bsd.lib.mk> |
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-m64/Makefile 2019/08/16 18:44:07 1.1.2.2
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-m64/Makefile 2019/09/01 10:36:26 1.1.2.3
@@ -1,38 +1,40 @@ | @@ -1,38 +1,40 @@ | |||
1 | # $NetBSD: Makefile,v 1.1.2.2 2019/08/16 18:44:07 martin Exp $ | 1 | # $NetBSD: Makefile,v 1.1.2.3 2019/09/01 10:36:26 martin Exp $ | |
2 | 2 | |||
3 | NOSANITIZER= # defined | 3 | NOSANITIZER= # defined | |
4 | 4 | |||
5 | .include "../common.mk" | 5 | .include "../common.mk" | |
6 | .include "../sources.mk" | 6 | .include "../sources.mk" | |
7 | 7 | |||
8 | .include <bsd.own.mk> | 8 | .include <bsd.own.mk> | |
9 | 9 | |||
10 | TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist | 10 | TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist | |
11 | 11 | |||
12 | LIB= libclang_rt.xray-x86_64 | 12 | LIB= libclang_rt.xray-x86_64 | |
13 | 13 | |||
14 | .PATH: ${TOPDIR}/lib/xray | 14 | .PATH: ${TOPDIR}/lib/xray | |
15 | 15 | |||
16 | SRCS+= ${XRAY_SOURCES} | 16 | SRCS+= ${XRAY_SOURCES} | |
17 | SRCS+= ${XRAY_ARCH_SOURCES} | 17 | SRCS+= ${XRAY_ARCH_SOURCES} | |
18 | 18 | |||
19 | .PATH: ${TOPDIR}/lib/sanitizer_common | 19 | .PATH: ${TOPDIR}/lib/sanitizer_common | |
20 | 20 | |||
21 | SRCS+= ${SANITIZER_SOURCES} | 21 | SRCS+= ${SANITIZER_SOURCES} | |
22 | SRCS+= ${SANITIZER_LIBCDEP_SOURCES} | 22 | SRCS+= ${SANITIZER_LIBCDEP_SOURCES} | |
23 | 23 | |||
24 | CXXFLAGS+= -fno-rtti -fno-exceptions -fno-builtin -fno-stack-protector | 24 | CXXFLAGS+= -fno-rtti -fno-exceptions -fno-builtin -fno-stack-protector | |
25 | 25 | |||
26 | COPTS.xray_init.cc+= ${${ACTIVE_CXX} == "gcc" :? -Wno-error :} | |||
27 | ||||
26 | # Macro defined in newer builtin subdirectory, it has to be empty on NetBSD | 28 | # Macro defined in newer builtin subdirectory, it has to be empty on NetBSD | |
27 | CPPFLAGS+= -DNO_EXEC_STACK_DIRECTIVE="" | 29 | CPPFLAGS+= -DNO_EXEC_STACK_DIRECTIVE="" | |
28 | 30 | |||
29 | LIBDIR= /usr/lib/clang/${CLANG_VER}/lib/netbsd | 31 | LIBDIR= /usr/lib/clang/${CLANG_VER}/lib/netbsd | |
30 | LIBISCXX= yes | 32 | LIBISCXX= yes | |
31 | 33 | |||
32 | _LIB_PREFIX= | 34 | _LIB_PREFIX= | |
33 | MKDEBUGLIB= no | 35 | MKDEBUGLIB= no | |
34 | MKLINT= no | 36 | MKLINT= no | |
35 | MKPICINSTALL= no | 37 | MKPICINSTALL= no | |
36 | MKPROFILE= no | 38 | MKPROFILE= no | |
37 | MKSTATICLIB= yes | 39 | MKSTATICLIB= yes | |
38 | 40 |