Index: projects/clang1000-import/lib/libclang_rt/Makefile.inc
===================================================================
--- projects/clang1000-import/lib/libclang_rt/Makefile.inc	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/Makefile.inc	(revision 357178)
@@ -1,45 +1,44 @@
 # $FreeBSD$
 
 .include <bsd.compiler.mk>
 
 # armv[67] is a bit special since we allow a soft-floating version via
 # CPUTYPE matching *soft*. This variant may not actually work though.
 .if ${MACHINE_ARCH:Marmv[67]*} != "" && \
     (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
 CRTARCH?=	armhf
 .else
 CRTARCH?=	${MACHINE_ARCH:C/amd64/x86_64/}
 .endif
 CRTSRC=		${SRCTOP}/contrib/llvm-project/compiler-rt
 
 .PATH:		${CRTSRC}/lib
 
 CLANGDIR=	/usr/lib/clang/10.0.0
 LIBDIR=		${CLANGDIR}/lib/freebsd
 SHLIBDIR=	${LIBDIR}
 
 NO_PIC=
 MK_PROFILE=	no
 
 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}
 CFLAGS+=	-fno-builtin
 CFLAGS+=	-fno-exceptions
 CXXFLAGS+=	-fno-rtti
 .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 30700
 CFLAGS+=	-fno-sanitize=safe-stack
 .endif
 CFLAGS+=	-fno-stack-protector
 CFLAGS+=	-funwind-tables
 CXXFLAGS+=	-fvisibility-inlines-hidden
 CXXFLAGS+=	-fvisibility=hidden
 CFLAGS+=	-I${CRTSRC}/include
 CFLAGS+=	-I${CRTSRC}/lib
-CXXSTD=		c++11
+CXXSTD=		c++14
Index: projects/clang1000-import/lib/libclang_rt/asan/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/asan/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/asan/Makefile	(revision 357178)
@@ -1,81 +1,81 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 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>
Index: projects/clang1000-import/lib/libclang_rt/asan-preinit/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/asan-preinit/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/asan-preinit/Makefile	(revision 357178)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 LIB=		clang_rt.asan-preinit-${CRTARCH}
 
-SRCS+=		asan/asan_preinit.cc
+SRCS+=		asan/asan_preinit.cpp
 
 .include <bsd.lib.mk>
Index: projects/clang1000-import/lib/libclang_rt/asan_cxx/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/asan_cxx/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/asan_cxx/Makefile	(revision 357178)
@@ -1,14 +1,14 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 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>
Index: projects/clang1000-import/lib/libclang_rt/asan_dynamic/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/asan_dynamic/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/asan_dynamic/Makefile	(revision 357178)
@@ -1,97 +1,97 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 SHLIB_NAME=	libclang_rt.asan-${CRTARCH}.so
 .undef NO_PIC # sorry...
 
 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),
 # there is no way to tell it to use ${CXX} for linking.  Since the files for
 # this library are all C++ anyway, simply set CC to CXX.
 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
Index: projects/clang1000-import/lib/libclang_rt/cfi/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/cfi/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/cfi/Makefile	(revision 357178)
@@ -1,39 +1,39 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 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>
Index: projects/clang1000-import/lib/libclang_rt/cfi_diag/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/cfi_diag/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/cfi_diag/Makefile	(revision 357178)
@@ -1,58 +1,58 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 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>
Index: projects/clang1000-import/lib/libclang_rt/dd/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/dd/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/dd/Makefile	(revision 357178)
@@ -1,40 +1,40 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 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>
Index: projects/clang1000-import/lib/libclang_rt/fuzzer/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/fuzzer/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/fuzzer/Makefile	(revision 357178)
@@ -1,27 +1,26 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 LIB=		clang_rt.fuzzer-${CRTARCH}
 
 SRCS+=		fuzzer/FuzzerCrossOver.cpp
 SRCS+=		fuzzer/FuzzerDataFlowTrace.cpp
 SRCS+=		fuzzer/FuzzerDriver.cpp
 SRCS+=		fuzzer/FuzzerExtFunctionsDlsym.cpp
 SRCS+=		fuzzer/FuzzerExtFunctionsWeak.cpp
 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
 SRCS+=		fuzzer/FuzzerMutate.cpp
 SRCS+=		fuzzer/FuzzerSHA1.cpp
 SRCS+=		fuzzer/FuzzerTracePC.cpp
 SRCS+=		fuzzer/FuzzerUtil.cpp
 SRCS+=		fuzzer/FuzzerUtilLinux.cpp
 SRCS+=		fuzzer/FuzzerUtilPosix.cpp
 
 .include <bsd.lib.mk>
Index: projects/clang1000-import/lib/libclang_rt/fuzzer_no_main/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/fuzzer_no_main/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/fuzzer_no_main/Makefile	(revision 357178)
@@ -1,26 +1,25 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 LIB=		clang_rt.fuzzer_no_main-${CRTARCH}
 
 SRCS+=		fuzzer/FuzzerCrossOver.cpp
 SRCS+=		fuzzer/FuzzerDataFlowTrace.cpp
 SRCS+=		fuzzer/FuzzerDriver.cpp
 SRCS+=		fuzzer/FuzzerExtFunctionsDlsym.cpp
 SRCS+=		fuzzer/FuzzerExtFunctionsWeak.cpp
 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
 SRCS+=		fuzzer/FuzzerSHA1.cpp
 SRCS+=		fuzzer/FuzzerTracePC.cpp
 SRCS+=		fuzzer/FuzzerUtil.cpp
 SRCS+=		fuzzer/FuzzerUtilLinux.cpp
 SRCS+=		fuzzer/FuzzerUtilPosix.cpp
 
 .include <bsd.lib.mk>
