Update build glue for libclang_rt.

26 files changed, 563 insertions, 565 deletions

diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc
index 413638c80eff..808204693014 100644
--- a/lib/libclang_rt/Makefile.inc
+++ b/lib/libclang_rt/Makefile.inc
@@ -26,7 +26,6 @@ WARNS?=		0
 SSP_CFLAGS=
 CFLAGS+=	-DNDEBUG
 CFLAGS+=	-DHAVE_RPC_XDR_H=0
-CFLAGS+=	-DHAVE_TIRPC_RPC_XDR_H=0
 CFLAGS+=	-DSANITIZER_SUPPORTS_WEAK_HOOKS=0
 CFLAGS+=	-DUBSAN_CAN_USE_CXXABI
 CFLAGS+=	${PICFLAG}
@@ -42,4 +41,4 @@ CXXFLAGS+=	-fvisibility-inlines-hidden
 CXXFLAGS+=	-fvisibility=hidden
 CFLAGS+=	-I${CRTSRC}/include
 CFLAGS+=	-I${CRTSRC}/lib
-CXXSTD=		c++11
+CXXSTD=		c++14
diff --git a/lib/libclang_rt/asan-preinit/Makefile b/lib/libclang_rt/asan-preinit/Makefile
index 7b9baeb05a0f..e6b6caff63d3 100644
--- a/lib/libclang_rt/asan-preinit/Makefile
+++ b/lib/libclang_rt/asan-preinit/Makefile
@@ -4,6 +4,6 @@
 
 LIB=		clang_rt.asan-preinit-${CRTARCH}
 
-SRCS+=		asan/asan_preinit.cc
+SRCS+=		asan/asan_preinit.cpp
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/asan/Makefile b/lib/libclang_rt/asan/Makefile
index 3984cfd6f19a..647012e8649f 100644
--- a/lib/libclang_rt/asan/Makefile
+++ b/lib/libclang_rt/asan/Makefile
@@ -4,78 +4,78 @@
 
 LIB=		clang_rt.asan-${CRTARCH}
 
-SRCS+=		asan/asan_activation.cc
-SRCS+=		asan/asan_allocator.cc
-SRCS+=		asan/asan_debugging.cc
-SRCS+=		asan/asan_descriptions.cc
-SRCS+=		asan/asan_errors.cc
-SRCS+=		asan/asan_fake_stack.cc
-SRCS+=		asan/asan_flags.cc
-SRCS+=		asan/asan_globals.cc
-SRCS+=		asan/asan_interceptors.cc
-SRCS+=		asan/asan_interceptors_memintrinsics.cc
-SRCS+=		asan/asan_linux.cc
-SRCS+=		asan/asan_malloc_linux.cc
-SRCS+=		asan/asan_memory_profile.cc
-SRCS+=		asan/asan_poisoning.cc
-SRCS+=		asan/asan_posix.cc
-SRCS+=		asan/asan_preinit.cc
-SRCS+=		asan/asan_premap_shadow.cc
-SRCS+=		asan/asan_report.cc
-SRCS+=		asan/asan_rtl.cc
-SRCS+=		asan/asan_shadow_setup.cc
-SRCS+=		asan/asan_stack.cc
-SRCS+=		asan/asan_stats.cc
-SRCS+=		asan/asan_suppressions.cc
-SRCS+=		asan/asan_thread.cc
-SRCS+=		interception/interception_linux.cc
-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
-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_freebsd.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_type_traits.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
+SRCS+=		asan/asan_activation.cpp
+SRCS+=		asan/asan_allocator.cpp
+SRCS+=		asan/asan_debugging.cpp
+SRCS+=		asan/asan_descriptions.cpp
+SRCS+=		asan/asan_errors.cpp
+SRCS+=		asan/asan_fake_stack.cpp
+SRCS+=		asan/asan_flags.cpp
+SRCS+=		asan/asan_globals.cpp
+SRCS+=		asan/asan_interceptors.cpp
+SRCS+=		asan/asan_interceptors_memintrinsics.cpp
+SRCS+=		asan/asan_linux.cpp
+SRCS+=		asan/asan_malloc_linux.cpp
+SRCS+=		asan/asan_memory_profile.cpp
+SRCS+=		asan/asan_poisoning.cpp
+SRCS+=		asan/asan_posix.cpp
+SRCS+=		asan/asan_preinit.cpp
+SRCS+=		asan/asan_premap_shadow.cpp
+SRCS+=		asan/asan_report.cpp
+SRCS+=		asan/asan_rtl.cpp
+SRCS+=		asan/asan_shadow_setup.cpp
+SRCS+=		asan/asan_stack.cpp
+SRCS+=		asan/asan_stats.cpp
+SRCS+=		asan/asan_suppressions.cpp
+SRCS+=		asan/asan_thread.cpp
+SRCS+=		interception/interception_linux.cpp
+SRCS+=		interception/interception_type_test.cpp
+SRCS+=		sanitizer_common/sancov_flags.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator_checks.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator_report.cpp
+SRCS+=		sanitizer_common/sanitizer_common.cpp
+SRCS+=		sanitizer_common/sanitizer_common_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cpp
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cpp
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cpp
+SRCS+=		sanitizer_common/sanitizer_errno.cpp
+SRCS+=		sanitizer_common/sanitizer_file.cpp
+SRCS+=		sanitizer_common/sanitizer_flag_parser.cpp
+SRCS+=		sanitizer_common/sanitizer_flags.cpp
+SRCS+=		sanitizer_common/sanitizer_libc.cpp
+SRCS+=		sanitizer_common/sanitizer_libignore.cpp
+SRCS+=		sanitizer_common/sanitizer_linux.cpp
+SRCS+=		sanitizer_common/sanitizer_linux_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_freebsd.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cpp
+SRCS+=		sanitizer_common/sanitizer_posix.cpp
+SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_printf.cpp
+SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cpp
+SRCS+=		sanitizer_common/sanitizer_procmaps_common.cpp
+SRCS+=		sanitizer_common/sanitizer_stackdepot.cpp
+SRCS+=		sanitizer_common/sanitizer_stacktrace.cpp
+SRCS+=		sanitizer_common/sanitizer_stacktrace_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_stacktrace_printer.cpp
+SRCS+=		sanitizer_common/sanitizer_suppressions.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_report.cpp
+SRCS+=		sanitizer_common/sanitizer_termination.cpp
+SRCS+=		sanitizer_common/sanitizer_thread_registry.cpp
+SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cpp
+SRCS+=		sanitizer_common/sanitizer_type_traits.cpp
+SRCS+=		sanitizer_common/sanitizer_unwind_linux_libcdep.cpp
+SRCS+=		ubsan/ubsan_diag.cpp
+SRCS+=		ubsan/ubsan_flags.cpp
+SRCS+=		ubsan/ubsan_handlers.cpp
+SRCS+=		ubsan/ubsan_init.cpp
+SRCS+=		ubsan/ubsan_monitor.cpp
+SRCS+=		ubsan/ubsan_value.cpp
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/asan_cxx/Makefile b/lib/libclang_rt/asan_cxx/Makefile
index b56673adde1f..fd2010f7d3b2 100644
--- a/lib/libclang_rt/asan_cxx/Makefile
+++ b/lib/libclang_rt/asan_cxx/Makefile
@@ -6,9 +6,9 @@ LIB=		clang_rt.asan_cxx-${CRTARCH}
 
 CXXFLAGS+=	-frtti
 
