11 files changed, 97 insertions, 6 deletions

diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile
index 6ad465bf0f67e..b3381050a0d56 100644
--- a/lib/libclang_rt/Makefile
+++ b/lib/libclang_rt/Makefile
@@ -6,6 +6,8 @@ SUBDIR+=	asan
 SUBDIR+=	asan-preinit
 SUBDIR+=	asan_cxx
 SUBDIR+=	asan_dynamic
+SUBDIR+=	msan
+SUBDIR+=	msan_cxx
 SUBDIR+=	safestack
 SUBDIR+=	stats
 SUBDIR+=	stats_client
diff --git a/lib/libclang_rt/asan/Makefile b/lib/libclang_rt/asan/Makefile
index 9cbfa685d7197..6a7d22b7bde99 100644
--- a/lib/libclang_rt/asan/Makefile
+++ b/lib/libclang_rt/asan/Makefile
@@ -33,6 +33,7 @@ SRCS+=		interception/interception_type_test.cc
 SRCS+=		sanitizer_common/sancov_flags.cc
 SRCS+=		sanitizer_common/sanitizer_allocator.cc
 SRCS+=		sanitizer_common/sanitizer_allocator_checks.cc
+SRCS+=		sanitizer_common/sanitizer_allocator_report.cc
 SRCS+=		sanitizer_common/sanitizer_common.cc
 SRCS+=		sanitizer_common/sanitizer_common_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cc
@@ -63,6 +64,7 @@ SRCS+=		sanitizer_common/sanitizer_symbolizer.cc
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cc
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_report.cc
 SRCS+=		sanitizer_common/sanitizer_termination.cc
 SRCS+=		sanitizer_common/sanitizer_thread_registry.cc
 SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cc
@@ -71,6 +73,7 @@ SRCS+=		ubsan/ubsan_diag.cc
 SRCS+=		ubsan/ubsan_flags.cc
 SRCS+=		ubsan/ubsan_handlers.cc
 SRCS+=		ubsan/ubsan_init.cc
+SRCS+=		ubsan/ubsan_monitor.cc
 SRCS+=		ubsan/ubsan_value.cc
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/asan_dynamic/Makefile b/lib/libclang_rt/asan_dynamic/Makefile
index 7f27e01621475..d4fcbee346db0 100644
--- a/lib/libclang_rt/asan_dynamic/Makefile
+++ b/lib/libclang_rt/asan_dynamic/Makefile
@@ -36,6 +36,7 @@ SRCS+=		interception/interception_type_test.cc
 SRCS+=		sanitizer_common/sancov_flags.cc
 SRCS+=		sanitizer_common/sanitizer_allocator.cc
 SRCS+=		sanitizer_common/sanitizer_allocator_checks.cc
+SRCS+=		sanitizer_common/sanitizer_allocator_report.cc
 SRCS+=		sanitizer_common/sanitizer_common.cc
 SRCS+=		sanitizer_common/sanitizer_common_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cc
@@ -66,6 +67,7 @@ SRCS+=		sanitizer_common/sanitizer_symbolizer.cc
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cc
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_report.cc
 SRCS+=		sanitizer_common/sanitizer_termination.cc
 SRCS+=		sanitizer_common/sanitizer_thread_registry.cc
 SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cc
@@ -75,6 +77,7 @@ SRCS+=		ubsan/ubsan_flags.cc
 SRCS+=		ubsan/ubsan_handlers.cc
 SRCS+=		ubsan/ubsan_handlers_cxx.cc
 SRCS+=		ubsan/ubsan_init.cc
+SRCS+=		ubsan/ubsan_monitor.cc
 SRCS+=		ubsan/ubsan_type_hash.cc
 SRCS+=		ubsan/ubsan_type_hash_itanium.cc
 SRCS+=		ubsan/ubsan_value.cc
@@ -90,4 +93,3 @@ CC=		${CXX}
 CXXFLAGS.ubsan_handlers_cxx.cc=		-frtti
 CXXFLAGS.ubsan_type_hash.cc=		-frtti
 CXXFLAGS.ubsan_type_hash_itanium.cc=	-frtti
-CXXFLAGS.ubsan_type_hash_win.cc=	-frtti
diff --git a/lib/libclang_rt/include/Makefile b/lib/libclang_rt/include/Makefile
index 3745e8d91984c..c9ebff4fd13b0 100644
--- a/lib/libclang_rt/include/Makefile
+++ b/lib/libclang_rt/include/Makefile
@@ -16,6 +16,7 @@ INCS+=		hwasan_interface.h
 INCS+=		linux_syscall_hooks.h
 INCS+=		lsan_interface.h
 INCS+=		msan_interface.h
+INCS+=		netbsd_syscall_hooks.h
 INCS+=		scudo_interface.h
 INCS+=		tsan_interface.h
 INCS+=		tsan_interface_atomic.h
