Index: projects/clang600-import/lib/libclang_rt/Makefile
===================================================================
--- projects/clang600-import/lib/libclang_rt/Makefile	(revision 327118)
+++ projects/clang600-import/lib/libclang_rt/Makefile	(revision 327119)
@@ -1,21 +1,24 @@
 # $FreeBSD$
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 SUBDIR+=	include
 SUBDIR+=	asan
 SUBDIR+=	asan-preinit
-SUBDIR+=	asan_dynamic
 SUBDIR+=	asan_cxx
+SUBDIR+=	asan_dynamic
 SUBDIR+=	safestack
 SUBDIR+=	stats
 SUBDIR+=	stats_client
+SUBDIR+=	tsan
+SUBDIR+=	tsan_cxx
+SUBDIR+=	ubsan_minimal
 SUBDIR+=	ubsan_standalone
 SUBDIR+=	ubsan_standalone_cxx
 .endif
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" || \
     (${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH} != "armeb")
 SUBDIR+=	profile
 .endif
 
 .include <bsd.subdir.mk>
Index: projects/clang600-import/lib/libclang_rt/Makefile.inc
===================================================================
--- projects/clang600-import/lib/libclang_rt/Makefile.inc	(revision 327118)
+++ projects/clang600-import/lib/libclang_rt/Makefile.inc	(revision 327119)
@@ -1,39 +1,43 @@
 # $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_CPUARCH:C/amd64/x86_64/}
 .endif
 CRTSRC=		${SRCTOP}/contrib/compiler-rt
 
 .PATH:		${CRTSRC}/lib
 
 CLANGDIR=	/usr/lib/clang/6.0.0
 LIBDIR=		${CLANGDIR}/lib/freebsd
 
 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}/lib
 CXXFLAGS+=	-std=c++11
Index: projects/clang600-import/lib/libclang_rt/asan/Makefile
===================================================================
--- projects/clang600-import/lib/libclang_rt/asan/Makefile	(revision 327118)
+++ projects/clang600-import/lib/libclang_rt/asan/Makefile	(revision 327119)
@@ -1,84 +1,76 @@
 # $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_mac.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+=		asan/asan_win.cc
 SRCS+=		interception/interception_linux.cc
-SRCS+=		interception/interception_mac.cc
 SRCS+=		interception/interception_type_test.cc
-SRCS+=		interception/interception_win.cc
-SRCS+=		lsan/lsan_common.cc
-SRCS+=		lsan/lsan_common_linux.cc
 SRCS+=		sanitizer_common/sancov_flags.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_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_mac.cc
 SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cc
 SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cc
 SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cc
 SRCS+=		sanitizer_common/sanitizer_posix.cc
 SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_printf.cc
 SRCS+=		sanitizer_common/sanitizer_procmaps_common.cc
 SRCS+=		sanitizer_common/sanitizer_procmaps_freebsd.cc
-SRCS+=		sanitizer_common/sanitizer_procmaps_linux.cc
-SRCS+=		sanitizer_common/sanitizer_procmaps_mac.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_stoptheworld_linux_libcdep.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_mac.cc
 SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
-SRCS+=		sanitizer_common/sanitizer_symbolizer_win.cc
 SRCS+=		sanitizer_common/sanitizer_termination.cc
 SRCS+=		sanitizer_common/sanitizer_thread_registry.cc
 SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cc
 SRCS+=		sanitizer_common/sanitizer_unwind_linux_libcdep.cc
-SRCS+=		sanitizer_common/sanitizer_win.cc
 SRCS+=		ubsan/ubsan_diag.cc
 SRCS+=		ubsan/ubsan_flags.cc
 SRCS+=		ubsan/ubsan_handlers.cc
 SRCS+=		ubsan/ubsan_init.cc
 SRCS+=		ubsan/ubsan_value.cc
 
 .include <bsd.lib.mk>