-SRCS+=		asan/asan_new_delete.cc
-SRCS+=		ubsan/ubsan_handlers_cxx.cc
-SRCS+=		ubsan/ubsan_type_hash.cc
-SRCS+=		ubsan/ubsan_type_hash_itanium.cc
+SRCS+=		asan/asan_new_delete.cpp
+SRCS+=		ubsan/ubsan_handlers_cxx.cpp
+SRCS+=		ubsan/ubsan_type_hash.cpp
+SRCS+=		ubsan/ubsan_type_hash_itanium.cpp
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/asan_dynamic/Makefile b/lib/libclang_rt/asan_dynamic/Makefile
index d1579d7417ad..434b1c3c3ed6 100644
--- a/lib/libclang_rt/asan_dynamic/Makefile
+++ b/lib/libclang_rt/asan_dynamic/Makefile
@@ -7,82 +7,82 @@ SHLIB_NAME=	libclang_rt.asan-${CRTARCH}.so
 
 CFLAGS+=	-DASAN_DYNAMIC=1
 
-SRCS+=		asan/asan_activation.cc
-SRCS+=		asan/asan_allocator.cc
-SRCS+=		asan/asan_debugging.cc
-SRCS+=		asan/asan_descriptions.cc
-SRCS+=		asan/asan_errors.cc
-SRCS+=		asan/asan_fake_stack.cc
-SRCS+=		asan/asan_flags.cc
-SRCS+=		asan/asan_globals.cc
-SRCS+=		asan/asan_interceptors.cc
-SRCS+=		asan/asan_interceptors_memintrinsics.cc
-SRCS+=		asan/asan_linux.cc
-SRCS+=		asan/asan_malloc_linux.cc
-SRCS+=		asan/asan_memory_profile.cc
-SRCS+=		asan/asan_new_delete.cc
-SRCS+=		asan/asan_poisoning.cc
-SRCS+=		asan/asan_posix.cc
-SRCS+=		asan/asan_premap_shadow.cc
-SRCS+=		asan/asan_report.cc
-SRCS+=		asan/asan_rtl.cc
-SRCS+=		asan/asan_shadow_setup.cc
-SRCS+=		asan/asan_stack.cc
-SRCS+=		asan/asan_stats.cc
-SRCS+=		asan/asan_suppressions.cc
-SRCS+=		asan/asan_thread.cc
-SRCS+=		interception/interception_linux.cc
-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
-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_freebsd.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_type_traits.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_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
+SRCS+=		asan/asan_activation.cpp
+SRCS+=		asan/asan_allocator.cpp
+SRCS+=		asan/asan_debugging.cpp
+SRCS+=		asan/asan_descriptions.cpp
+SRCS+=		asan/asan_errors.cpp
+SRCS+=		asan/asan_fake_stack.cpp
+SRCS+=		asan/asan_flags.cpp
+SRCS+=		asan/asan_globals.cpp
+SRCS+=		asan/asan_interceptors.cpp
+SRCS+=		asan/asan_interceptors_memintrinsics.cpp
+SRCS+=		asan/asan_linux.cpp
+SRCS+=		asan/asan_malloc_linux.cpp
+SRCS+=		asan/asan_memory_profile.cpp
+SRCS+=		asan/asan_new_delete.cpp
+SRCS+=		asan/asan_poisoning.cpp
+SRCS+=		asan/asan_posix.cpp
+SRCS+=		asan/asan_premap_shadow.cpp
+SRCS+=		asan/asan_report.cpp
+SRCS+=		asan/asan_rtl.cpp
+SRCS+=		asan/asan_shadow_setup.cpp
+SRCS+=		asan/asan_stack.cpp
+SRCS+=		asan/asan_stats.cpp
+SRCS+=		asan/asan_suppressions.cpp
+SRCS+=		asan/asan_thread.cpp
+SRCS+=		interception/interception_linux.cpp
+SRCS+=		interception/interception_type_test.cpp
+SRCS+=		sanitizer_common/sancov_flags.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator_checks.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator_report.cpp
+SRCS+=		sanitizer_common/sanitizer_common.cpp
+SRCS+=		sanitizer_common/sanitizer_common_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cpp
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cpp
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cpp
+SRCS+=		sanitizer_common/sanitizer_errno.cpp
+SRCS+=		sanitizer_common/sanitizer_file.cpp
+SRCS+=		sanitizer_common/sanitizer_flag_parser.cpp
+SRCS+=		sanitizer_common/sanitizer_flags.cpp
+SRCS+=		sanitizer_common/sanitizer_libc.cpp
+SRCS+=		sanitizer_common/sanitizer_libignore.cpp
+SRCS+=		sanitizer_common/sanitizer_linux.cpp
+SRCS+=		sanitizer_common/sanitizer_linux_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_freebsd.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cpp
+SRCS+=		sanitizer_common/sanitizer_posix.cpp
+SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_printf.cpp
+SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cpp
+SRCS+=		sanitizer_common/sanitizer_procmaps_common.cpp
+SRCS+=		sanitizer_common/sanitizer_stackdepot.cpp
+SRCS+=		sanitizer_common/sanitizer_stacktrace.cpp
+SRCS+=		sanitizer_common/sanitizer_stacktrace_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_stacktrace_printer.cpp
+SRCS+=		sanitizer_common/sanitizer_suppressions.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_report.cpp
+SRCS+=		sanitizer_common/sanitizer_termination.cpp
+SRCS+=		sanitizer_common/sanitizer_thread_registry.cpp
+SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cpp
+SRCS+=		sanitizer_common/sanitizer_type_traits.cpp
+SRCS+=		sanitizer_common/sanitizer_unwind_linux_libcdep.cpp
+SRCS+=		ubsan/ubsan_diag.cpp
+SRCS+=		ubsan/ubsan_flags.cpp
+SRCS+=		ubsan/ubsan_handlers.cpp
+SRCS+=		ubsan/ubsan_handlers_cxx.cpp
+SRCS+=		ubsan/ubsan_init.cpp
+SRCS+=		ubsan/ubsan_monitor.cpp
+SRCS+=		ubsan/ubsan_type_hash.cpp
+SRCS+=		ubsan/ubsan_type_hash_itanium.cpp
+SRCS+=		ubsan/ubsan_value.cpp
 
 # Kludge around a bsd.lib.mk shortcoming: when SHLIB_NAME is defined, but LIB
 # and LIB_CXX are undefined (which forces building only a shared library),