Index: projects/clang1000-import/lib/libclang_rt/include/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/include/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/include/Makefile	(revision 357178)
@@ -1,23 +1,24 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 .PATH:		${CRTSRC}/include/sanitizer
 
 INCSDIR=	${CLANGDIR}/include/sanitizer
 
 INCS+=		allocator_interface.h
 INCS+=		asan_interface.h
 INCS+=		common_interface_defs.h
 INCS+=		coverage_interface.h
 INCS+=		dfsan_interface.h
 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
+INCS+=		ubsan_interface.h
 
 .include <bsd.prog.mk>
Index: projects/clang1000-import/lib/libclang_rt/msan/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/msan/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/msan/Makefile	(revision 357178)
@@ -1,65 +1,65 @@
 # $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_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>
Index: projects/clang1000-import/lib/libclang_rt/msan_cxx/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/msan_cxx/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/msan_cxx/Makefile	(revision 357178)
@@ -1,17 +1,17 @@
 
 # $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
+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
Index: projects/clang1000-import/lib/libclang_rt/profile/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/profile/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/profile/Makefile	(revision 357178)
@@ -1,28 +1,28 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 LIB=		clang_rt.profile-${CRTARCH}
 
 CFLAGS+=	-DCOMPILER_RT_HAS_ATOMICS=1
 CFLAGS+=	-DCOMPILER_RT_HAS_FCNTL_LCK=1
 CFLAGS+=	-DCOMPILER_RT_HAS_UNAME=1
 
 # This is needed for --coverage
 CXXFLAGS+=	-fvisibility=default
 
 SRCS+=		profile/GCDAProfiling.c
 SRCS+=		profile/InstrProfiling.c
 SRCS+=		profile/InstrProfilingBuffer.c
 SRCS+=		profile/InstrProfilingFile.c
 SRCS+=		profile/InstrProfilingMerge.c
 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
 
 .include <bsd.lib.mk>
Index: projects/clang1000-import/lib/libclang_rt/safestack/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/safestack/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/safestack/Makefile	(revision 357178)
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 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>
Index: projects/clang1000-import/lib/libclang_rt/stats/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/stats/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/stats/Makefile	(revision 357178)
@@ -1,48 +1,48 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 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>
Index: projects/clang1000-import/lib/libclang_rt/stats_client/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/stats_client/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/stats_client/Makefile	(revision 357178)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 LIB=		clang_rt.stats_client-${CRTARCH}
 
-SRCS+=		stats/stats_client.cc
+SRCS+=		stats/stats_client.cpp
 
 .include <bsd.lib.mk>
Index: projects/clang1000-import/lib/libclang_rt/tsan/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/tsan/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/tsan/Makefile	(revision 357178)
@@ -1,87 +1,87 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 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>
Index: projects/clang1000-import/lib/libclang_rt/tsan_cxx/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/tsan_cxx/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/tsan_cxx/Makefile	(revision 357178)
@@ -1,16 +1,16 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 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
Index: projects/clang1000-import/lib/libclang_rt/ubsan_minimal/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/ubsan_minimal/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/ubsan_minimal/Makefile	(revision 357178)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 LIB=		clang_rt.ubsan_minimal-${CRTARCH}
 
-SRCS+=		ubsan_minimal/ubsan_minimal_handlers.cc
+SRCS+=		ubsan_minimal/ubsan_minimal_handlers.cpp
 
 .include <bsd.lib.mk>
Index: projects/clang1000-import/lib/libclang_rt/ubsan_standalone/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/ubsan_standalone/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/ubsan_standalone/Makefile	(revision 357178)
@@ -1,61 +1,61 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 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>
Index: projects/clang1000-import/lib/libclang_rt/ubsan_standalone_cxx/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/ubsan_standalone_cxx/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/ubsan_standalone_cxx/Makefile	(revision 357178)
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 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>
Index: projects/clang1000-import/lib/libclang_rt/xray/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/xray/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/xray/Makefile	(revision 357178)
@@ -1,44 +1,44 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 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>
Index: projects/clang1000-import/lib/libclang_rt/xray-basic/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/xray-basic/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/xray-basic/Makefile	(revision 357178)
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 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>
Index: projects/clang1000-import/lib/libclang_rt/xray-fdr/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/xray-fdr/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/xray-fdr/Makefile	(revision 357178)
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 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>
Index: projects/clang1000-import/lib/libclang_rt/xray-profiling/Makefile
===================================================================
--- projects/clang1000-import/lib/libclang_rt/xray-profiling/Makefile	(revision 357177)
+++ projects/clang1000-import/lib/libclang_rt/xray-profiling/Makefile	(revision 357178)
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 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>