Module Name: src
Committed By: adam
Date: Thu Aug 22 18:15:44 UTC 2019
Modified Files:
src/distrib/sets/lists/base: md.amd64
src/external/bsd/compiler_rt/lib/clang/lib/netbsd: Makefile
Log Message:
Fix building compiler_rt with MKCOMPAT=no; approved by kamil@
To generate a diff of this commit:
cvs rdiff -u -r1.278 -r1.279 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.278 src/distrib/sets/lists/base/md.amd64:1.279
--- src/distrib/sets/lists/base/md.amd64:1.278 Wed Aug 14 01:42:08 2019
+++ src/distrib/sets/lists/base/md.amd64 Thu Aug 22 18:15:44 2019
@@ -1,21 +1,21 @@
-# $NetBSD: md.amd64,v 1.278 2019/08/14 01:42:08 kamil Exp $
+# $NetBSD: md.amd64,v 1.279 2019/08/22 18:15:44 adam 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-i386.a comp-cxx-lib compat,llvm
./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.a comp-cxx-lib llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so comp-cxx-lib 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-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 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 llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan_cxx-i386.a comp-cxx-lib compat,llvm
./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan_cxx-x86_64.a comp-cxx-lib llvm
./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.dd-x86_64.a comp-cxx-lib llvm
./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.dyndd-x86_64.so comp-cxx-lib llvm
@@ -25,27 +25,27 @@
./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-i386.a comp-cxx-lib compat,llvm
./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.safestack-x86_64.a comp-cxx-lib llvm
./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.tsan-x86_64.a comp-cxx-lib llvm
./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.tsan_cxx-x86_64.a comp-cxx-lib llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.a comp-cxx-lib llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.a comp-cxx-lib compat,llvm
./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.a comp-cxx-lib llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so comp-cxx-lib 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-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 llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.a comp-cxx-lib compat,llvm
./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-x86_64.a comp-cxx-lib llvm
-./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.so comp-cxx-lib 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-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 llvm
+./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone_cxx-i386.a comp-cxx-lib compat,llvm
./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone_cxx-x86_64.a comp-cxx-lib llvm
./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.xray-basic-x86_64.a comp-cxx-lib llvm
./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.xray-fdr-x86_64.a comp-cxx-lib llvm
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 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile:1.2
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile:1.1 Thu Aug 8 14:00:28 2019
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile Thu Aug 22 18:15:44 2019
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2019/08/08 14:00:28 kamil Exp $
+# $NetBSD: Makefile,v 1.2 2019/08/22 18:15:44 adam Exp $
+
+.include <bsd.own.mk>
-SUBDIR+= asan-m32
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 +12,30 @@ 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
+.if ${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>