@@ -92,6 +92,6 @@ CC=		${CXX}
 
 .include <bsd.lib.mk>
 
-CXXFLAGS.ubsan_handlers_cxx.cc=		-frtti
-CXXFLAGS.ubsan_type_hash.cc=		-frtti
-CXXFLAGS.ubsan_type_hash_itanium.cc=	-frtti
+CXXFLAGS.ubsan_handlers_cxx.cpp=		-frtti
+CXXFLAGS.ubsan_type_hash.cpp=		-frtti
+CXXFLAGS.ubsan_type_hash_itanium.cpp=	-frtti
diff --git a/lib/libclang_rt/cfi/Makefile b/lib/libclang_rt/cfi/Makefile
index dcc89c3b4da5..b6febc861e89 100644
--- a/lib/libclang_rt/cfi/Makefile
+++ b/lib/libclang_rt/cfi/Makefile
@@ -5,35 +5,35 @@
 LIB=		clang_rt.cfi-${CRTARCH}
 
 SRCS+=		cfi/cfi.cpp
-SRCS+=		interception/interception_linux.cc
-SRCS+=		interception/interception_type_test.cc
-SRCS+=		sanitizer_common/sanitizer_allocator.cc
-SRCS+=		sanitizer_common/sanitizer_allocator_checks.cc
-SRCS+=		sanitizer_common/sanitizer_common.cc
-SRCS+=		sanitizer_common/sanitizer_common_libcdep.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_freebsd.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_suppressions.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_type_traits.cc
+SRCS+=		interception/interception_linux.cpp
+SRCS+=		interception/interception_type_test.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator_checks.cpp
+SRCS+=		sanitizer_common/sanitizer_common.cpp
+SRCS+=		sanitizer_common/sanitizer_common_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cpp
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cpp
+SRCS+=		sanitizer_common/sanitizer_errno.cpp
+SRCS+=		sanitizer_common/sanitizer_file.cpp
+SRCS+=		sanitizer_common/sanitizer_flag_parser.cpp
+SRCS+=		sanitizer_common/sanitizer_flags.cpp
+SRCS+=		sanitizer_common/sanitizer_libc.cpp
+SRCS+=		sanitizer_common/sanitizer_libignore.cpp
+SRCS+=		sanitizer_common/sanitizer_linux.cpp
+SRCS+=		sanitizer_common/sanitizer_linux_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_freebsd.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cpp
+SRCS+=		sanitizer_common/sanitizer_posix.cpp
+SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_printf.cpp
+SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cpp
+SRCS+=		sanitizer_common/sanitizer_procmaps_common.cpp
+SRCS+=		sanitizer_common/sanitizer_suppressions.cpp
+SRCS+=		sanitizer_common/sanitizer_termination.cpp
+SRCS+=		sanitizer_common/sanitizer_thread_registry.cpp
+SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cpp
+SRCS+=		sanitizer_common/sanitizer_type_traits.cpp
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/cfi_diag/Makefile b/lib/libclang_rt/cfi_diag/Makefile
index 5bd4949fdbe2..b60e7031814a 100644
--- a/lib/libclang_rt/cfi_diag/Makefile
+++ b/lib/libclang_rt/cfi_diag/Makefile
@@ -5,54 +5,54 @@
 LIB=		clang_rt.cfi_diag-${CRTARCH}
 
 SRCS+=		cfi/cfi.cpp
-SRCS+=		interception/interception_linux.cc
-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
-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_freebsd.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_type_traits.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
+SRCS+=		interception/interception_linux.cpp
+SRCS+=		interception/interception_type_test.cpp
+SRCS+=		sanitizer_common/sancov_flags.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator_checks.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator_report.cpp
+SRCS+=		sanitizer_common/sanitizer_common.cpp
+SRCS+=		sanitizer_common/sanitizer_common_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cpp
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cpp
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cpp
+SRCS+=		sanitizer_common/sanitizer_errno.cpp
+SRCS+=		sanitizer_common/sanitizer_file.cpp
+SRCS+=		sanitizer_common/sanitizer_flag_parser.cpp
+SRCS+=		sanitizer_common/sanitizer_flags.cpp
+SRCS+=		sanitizer_common/sanitizer_libc.cpp
+SRCS+=		sanitizer_common/sanitizer_libignore.cpp
+SRCS+=		sanitizer_common/sanitizer_linux.cpp
+SRCS+=		sanitizer_common/sanitizer_linux_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_freebsd.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cpp
+SRCS+=		sanitizer_common/sanitizer_posix.cpp
+SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_printf.cpp
+SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cpp
+SRCS+=		sanitizer_common/sanitizer_procmaps_common.cpp
+SRCS+=		sanitizer_common/sanitizer_stackdepot.cpp
+SRCS+=		sanitizer_common/sanitizer_stacktrace.cpp
+SRCS+=		sanitizer_common/sanitizer_stacktrace_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_stacktrace_printer.cpp
+SRCS+=		sanitizer_common/sanitizer_suppressions.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_report.cpp
+SRCS+=		sanitizer_common/sanitizer_termination.cpp
+SRCS+=		sanitizer_common/sanitizer_thread_registry.cpp
+SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cpp
+SRCS+=		sanitizer_common/sanitizer_type_traits.cpp
+SRCS+=		sanitizer_common/sanitizer_unwind_linux_libcdep.cpp
+SRCS+=		ubsan/ubsan_diag.cpp
+SRCS+=		ubsan/ubsan_flags.cpp
+SRCS+=		ubsan/ubsan_handlers.cpp
+SRCS+=		ubsan/ubsan_init.cpp
+SRCS+=		ubsan/ubsan_monitor.cpp
+SRCS+=		ubsan/ubsan_value.cpp
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/dd/Makefile b/lib/libclang_rt/dd/Makefile
index c3bfbf8518ea..432f6d95b289 100644
--- a/lib/libclang_rt/dd/Makefile
+++ b/lib/libclang_rt/dd/Makefile
@@ -4,37 +4,37 @@
 
 LIB=		clang_rt.dd-${CRTARCH}
 
