Index: projects/clang800-import/lib/libclang_rt/asan/Makefile
===================================================================
--- projects/clang800-import/lib/libclang_rt/asan/Makefile	(revision 343311)
+++ projects/clang800-import/lib/libclang_rt/asan/Makefile	(revision 343312)
@@ -1,79 +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
 
 .include <bsd.lib.mk>
Index: projects/clang800-import/lib/libclang_rt/asan_dynamic/Makefile
===================================================================
--- projects/clang800-import/lib/libclang_rt/asan_dynamic/Makefile	(revision 343311)
+++ projects/clang800-import/lib/libclang_rt/asan_dynamic/Makefile	(revision 343312)
@@ -1,95 +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
 
 # 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
Index: projects/clang800-import/lib/libclang_rt/msan/Makefile
===================================================================
--- projects/clang800-import/lib/libclang_rt/msan/Makefile	(revision 343311)
+++ projects/clang800-import/lib/libclang_rt/msan/Makefile	(revision 343312)
@@ -1,63 +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
 
 .include <bsd.lib.mk>
Index: projects/clang800-import/lib/libclang_rt/safestack/Makefile
===================================================================
--- projects/clang800-import/lib/libclang_rt/safestack/Makefile	(revision 343311)
+++ projects/clang800-import/lib/libclang_rt/safestack/Makefile	(revision 343312)
@@ -1,37 +1,38 @@
 # $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+=		sanitizer_common/sanitizer_allocator.cc
 SRCS+=		sanitizer_common/sanitizer_common.cc
 SRCS+=		sanitizer_common/sanitizer_common_nolibc.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_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_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_printer.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
 
 .include <bsd.lib.mk>
Index: projects/clang800-import/lib/libclang_rt/stats/Makefile
===================================================================
--- projects/clang800-import/lib/libclang_rt/stats/Makefile	(revision 343311)
+++ projects/clang800-import/lib/libclang_rt/stats/Makefile	(revision 343312)
@@ -1,46 +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
 
 .include <bsd.lib.mk>
Index: projects/clang800-import/lib/libclang_rt/tsan/Makefile
===================================================================
--- projects/clang800-import/lib/libclang_rt/tsan/Makefile	(revision 343311)
+++ projects/clang800-import/lib/libclang_rt/tsan/Makefile	(revision 343312)
@@ -1,85 +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+=		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
 
 .include <bsd.lib.mk>
Index: projects/clang800-import/lib/libclang_rt/ubsan_standalone/Makefile
===================================================================
--- projects/clang800-import/lib/libclang_rt/ubsan_standalone/Makefile	(revision 343311)
+++ projects/clang800-import/lib/libclang_rt/ubsan_standalone/Makefile	(revision 343312)
@@ -1,59 +1,62 @@
 # $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_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
 
 .include <bsd.lib.mk>