Index: projects/clang600-import/lib/libclang_rt/asan_cxx/Makefile
===================================================================
--- projects/clang600-import/lib/libclang_rt/asan_cxx/Makefile	(revision 327118)
+++ projects/clang600-import/lib/libclang_rt/asan_cxx/Makefile	(revision 327119)
@@ -1,15 +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+=		ubsan/ubsan_type_hash_win.cc
 
 .include <bsd.lib.mk>
Index: projects/clang600-import/lib/libclang_rt/asan_dynamic/Makefile
===================================================================
--- projects/clang600-import/lib/libclang_rt/asan_dynamic/Makefile	(revision 327118)
+++ projects/clang600-import/lib/libclang_rt/asan_dynamic/Makefile	(revision 327119)
@@ -1,99 +1,93 @@
 # $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_mac.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+=		asan/asan_win.cc
 SRCS+=		interception/interception_linux.cc
-SRCS+=		interception/interception_mac.cc
 SRCS+=		interception/interception_type_test.cc
-SRCS+=		interception/interception_win.cc
-SRCS+=		lsan/lsan_common.cc
-SRCS+=		lsan/lsan_common_linux.cc
 SRCS+=		sanitizer_common/sancov_flags.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_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_mac.cc
 SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cc
 SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cc
 SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cc
 SRCS+=		sanitizer_common/sanitizer_posix.cc
 SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_printf.cc
 SRCS+=		sanitizer_common/sanitizer_procmaps_common.cc
 SRCS+=		sanitizer_common/sanitizer_procmaps_freebsd.cc
-SRCS+=		sanitizer_common/sanitizer_procmaps_linux.cc
-SRCS+=		sanitizer_common/sanitizer_procmaps_mac.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_stoptheworld_linux_libcdep.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_mac.cc
 SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
-SRCS+=		sanitizer_common/sanitizer_symbolizer_win.cc
 SRCS+=		sanitizer_common/sanitizer_termination.cc
 SRCS+=		sanitizer_common/sanitizer_thread_registry.cc
 SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cc
 SRCS+=		sanitizer_common/sanitizer_unwind_linux_libcdep.cc
-SRCS+=		sanitizer_common/sanitizer_win.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_type_hash.cc
 SRCS+=		ubsan/ubsan_type_hash_itanium.cc
-SRCS+=		ubsan/ubsan_type_hash_win.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
 CXXFLAGS.ubsan_type_hash_win.cc=	-frtti
Index: projects/clang600-import/lib/libclang_rt/include/Makefile
===================================================================
--- projects/clang600-import/lib/libclang_rt/include/Makefile	(revision 327118)
+++ projects/clang600-import/lib/libclang_rt/include/Makefile	(revision 327119)
@@ -1,21 +1,23 @@
 # $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+=		esan_interface.h
+INCS+=		hwasan_interface.h
 INCS+=		linux_syscall_hooks.h
 INCS+=		lsan_interface.h
 INCS+=		msan_interface.h
+INCS+=		scudo_interface.h
 INCS+=		tsan_interface.h
 INCS+=		tsan_interface_atomic.h
 
 .include <bsd.prog.mk>
Index: projects/clang600-import/lib/libclang_rt/profile/Makefile
===================================================================
--- projects/clang600-import/lib/libclang_rt/profile/Makefile	(revision 327118)
+++ projects/clang600-import/lib/libclang_rt/profile/Makefile	(revision 327119)
@@ -1,25 +1,29 @@
 # $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/InstrProfilingPlatformDarwin.c
 SRCS+=		profile/InstrProfilingPlatformLinux.c
 SRCS+=		profile/InstrProfilingPlatformOther.c
 SRCS+=		profile/InstrProfilingRuntime.cc
 SRCS+=		profile/InstrProfilingUtil.c
 SRCS+=		profile/InstrProfilingValue.c
 SRCS+=		profile/InstrProfilingWriter.c
 
 .include <bsd.lib.mk>