-SRCS+=		interception/interception_linux.cc
-SRCS+=		interception/interception_type_test.cc
-SRCS+=		sanitizer_common/sanitizer_allocator.cc
-SRCS+=		sanitizer_common/sanitizer_allocator_checks.cc
-SRCS+=		sanitizer_common/sanitizer_common.cc
-SRCS+=		sanitizer_common/sanitizer_common_libcdep.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_freebsd.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_suppressions.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_type_traits.cc
-SRCS+=		tsan/dd/dd_interceptors.cc
-SRCS+=		tsan/dd/dd_rtl.cc
+SRCS+=		interception/interception_linux.cpp
+SRCS+=		interception/interception_type_test.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator_checks.cpp
+SRCS+=		sanitizer_common/sanitizer_common.cpp
+SRCS+=		sanitizer_common/sanitizer_common_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cpp
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cpp
+SRCS+=		sanitizer_common/sanitizer_errno.cpp
+SRCS+=		sanitizer_common/sanitizer_file.cpp
+SRCS+=		sanitizer_common/sanitizer_flag_parser.cpp
+SRCS+=		sanitizer_common/sanitizer_flags.cpp
+SRCS+=		sanitizer_common/sanitizer_libc.cpp
+SRCS+=		sanitizer_common/sanitizer_libignore.cpp
+SRCS+=		sanitizer_common/sanitizer_linux.cpp
+SRCS+=		sanitizer_common/sanitizer_linux_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_freebsd.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cpp
+SRCS+=		sanitizer_common/sanitizer_posix.cpp
+SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_printf.cpp
+SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cpp
+SRCS+=		sanitizer_common/sanitizer_procmaps_common.cpp
+SRCS+=		sanitizer_common/sanitizer_suppressions.cpp
+SRCS+=		sanitizer_common/sanitizer_termination.cpp
+SRCS+=		sanitizer_common/sanitizer_thread_registry.cpp
+SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cpp
+SRCS+=		sanitizer_common/sanitizer_type_traits.cpp
+SRCS+=		tsan/dd/dd_interceptors.cpp
+SRCS+=		tsan/dd/dd_rtl.cpp
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/fuzzer/Makefile b/lib/libclang_rt/fuzzer/Makefile
index eb8be3665cf0..eb675063ddfc 100644
--- a/lib/libclang_rt/fuzzer/Makefile
+++ b/lib/libclang_rt/fuzzer/Makefile
@@ -13,7 +13,6 @@ SRCS+=		fuzzer/FuzzerExtraCounters.cpp
 SRCS+=		fuzzer/FuzzerFork.cpp
 SRCS+=		fuzzer/FuzzerIO.cpp
 SRCS+=		fuzzer/FuzzerIOPosix.cpp
-SRCS+=		fuzzer/FuzzerIOWindows.cpp
 SRCS+=		fuzzer/FuzzerLoop.cpp
 SRCS+=		fuzzer/FuzzerMain.cpp
 SRCS+=		fuzzer/FuzzerMerge.cpp
diff --git a/lib/libclang_rt/fuzzer_no_main/Makefile b/lib/libclang_rt/fuzzer_no_main/Makefile
index 662bc6d7ba42..255275b1e7a3 100644
--- a/lib/libclang_rt/fuzzer_no_main/Makefile
+++ b/lib/libclang_rt/fuzzer_no_main/Makefile
@@ -13,7 +13,6 @@ SRCS+=		fuzzer/FuzzerExtraCounters.cpp
 SRCS+=		fuzzer/FuzzerFork.cpp
 SRCS+=		fuzzer/FuzzerIO.cpp
 SRCS+=		fuzzer/FuzzerIOPosix.cpp
-SRCS+=		fuzzer/FuzzerIOWindows.cpp
 SRCS+=		fuzzer/FuzzerLoop.cpp
 SRCS+=		fuzzer/FuzzerMerge.cpp
 SRCS+=		fuzzer/FuzzerMutate.cpp
diff --git a/lib/libclang_rt/include/Makefile b/lib/libclang_rt/include/Makefile
index 41af2e841f38..cdd10435fe75 100644
--- a/lib/libclang_rt/include/Makefile
+++ b/lib/libclang_rt/include/Makefile
@@ -19,5 +19,6 @@ INCS+=		netbsd_syscall_hooks.h
 INCS+=		scudo_interface.h
 INCS+=		tsan_interface.h
 INCS+=		tsan_interface_atomic.h
+INCS+=		ubsan_interface.h
 
 .include <bsd.prog.mk>
diff --git a/lib/libclang_rt/msan/Makefile b/lib/libclang_rt/msan/Makefile
index 1130684149fe..2956745b4b12 100644
--- a/lib/libclang_rt/msan/Makefile
+++ b/lib/libclang_rt/msan/Makefile
@@ -4,62 +4,62 @@
 
 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_freebsd.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_type_traits.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