diff --git a/lib/libclang_rt/msan/Makefile b/lib/libclang_rt/msan/Makefile
new file mode 100644
index 0000000000000..1ea0689c58f28
--- /dev/null
+++ b/lib/libclang_rt/msan/Makefile
@@ -0,0 +1,63 @@
+# $FreeBSD$
+
+.include <bsd.init.mk>
+
+LIB=		clang_rt.msan-${CRTARCH}
+
+SRCS+=		interception/interception_linux.cc
+SRCS+=		interception/interception_type_test.cc
+SRCS+=		msan/msan.cc
+SRCS+=		msan/msan_allocator.cc
+SRCS+=		msan/msan_chained_origin_depot.cc
+SRCS+=		msan/msan_interceptors.cc
+SRCS+=		msan/msan_linux.cc
+SRCS+=		msan/msan_poisoning.cc
+SRCS+=		msan/msan_report.cc
+SRCS+=		msan/msan_thread.cc
+SRCS+=		sanitizer_common/sancov_flags.cc
+SRCS+=		sanitizer_common/sanitizer_allocator.cc
+SRCS+=		sanitizer_common/sanitizer_allocator_checks.cc
+SRCS+=		sanitizer_common/sanitizer_allocator_report.cc
+SRCS+=		sanitizer_common/sanitizer_common.cc
+SRCS+=		sanitizer_common/sanitizer_common_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cc
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cc
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cc
+SRCS+=		sanitizer_common/sanitizer_errno.cc
+SRCS+=		sanitizer_common/sanitizer_file.cc
+SRCS+=		sanitizer_common/sanitizer_flag_parser.cc
+SRCS+=		sanitizer_common/sanitizer_flags.cc
+SRCS+=		sanitizer_common/sanitizer_libc.cc
+SRCS+=		sanitizer_common/sanitizer_libignore.cc
+SRCS+=		sanitizer_common/sanitizer_linux.cc
+SRCS+=		sanitizer_common/sanitizer_linux_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cc
+SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cc
+SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cc
+SRCS+=		sanitizer_common/sanitizer_posix.cc
+SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_printf.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_common.cc
+SRCS+=		sanitizer_common/sanitizer_stackdepot.cc
+SRCS+=		sanitizer_common/sanitizer_stacktrace.cc
+SRCS+=		sanitizer_common/sanitizer_stacktrace_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_stacktrace_printer.cc
+SRCS+=		sanitizer_common/sanitizer_suppressions.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_report.cc
+SRCS+=		sanitizer_common/sanitizer_termination.cc
+SRCS+=		sanitizer_common/sanitizer_thread_registry.cc
+SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cc
+SRCS+=		sanitizer_common/sanitizer_unwind_linux_libcdep.cc
+SRCS+=		ubsan/ubsan_diag.cc
+SRCS+=		ubsan/ubsan_flags.cc
+SRCS+=		ubsan/ubsan_handlers.cc
+SRCS+=		ubsan/ubsan_init.cc
+SRCS+=		ubsan/ubsan_monitor.cc
+SRCS+=		ubsan/ubsan_value.cc
+
+.include <bsd.lib.mk>
diff --git a/lib/libclang_rt/msan_cxx/Makefile b/lib/libclang_rt/msan_cxx/Makefile
new file mode 100644
index 0000000000000..44fb5df9b7278
--- /dev/null
+++ b/lib/libclang_rt/msan_cxx/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+.include <bsd.init.mk>
+
+LIB=		clang_rt.msan_cxx-${CRTARCH}
+
+SRCS+=		msan/msan_new_delete.cc
+SRCS+=		ubsan/ubsan_handlers_cxx.cc
+SRCS+=		ubsan/ubsan_type_hash.cc
+SRCS+=		ubsan/ubsan_type_hash_itanium.cc
+
+.include <bsd.lib.mk>
+
+CXXFLAGS.ubsan_handlers_cxx.cc=		-frtti
+CXXFLAGS.ubsan_type_hash.cc=		-frtti
+CXXFLAGS.ubsan_type_hash_itanium.cc=	-frtti
diff --git a/lib/libclang_rt/safestack/Makefile b/lib/libclang_rt/safestack/Makefile
index 4d387feb2614d..8f49840003423 100644
--- a/lib/libclang_rt/safestack/Makefile
+++ b/lib/libclang_rt/safestack/Makefile
@@ -30,8 +30,6 @@ SRCS+=		sanitizer_common/sanitizer_stackdepot.cc
 SRCS+=		sanitizer_common/sanitizer_stacktrace.cc
 SRCS+=		sanitizer_common/sanitizer_stacktrace_printer.cc
 SRCS+=		sanitizer_common/sanitizer_suppressions.cc
-SRCS+=		sanitizer_common/sanitizer_symbolizer.cc
-SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cc
 SRCS+=		sanitizer_common/sanitizer_termination.cc
 SRCS+=		sanitizer_common/sanitizer_thread_registry.cc
 SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cc
diff --git a/lib/libclang_rt/stats/Makefile b/lib/libclang_rt/stats/Makefile
index 14dca76b2378c..93b6c1f7c9875 100644
--- a/lib/libclang_rt/stats/Makefile
+++ b/lib/libclang_rt/stats/Makefile
@@ -4,12 +4,11 @@
 
 LIB=		clang_rt.stats-${CRTARCH}
 