Index: projects/clang600-import/lib/libclang_rt/safestack/Makefile
===================================================================
--- projects/clang600-import/lib/libclang_rt/safestack/Makefile	(revision 327118)
+++ projects/clang600-import/lib/libclang_rt/safestack/Makefile	(revision 327119)
@@ -1,46 +1,39 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 LIB=		clang_rt.safestack-${CRTARCH}
 
 SRCS+=		interception/interception_linux.cc
-SRCS+=		interception/interception_mac.cc
 SRCS+=		interception/interception_type_test.cc
-SRCS+=		interception/interception_win.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_mac.cc
 SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cc
 SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cc
 SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cc
 SRCS+=		sanitizer_common/sanitizer_posix.cc
 SRCS+=		sanitizer_common/sanitizer_printf.cc
 SRCS+=		sanitizer_common/sanitizer_procmaps_common.cc
 SRCS+=		sanitizer_common/sanitizer_procmaps_freebsd.cc
-SRCS+=		sanitizer_common/sanitizer_procmaps_linux.cc
-SRCS+=		sanitizer_common/sanitizer_procmaps_mac.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_symbolizer.cc
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cc
-SRCS+=		sanitizer_common/sanitizer_symbolizer_mac.cc
-SRCS+=		sanitizer_common/sanitizer_symbolizer_win.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_win.cc
 
 .include <bsd.lib.mk>
Index: projects/clang600-import/lib/libclang_rt/stats/Makefile
===================================================================
--- projects/clang600-import/lib/libclang_rt/stats/Makefile	(revision 327118)
+++ projects/clang600-import/lib/libclang_rt/stats/Makefile	(revision 327119)
@@ -1,51 +1,46 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 LIB=		clang_rt.stats-${CRTARCH}
 
 SRCS+=		sanitizer_common/sancov_flags.cc
 SRCS+=		sanitizer_common/sanitizer_allocator.cc
+SRCS+=		sanitizer_common/sanitizer_allocator_checks.cc
 SRCS+=		sanitizer_common/sanitizer_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_mac.cc
 SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cc
 SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cc
 SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cc
 SRCS+=		sanitizer_common/sanitizer_posix.cc
 SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_printf.cc
 SRCS+=		sanitizer_common/sanitizer_procmaps_common.cc
 SRCS+=		sanitizer_common/sanitizer_procmaps_freebsd.cc
-SRCS+=		sanitizer_common/sanitizer_procmaps_linux.cc
-SRCS+=		sanitizer_common/sanitizer_procmaps_mac.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_stoptheworld_linux_libcdep.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_mac.cc
 SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
-SRCS+=		sanitizer_common/sanitizer_symbolizer_win.cc
 SRCS+=		sanitizer_common/sanitizer_termination.cc
 SRCS+=		sanitizer_common/sanitizer_thread_registry.cc
 SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cc
 SRCS+=		sanitizer_common/sanitizer_unwind_linux_libcdep.cc
-SRCS+=		sanitizer_common/sanitizer_win.cc
 SRCS+=		stats/stats.cc
 
 .include <bsd.lib.mk>
Index: projects/clang600-import/lib/libclang_rt/tsan/Makefile
===================================================================
--- projects/clang600-import/lib/libclang_rt/tsan/Makefile	(nonexistent)
+++ projects/clang600-import/lib/libclang_rt/tsan/Makefile	(revision 327119)
@@ -0,0 +1,82 @@
+# $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_common.cc
+SRCS+=		sanitizer_common/sanitizer_common_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cc
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cc
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cc
+SRCS+=		sanitizer_common/sanitizer_errno.cc
+SRCS+=		sanitizer_common/sanitizer_file.cc
+SRCS+=		sanitizer_common/sanitizer_flag_parser.cc
+SRCS+=		sanitizer_common/sanitizer_flags.cc
+SRCS+=		sanitizer_common/sanitizer_libc.cc
+SRCS+=		sanitizer_common/sanitizer_libignore.cc
+SRCS+=		sanitizer_common/sanitizer_linux.cc
+SRCS+=		sanitizer_common/sanitizer_linux_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cc
+SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cc
+SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cc
+SRCS+=		sanitizer_common/sanitizer_posix.cc
+SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_printf.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_common.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_freebsd.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_termination.cc
+SRCS+=		sanitizer_common/sanitizer_thread_registry.cc
+SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cc
+SRCS+=		sanitizer_common/sanitizer_unwind_linux_libcdep.cc
+SRCS+=		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_value.cc
+
+.include <bsd.lib.mk>