+SRCS+=		interception/interception_linux.cpp
+SRCS+=		interception/interception_type_test.cpp
+SRCS+=		msan/msan.cpp
+SRCS+=		msan/msan_allocator.cpp
+SRCS+=		msan/msan_chained_origin_depot.cpp
+SRCS+=		msan/msan_interceptors.cpp
+SRCS+=		msan/msan_linux.cpp
+SRCS+=		msan/msan_poisoning.cpp
+SRCS+=		msan/msan_report.cpp
+SRCS+=		msan/msan_thread.cpp
+SRCS+=		sanitizer_common/sancov_flags.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator_checks.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator_report.cpp
+SRCS+=		sanitizer_common/sanitizer_common.cpp
+SRCS+=		sanitizer_common/sanitizer_common_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cpp
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cpp
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cpp
+SRCS+=		sanitizer_common/sanitizer_errno.cpp
+SRCS+=		sanitizer_common/sanitizer_file.cpp
+SRCS+=		sanitizer_common/sanitizer_flag_parser.cpp
+SRCS+=		sanitizer_common/sanitizer_flags.cpp
+SRCS+=		sanitizer_common/sanitizer_libc.cpp
+SRCS+=		sanitizer_common/sanitizer_libignore.cpp
+SRCS+=		sanitizer_common/sanitizer_linux.cpp
+SRCS+=		sanitizer_common/sanitizer_linux_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_freebsd.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cpp
+SRCS+=		sanitizer_common/sanitizer_posix.cpp
+SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_printf.cpp
+SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cpp
+SRCS+=		sanitizer_common/sanitizer_procmaps_common.cpp
+SRCS+=		sanitizer_common/sanitizer_stackdepot.cpp
+SRCS+=		sanitizer_common/sanitizer_stacktrace.cpp
+SRCS+=		sanitizer_common/sanitizer_stacktrace_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_stacktrace_printer.cpp
+SRCS+=		sanitizer_common/sanitizer_suppressions.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_report.cpp
+SRCS+=		sanitizer_common/sanitizer_termination.cpp
+SRCS+=		sanitizer_common/sanitizer_thread_registry.cpp
+SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cpp
+SRCS+=		sanitizer_common/sanitizer_type_traits.cpp
+SRCS+=		sanitizer_common/sanitizer_unwind_linux_libcdep.cpp
+SRCS+=		ubsan/ubsan_diag.cpp
+SRCS+=		ubsan/ubsan_flags.cpp
+SRCS+=		ubsan/ubsan_handlers.cpp
+SRCS+=		ubsan/ubsan_init.cpp
+SRCS+=		ubsan/ubsan_monitor.cpp
+SRCS+=		ubsan/ubsan_value.cpp
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/msan_cxx/Makefile b/lib/libclang_rt/msan_cxx/Makefile
index b60be079b6e2..29ba33393ca7 100644
--- a/lib/libclang_rt/msan_cxx/Makefile
+++ b/lib/libclang_rt/msan_cxx/Makefile
@@ -5,13 +5,13 @@
 
 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
+SRCS+=		msan/msan_new_delete.cpp
+SRCS+=		ubsan/ubsan_handlers_cxx.cpp
+SRCS+=		ubsan/ubsan_type_hash.cpp
+SRCS+=		ubsan/ubsan_type_hash_itanium.cpp
 
 .include <bsd.lib.mk>
 
-CXXFLAGS.ubsan_handlers_cxx.cc=		-frtti
-CXXFLAGS.ubsan_type_hash.cc=		-frtti
-CXXFLAGS.ubsan_type_hash_itanium.cc=	-frtti
+CXXFLAGS.ubsan_handlers_cxx.cpp=		-frtti
+CXXFLAGS.ubsan_type_hash.cpp=		-frtti
+CXXFLAGS.ubsan_type_hash_itanium.cpp=	-frtti
diff --git a/lib/libclang_rt/profile/Makefile b/lib/libclang_rt/profile/Makefile
index 62c6e6b14a49..7c2fe3c9c133 100644
--- a/lib/libclang_rt/profile/Makefile
+++ b/lib/libclang_rt/profile/Makefile
@@ -20,7 +20,7 @@ SRCS+=		profile/InstrProfilingMergeFile.c
 SRCS+=		profile/InstrProfilingNameVar.c
 SRCS+=		profile/InstrProfilingPlatformLinux.c
 SRCS+=		profile/InstrProfilingPlatformOther.c
-SRCS+=		profile/InstrProfilingRuntime.cc
+SRCS+=		profile/InstrProfilingRuntime.cpp
 SRCS+=		profile/InstrProfilingUtil.c
 SRCS+=		profile/InstrProfilingValue.c
 SRCS+=		profile/InstrProfilingWriter.c
diff --git a/lib/libclang_rt/safestack/Makefile b/lib/libclang_rt/safestack/Makefile
index 2696a7be17e3..4f3d2fa2aa68 100644
--- a/lib/libclang_rt/safestack/Makefile
+++ b/lib/libclang_rt/safestack/Makefile
@@ -4,8 +4,8 @@
 
 LIB=		clang_rt.safestack-${CRTARCH}
 
-SRCS+=		interception/interception_linux.cc
-SRCS+=		interception/interception_type_test.cc
-SRCS+=		safestack/safestack.cc
+SRCS+=		interception/interception_linux.cpp
+SRCS+=		interception/interception_type_test.cpp
+SRCS+=		safestack/safestack.cpp
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/stats/Makefile b/lib/libclang_rt/stats/Makefile
index 1540df19c726..752443b5bbb7 100644
--- a/lib/libclang_rt/stats/Makefile
+++ b/lib/libclang_rt/stats/Makefile
@@ -4,45 +4,45 @@
 
 LIB=		clang_rt.stats-${CRTARCH}
 
-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_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_freebsd.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_type_traits.cc
-SRCS+=		sanitizer_common/sanitizer_unwind_linux_libcdep.cc
-SRCS+=		stats/stats.cc
+SRCS+=		sanitizer_common/sanitizer_allocator.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator_checks.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator_report.cpp
+SRCS+=		sanitizer_common/sanitizer_common.cpp
+SRCS+=		sanitizer_common/sanitizer_common_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cpp
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cpp
+SRCS+=		sanitizer_common/sanitizer_errno.cpp
+SRCS+=		sanitizer_common/sanitizer_file.cpp
+SRCS+=		sanitizer_common/sanitizer_flag_parser.cpp
+SRCS+=		sanitizer_common/sanitizer_flags.cpp
+SRCS+=		sanitizer_common/sanitizer_libc.cpp
+SRCS+=		sanitizer_common/sanitizer_libignore.cpp
+SRCS+=		sanitizer_common/sanitizer_linux.cpp
+SRCS+=		sanitizer_common/sanitizer_linux_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_freebsd.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cpp
+SRCS+=		sanitizer_common/sanitizer_posix.cpp
+SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_printf.cpp
+SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cpp
+SRCS+=		sanitizer_common/sanitizer_procmaps_common.cpp
+SRCS+=		sanitizer_common/sanitizer_stackdepot.cpp
+SRCS+=		sanitizer_common/sanitizer_stacktrace.cpp
+SRCS+=		sanitizer_common/sanitizer_stacktrace_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_stacktrace_printer.cpp
+SRCS+=		sanitizer_common/sanitizer_suppressions.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_report.cpp
+SRCS+=		sanitizer_common/sanitizer_termination.cpp
+SRCS+=		sanitizer_common/sanitizer_thread_registry.cpp
+SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cpp
+SRCS+=		sanitizer_common/sanitizer_type_traits.cpp
+SRCS+=		sanitizer_common/sanitizer_unwind_linux_libcdep.cpp
+SRCS+=		stats/stats.cpp
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/stats_client/Makefile b/lib/libclang_rt/stats_client/Makefile
index e15b5cda17ec..2e9c70a1169d 100644
--- a/lib/libclang_rt/stats_client/Makefile
+++ b/lib/libclang_rt/stats_client/Makefile
@@ -4,6 +4,6 @@
 
 LIB=		clang_rt.stats_client-${CRTARCH}
 