-SRCS+=		sanitizer_common/sancov_flags.cc
 SRCS+=		sanitizer_common/sanitizer_allocator.cc
 SRCS+=		sanitizer_common/sanitizer_allocator_checks.cc
+SRCS+=		sanitizer_common/sanitizer_allocator_report.cc
 SRCS+=		sanitizer_common/sanitizer_common.cc
 SRCS+=		sanitizer_common/sanitizer_common_libcdep.cc
-SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cc
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cc
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cc
 SRCS+=		sanitizer_common/sanitizer_errno.cc
@@ -37,6 +36,7 @@ SRCS+=		sanitizer_common/sanitizer_symbolizer.cc
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cc
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_report.cc
 SRCS+=		sanitizer_common/sanitizer_termination.cc
 SRCS+=		sanitizer_common/sanitizer_thread_registry.cc
 SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cc
diff --git a/lib/libclang_rt/tsan/Makefile b/lib/libclang_rt/tsan/Makefile
index c310c1bf47c6a..3f73c2c7946e9 100644
--- a/lib/libclang_rt/tsan/Makefile
+++ b/lib/libclang_rt/tsan/Makefile
@@ -9,6 +9,7 @@ SRCS+=		interception/interception_type_test.cc
 SRCS+=		sanitizer_common/sancov_flags.cc
 SRCS+=		sanitizer_common/sanitizer_allocator.cc
 SRCS+=		sanitizer_common/sanitizer_allocator_checks.cc
+SRCS+=		sanitizer_common/sanitizer_allocator_report.cc
 SRCS+=		sanitizer_common/sanitizer_common.cc
 SRCS+=		sanitizer_common/sanitizer_common_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cc
@@ -39,6 +40,7 @@ SRCS+=		sanitizer_common/sanitizer_symbolizer.cc
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cc
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_report.cc
 SRCS+=		sanitizer_common/sanitizer_termination.cc
 SRCS+=		sanitizer_common/sanitizer_thread_registry.cc
 SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cc
@@ -77,6 +79,7 @@ SRCS+=		ubsan/ubsan_diag.cc
 SRCS+=		ubsan/ubsan_flags.cc
 SRCS+=		ubsan/ubsan_handlers.cc
 SRCS+=		ubsan/ubsan_init.cc
+SRCS+=		ubsan/ubsan_monitor.cc
 SRCS+=		ubsan/ubsan_value.cc
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/tsan_cxx/Makefile b/lib/libclang_rt/tsan_cxx/Makefile
index 3581ff34fe9d8..c5917b04da590 100644
--- a/lib/libclang_rt/tsan_cxx/Makefile
+++ b/lib/libclang_rt/tsan_cxx/Makefile
@@ -14,4 +14,3 @@ SRCS+=		ubsan/ubsan_type_hash_itanium.cc
 CXXFLAGS.ubsan_handlers_cxx.cc=		-frtti
 CXXFLAGS.ubsan_type_hash.cc=		-frtti
 CXXFLAGS.ubsan_type_hash_itanium.cc=	-frtti
-CXXFLAGS.ubsan_type_hash_win.cc=	-frtti
diff --git a/lib/libclang_rt/ubsan_standalone/Makefile b/lib/libclang_rt/ubsan_standalone/Makefile
index 6b9a49d32bd8b..c343066934658 100644
--- a/lib/libclang_rt/ubsan_standalone/Makefile
+++ b/lib/libclang_rt/ubsan_standalone/Makefile
@@ -9,6 +9,7 @@ SRCS+=		interception/interception_type_test.cc
 SRCS+=		sanitizer_common/sancov_flags.cc
 SRCS+=		sanitizer_common/sanitizer_allocator.cc
 SRCS+=		sanitizer_common/sanitizer_allocator_checks.cc
+SRCS+=		sanitizer_common/sanitizer_allocator_report.cc
 SRCS+=		sanitizer_common/sanitizer_common.cc
 SRCS+=		sanitizer_common/sanitizer_common_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cc
@@ -39,6 +40,7 @@ SRCS+=		sanitizer_common/sanitizer_symbolizer.cc
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cc
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_report.cc
 SRCS+=		sanitizer_common/sanitizer_termination.cc
 SRCS+=		sanitizer_common/sanitizer_thread_registry.cc
 SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cc
@@ -49,6 +51,8 @@ SRCS+=		ubsan/ubsan_flags.cc
 SRCS+=		ubsan/ubsan_handlers.cc
 SRCS+=		ubsan/ubsan_init.cc
 SRCS+=		ubsan/ubsan_init_standalone.cc
+SRCS+=		ubsan/ubsan_init_standalone_preinit.cc
+SRCS+=		ubsan/ubsan_monitor.cc
 SRCS+=		ubsan/ubsan_signals_standalone.cc
 SRCS+=		ubsan/ubsan_value.cc