Property changes on: projects/clang600-import/lib/libclang_rt/tsan/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: projects/clang600-import/lib/libclang_rt/tsan_cxx/Makefile
===================================================================
--- projects/clang600-import/lib/libclang_rt/tsan_cxx/Makefile	(nonexistent)
+++ projects/clang600-import/lib/libclang_rt/tsan_cxx/Makefile	(revision 327119)
@@ -0,0 +1,17 @@
+# $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
+
+.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_type_hash_win.cc=	-frtti

Property changes on: projects/clang600-import/lib/libclang_rt/tsan_cxx/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: projects/clang600-import/lib/libclang_rt/ubsan_minimal/Makefile
===================================================================
--- projects/clang600-import/lib/libclang_rt/ubsan_minimal/Makefile	(nonexistent)
+++ projects/clang600-import/lib/libclang_rt/ubsan_minimal/Makefile	(revision 327119)
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+.include <bsd.init.mk>
+
+LIB=		clang_rt.ubsan_minimal-${CRTARCH}
+
+SRCS+=		ubsan_minimal/ubsan_minimal_handlers.cc
+
+.include <bsd.lib.mk>

Property changes on: projects/clang600-import/lib/libclang_rt/ubsan_minimal/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: projects/clang600-import/lib/libclang_rt/ubsan_standalone/Makefile
===================================================================
--- projects/clang600-import/lib/libclang_rt/ubsan_standalone/Makefile	(revision 327118)
+++ projects/clang600-import/lib/libclang_rt/ubsan_standalone/Makefile	(revision 327119)
@@ -1,56 +1,55 @@
 # $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_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_mac.cc
 SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cc
 SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cc
 SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cc
 SRCS+=		sanitizer_common/sanitizer_posix.cc
 SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_printf.cc
 SRCS+=		sanitizer_common/sanitizer_procmaps_common.cc
 SRCS+=		sanitizer_common/sanitizer_procmaps_freebsd.cc
-SRCS+=		sanitizer_common/sanitizer_procmaps_linux.cc
-SRCS+=		sanitizer_common/sanitizer_procmaps_mac.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_stoptheworld_linux_libcdep.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_mac.cc
 SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
-SRCS+=		sanitizer_common/sanitizer_symbolizer_win.cc
 SRCS+=		sanitizer_common/sanitizer_termination.cc
 SRCS+=		sanitizer_common/sanitizer_thread_registry.cc
 SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cc
 SRCS+=		sanitizer_common/sanitizer_unwind_linux_libcdep.cc
-SRCS+=		sanitizer_common/sanitizer_win.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_signals_standalone.cc
 SRCS+=		ubsan/ubsan_value.cc
 
 .include <bsd.lib.mk>
Index: projects/clang600-import/lib/libclang_rt/ubsan_standalone_cxx/Makefile
===================================================================
--- projects/clang600-import/lib/libclang_rt/ubsan_standalone_cxx/Makefile	(revision 327118)
+++ projects/clang600-import/lib/libclang_rt/ubsan_standalone_cxx/Makefile	(revision 327119)
@@ -1,14 +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_type_hash_win.cc
 
 .include <bsd.lib.mk>