-SRCS+=		stats/stats_client.cc
+SRCS+=		stats/stats_client.cpp
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/tsan/Makefile b/lib/libclang_rt/tsan/Makefile
index 259be95d303d..db840cdfe47f 100644
--- a/lib/libclang_rt/tsan/Makefile
+++ b/lib/libclang_rt/tsan/Makefile
@@ -4,84 +4,84 @@
 
 LIB=		clang_rt.tsan-${CRTARCH}
 
-SRCS+=		interception/interception_linux.cc
-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
-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_freebsd.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_type_traits.cc
-SRCS+=		sanitizer_common/sanitizer_unwind_linux_libcdep.cc
-SRCS+=		tsan/rtl/tsan_clock.cc
-SRCS+=		tsan/rtl/tsan_debugging.cc
-SRCS+=		tsan/rtl/tsan_external.cc
-SRCS+=		tsan/rtl/tsan_fd.cc
-SRCS+=		tsan/rtl/tsan_flags.cc
-SRCS+=		tsan/rtl/tsan_ignoreset.cc
-SRCS+=		tsan/rtl/tsan_interceptors.cc
-SRCS+=		tsan/rtl/tsan_interface.cc
-SRCS+=		tsan/rtl/tsan_interface_ann.cc
-SRCS+=		tsan/rtl/tsan_interface_atomic.cc
-SRCS+=		tsan/rtl/tsan_interface_java.cc
-SRCS+=		tsan/rtl/tsan_md5.cc
-SRCS+=		tsan/rtl/tsan_mman.cc
-SRCS+=		tsan/rtl/tsan_mutex.cc
-SRCS+=		tsan/rtl/tsan_mutexset.cc
-SRCS+=		tsan/rtl/tsan_platform_linux.cc
-SRCS+=		tsan/rtl/tsan_platform_posix.cc
-SRCS+=		tsan/rtl/tsan_preinit.cc
-SRCS+=		tsan/rtl/tsan_report.cc
-SRCS+=		tsan/rtl/tsan_rtl.cc
+SRCS+=		interception/interception_linux.cpp
+SRCS+=		interception/interception_type_test.cpp
+SRCS+=		sanitizer_common/sancov_flags.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator_checks.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator_report.cpp
+SRCS+=		sanitizer_common/sanitizer_common.cpp
+SRCS+=		sanitizer_common/sanitizer_common_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cpp
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cpp
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cpp
+SRCS+=		sanitizer_common/sanitizer_errno.cpp
+SRCS+=		sanitizer_common/sanitizer_file.cpp
+SRCS+=		sanitizer_common/sanitizer_flag_parser.cpp
+SRCS+=		sanitizer_common/sanitizer_flags.cpp
+SRCS+=		sanitizer_common/sanitizer_libc.cpp
+SRCS+=		sanitizer_common/sanitizer_libignore.cpp
+SRCS+=		sanitizer_common/sanitizer_linux.cpp
+SRCS+=		sanitizer_common/sanitizer_linux_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_freebsd.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cpp
+SRCS+=		sanitizer_common/sanitizer_posix.cpp
+SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_printf.cpp
+SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cpp
+SRCS+=		sanitizer_common/sanitizer_procmaps_common.cpp
+SRCS+=		sanitizer_common/sanitizer_stackdepot.cpp
+SRCS+=		sanitizer_common/sanitizer_stacktrace.cpp
+SRCS+=		sanitizer_common/sanitizer_stacktrace_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_stacktrace_printer.cpp
+SRCS+=		sanitizer_common/sanitizer_suppressions.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_report.cpp
+SRCS+=		sanitizer_common/sanitizer_termination.cpp
+SRCS+=		sanitizer_common/sanitizer_thread_registry.cpp
+SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cpp
+SRCS+=		sanitizer_common/sanitizer_type_traits.cpp
+SRCS+=		sanitizer_common/sanitizer_unwind_linux_libcdep.cpp
+SRCS+=		tsan/rtl/tsan_clock.cpp
+SRCS+=		tsan/rtl/tsan_debugging.cpp
+SRCS+=		tsan/rtl/tsan_external.cpp
+SRCS+=		tsan/rtl/tsan_fd.cpp
+SRCS+=		tsan/rtl/tsan_flags.cpp
+SRCS+=		tsan/rtl/tsan_ignoreset.cpp
+SRCS+=		tsan/rtl/tsan_interceptors_posix.cpp
+SRCS+=		tsan/rtl/tsan_interface.cpp
+SRCS+=		tsan/rtl/tsan_interface_ann.cpp
+SRCS+=		tsan/rtl/tsan_interface_atomic.cpp
+SRCS+=		tsan/rtl/tsan_interface_java.cpp
+SRCS+=		tsan/rtl/tsan_md5.cpp
+SRCS+=		tsan/rtl/tsan_mman.cpp
+SRCS+=		tsan/rtl/tsan_mutex.cpp
+SRCS+=		tsan/rtl/tsan_mutexset.cpp
+SRCS+=		tsan/rtl/tsan_platform_linux.cpp
+SRCS+=		tsan/rtl/tsan_platform_posix.cpp
+SRCS+=		tsan/rtl/tsan_preinit.cpp
+SRCS+=		tsan/rtl/tsan_report.cpp
+SRCS+=		tsan/rtl/tsan_rtl.cpp
 SRCS+=		tsan/rtl/tsan_rtl_amd64.S
-SRCS+=		tsan/rtl/tsan_rtl_mutex.cc
-SRCS+=		tsan/rtl/tsan_rtl_proc.cc
-SRCS+=		tsan/rtl/tsan_rtl_report.cc
-SRCS+=		tsan/rtl/tsan_rtl_thread.cc
-SRCS+=		tsan/rtl/tsan_stack_trace.cc
-SRCS+=		tsan/rtl/tsan_stat.cc
-SRCS+=		tsan/rtl/tsan_suppressions.cc
-SRCS+=		tsan/rtl/tsan_symbolize.cc
-SRCS+=		tsan/rtl/tsan_sync.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
+SRCS+=		tsan/rtl/tsan_rtl_mutex.cpp
+SRCS+=		tsan/rtl/tsan_rtl_proc.cpp
+SRCS+=		tsan/rtl/tsan_rtl_report.cpp
+SRCS+=		tsan/rtl/tsan_rtl_thread.cpp
+SRCS+=		tsan/rtl/tsan_stack_trace.cpp
+SRCS+=		tsan/rtl/tsan_stat.cpp
+SRCS+=		tsan/rtl/tsan_suppressions.cpp
+SRCS+=		tsan/rtl/tsan_symbolize.cpp
+SRCS+=		tsan/rtl/tsan_sync.cpp
+SRCS+=		ubsan/ubsan_diag.cpp
+SRCS+=		ubsan/ubsan_flags.cpp
+SRCS+=		ubsan/ubsan_handlers.cpp
+SRCS+=		ubsan/ubsan_init.cpp
+SRCS+=		ubsan/ubsan_monitor.cpp
+SRCS+=		ubsan/ubsan_value.cpp
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/tsan_cxx/Makefile b/lib/libclang_rt/tsan_cxx/Makefile
index c5917b04da59..ef581160706c 100644
--- a/lib/libclang_rt/tsan_cxx/Makefile
+++ b/lib/libclang_rt/tsan_cxx/Makefile
@@ -4,13 +4,13 @@
 
 LIB=		clang_rt.tsan_cxx-${CRTARCH}
 
-SRCS+=		tsan/rtl/tsan_new_delete.cc
-SRCS+=		ubsan/ubsan_handlers_cxx.cc
-SRCS+=		ubsan/ubsan_type_hash.cc
-SRCS+=		ubsan/ubsan_type_hash_itanium.cc
+SRCS+=		tsan/rtl/tsan_new_delete.cpp
+SRCS+=		ubsan/ubsan_handlers_cxx.cpp
+SRCS+=		ubsan/ubsan_type_hash.cpp
+SRCS+=		ubsan/ubsan_type_hash_itanium.cpp
 
 .include <bsd.lib.mk>
 
-CXXFLAGS.ubsan_handlers_cxx.cc=		-frtti
-CXXFLAGS.ubsan_type_hash.cc=		-frtti
-CXXFLAGS.ubsan_type_hash_itanium.cc=	-frtti
+CXXFLAGS.ubsan_handlers_cxx.cpp=		-frtti
+CXXFLAGS.ubsan_type_hash.cpp=		-frtti
+CXXFLAGS.ubsan_type_hash_itanium.cpp=	-frtti
diff --git a/lib/libclang_rt/ubsan_minimal/Makefile b/lib/libclang_rt/ubsan_minimal/Makefile
index 5beff13e64ac..eeb22b4f31ae 100644
--- a/lib/libclang_rt/ubsan_minimal/Makefile
+++ b/lib/libclang_rt/ubsan_minimal/Makefile
@@ -4,6 +4,6 @@
 
 LIB=		clang_rt.ubsan_minimal-${CRTARCH}
 
-SRCS+=		ubsan_minimal/ubsan_minimal_handlers.cc
+SRCS+=		ubsan_minimal/ubsan_minimal_handlers.cpp
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/ubsan_standalone/Makefile b/lib/libclang_rt/ubsan_standalone/Makefile
index ac7298032189..da4c6cab036a 100644
--- a/lib/libclang_rt/ubsan_standalone/Makefile
+++ b/lib/libclang_rt/ubsan_standalone/Makefile
@@ -4,58 +4,58 @@
 
 LIB=		clang_rt.ubsan_standalone-${CRTARCH}
 
-SRCS+=		interception/interception_linux.cc
-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
-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_freebsd.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_type_traits.cc
-SRCS+=		sanitizer_common/sanitizer_unwind_linux_libcdep.cc
-SRCS+=		ubsan/ubsan_diag.cc
-SRCS+=		ubsan/ubsan_diag_standalone.cc
-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
+SRCS+=		interception/interception_linux.cpp
+SRCS+=		interception/interception_type_test.cpp
+SRCS+=		sanitizer_common/sancov_flags.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator_checks.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator_report.cpp
+SRCS+=		sanitizer_common/sanitizer_common.cpp
+SRCS+=		sanitizer_common/sanitizer_common_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cpp
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cpp
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cpp
+SRCS+=		sanitizer_common/sanitizer_errno.cpp
+SRCS+=		sanitizer_common/sanitizer_file.cpp
+SRCS+=		sanitizer_common/sanitizer_flag_parser.cpp
+SRCS+=		sanitizer_common/sanitizer_flags.cpp
+SRCS+=		sanitizer_common/sanitizer_libc.cpp
+SRCS+=		sanitizer_common/sanitizer_libignore.cpp
+SRCS+=		sanitizer_common/sanitizer_linux.cpp
+SRCS+=		sanitizer_common/sanitizer_linux_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_freebsd.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cpp
+SRCS+=		sanitizer_common/sanitizer_posix.cpp
+SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_printf.cpp
+SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cpp
+SRCS+=		sanitizer_common/sanitizer_procmaps_common.cpp
+SRCS+=		sanitizer_common/sanitizer_stackdepot.cpp
+SRCS+=		sanitizer_common/sanitizer_stacktrace.cpp
+SRCS+=		sanitizer_common/sanitizer_stacktrace_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_stacktrace_printer.cpp
+SRCS+=		sanitizer_common/sanitizer_suppressions.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_report.cpp
+SRCS+=		sanitizer_common/sanitizer_termination.cpp
+SRCS+=		sanitizer_common/sanitizer_thread_registry.cpp
+SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cpp
+SRCS+=		sanitizer_common/sanitizer_type_traits.cpp
+SRCS+=		sanitizer_common/sanitizer_unwind_linux_libcdep.cpp
+SRCS+=		ubsan/ubsan_diag.cpp
+SRCS+=		ubsan/ubsan_diag_standalone.cpp
+SRCS+=		ubsan/ubsan_flags.cpp
+SRCS+=		ubsan/ubsan_handlers.cpp
+SRCS+=		ubsan/ubsan_init.cpp
+SRCS+=		ubsan/ubsan_init_standalone.cpp
+SRCS+=		ubsan/ubsan_init_standalone_preinit.cpp
+SRCS+=		ubsan/ubsan_monitor.cpp
+SRCS+=		ubsan/ubsan_signals_standalone.cpp
+SRCS+=		ubsan/ubsan_value.cpp
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/ubsan_standalone_cxx/Makefile b/lib/libclang_rt/ubsan_standalone_cxx/Makefile
index b966168fca67..680cb9374d87 100644
--- a/lib/libclang_rt/ubsan_standalone_cxx/Makefile
+++ b/lib/libclang_rt/ubsan_standalone_cxx/Makefile
@@ -6,8 +6,8 @@ LIB=		clang_rt.ubsan_standalone_cxx-${CRTARCH}
 
 CXXFLAGS+=	-frtti
 
-SRCS+=		ubsan/ubsan_handlers_cxx.cc
-SRCS+=		ubsan/ubsan_type_hash.cc
-SRCS+=		ubsan/ubsan_type_hash_itanium.cc
+SRCS+=		ubsan/ubsan_handlers_cxx.cpp
+SRCS+=		ubsan/ubsan_type_hash.cpp
+SRCS+=		ubsan/ubsan_type_hash_itanium.cpp
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/xray-basic/Makefile b/lib/libclang_rt/xray-basic/Makefile
index f8012f167190..01280c4ae58d 100644
--- a/lib/libclang_rt/xray-basic/Makefile
+++ b/lib/libclang_rt/xray-basic/Makefile
@@ -4,7 +4,7 @@
 
 LIB=		clang_rt.xray-basic-${CRTARCH}
 
-SRCS+=		xray/xray_basic_flags.cc
-SRCS+=		xray/xray_basic_logging.cc
+SRCS+=		xray/xray_basic_flags.cpp
+SRCS+=		xray/xray_basic_logging.cpp
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/xray-fdr/Makefile b/lib/libclang_rt/xray-fdr/Makefile
index 8b793eb3b501..32fc28504565 100644
--- a/lib/libclang_rt/xray-fdr/Makefile
+++ b/lib/libclang_rt/xray-fdr/Makefile
@@ -4,7 +4,7 @@
 
 LIB=		clang_rt.xray-fdr-${CRTARCH}
 
-SRCS+=		xray/xray_fdr_flags.cc
-SRCS+=		xray/xray_fdr_logging.cc
+SRCS+=		xray/xray_fdr_flags.cpp
+SRCS+=		xray/xray_fdr_logging.cpp
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/xray-profiling/Makefile b/lib/libclang_rt/xray-profiling/Makefile
index c3696629857f..286be805ff52 100644
--- a/lib/libclang_rt/xray-profiling/Makefile
+++ b/lib/libclang_rt/xray-profiling/Makefile
@@ -4,8 +4,8 @@
 
 LIB=		clang_rt.xray-profiling-${CRTARCH}
 
-SRCS+=		xray/xray_profile_collector.cc
-SRCS+=		xray/xray_profiling.cc
-SRCS+=		xray/xray_profiling_flags.cc
+SRCS+=		xray/xray_profile_collector.cpp
+SRCS+=		xray/xray_profiling.cpp
+SRCS+=		xray/xray_profiling_flags.cpp
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/xray/Makefile b/lib/libclang_rt/xray/Makefile
index 32871eefa55e..7289c4a371b9 100644
--- a/lib/libclang_rt/xray/Makefile
+++ b/lib/libclang_rt/xray/Makefile
@@ -4,41 +4,41 @@
 
 LIB=		clang_rt.xray-${CRTARCH}
 
-SRCS+=		sanitizer_common/sanitizer_allocator.cc
-SRCS+=		sanitizer_common/sanitizer_allocator_checks.cc
-SRCS+=		sanitizer_common/sanitizer_common.cc
-SRCS+=		sanitizer_common/sanitizer_common_libcdep.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_freebsd.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_suppressions.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_type_traits.cc
-SRCS+=		xray/xray_buffer_queue.cc
-SRCS+=		xray/xray_flags.cc
-SRCS+=		xray/xray_init.cc
-SRCS+=		xray/xray_interface.cc
-SRCS+=		xray/xray_log_interface.cc
+SRCS+=		sanitizer_common/sanitizer_allocator.cpp
+SRCS+=		sanitizer_common/sanitizer_allocator_checks.cpp
+SRCS+=		sanitizer_common/sanitizer_common.cpp
+SRCS+=		sanitizer_common/sanitizer_common_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cpp
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cpp
+SRCS+=		sanitizer_common/sanitizer_errno.cpp
+SRCS+=		sanitizer_common/sanitizer_file.cpp
+SRCS+=		sanitizer_common/sanitizer_flag_parser.cpp
+SRCS+=		sanitizer_common/sanitizer_flags.cpp
+SRCS+=		sanitizer_common/sanitizer_libc.cpp
+SRCS+=		sanitizer_common/sanitizer_libignore.cpp
+SRCS+=		sanitizer_common/sanitizer_linux.cpp
+SRCS+=		sanitizer_common/sanitizer_linux_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_freebsd.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cpp
+SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cpp
+SRCS+=		sanitizer_common/sanitizer_posix.cpp
+SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_printf.cpp
+SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cpp
+SRCS+=		sanitizer_common/sanitizer_procmaps_common.cpp
+SRCS+=		sanitizer_common/sanitizer_suppressions.cpp
+SRCS+=		sanitizer_common/sanitizer_termination.cpp
+SRCS+=		sanitizer_common/sanitizer_thread_registry.cpp
+SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cpp
+SRCS+=		sanitizer_common/sanitizer_type_traits.cpp
+SRCS+=		xray/xray_buffer_queue.cpp
+SRCS+=		xray/xray_flags.cpp
+SRCS+=		xray/xray_init.cpp
+SRCS+=		xray/xray_interface.cpp
+SRCS+=		xray/xray_log_interface.cpp
 SRCS+=		xray/xray_trampoline_x86_64.S
-SRCS+=		xray/xray_utils.cc
-SRCS+=		xray/xray_x86_64.cc
+SRCS+=		xray/xray_utils.cpp
+SRCS+=		xray/xray_x86_64.cpp
 
 .include <bsd.lib.mk>