7 files changed, 110 insertions, 2 deletions
diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile
index ce86dc1cb059..8322db140c22 100644
--- a/lib/libclang_rt/Makefile
+++ b/lib/libclang_rt/Makefile
@@ -6,6 +6,7 @@
 SUBDIR+= include\
 	 asan\
 	 asan-preinit\
+	 asan_dynamic\
 	 asan_cxx\
 	 safestack\
 	 ubsan_standalone\
diff --git a/lib/libclang_rt/asan/Makefile b/lib/libclang_rt/asan/Makefile
index 3090c932404d..c8097f8b52b3 100644
--- a/lib/libclang_rt/asan/Makefile
+++ b/lib/libclang_rt/asan/Makefile
@@ -75,7 +75,6 @@ SRCS=	asan_preinit.cc\
 	sanitizer_stoptheworld_linux_libcdep.cc\
 	sanitizer_symbolizer_libcdep.cc\
 	sanitizer_symbolizer_posix_libcdep.cc\
-	sanitizer_symbolizer_process_libcdep.cc\
 	sanitizer_unwind_linux_libcdep.cc\
 	lsan_common.cc\
 	lsan_common_linux.cc\
diff --git a/lib/libclang_rt/asan_dynamic/Makefile b/lib/libclang_rt/asan_dynamic/Makefile
new file mode 100644
index 000000000000..8be3903d7eb0
--- /dev/null
+++ b/lib/libclang_rt/asan_dynamic/Makefile
@@ -0,0 +1,104 @@
+# $FreeBSD$
+
+.include <bsd.init.mk>
+
+SHLIB_NAME=	libclang_rt.asan-${CRTARCH}.so
+.undef NO_PIC # sorry...
+
+.PATH:	${CRTSRC}/lib/asan\
+	${CRTSRC}/lib/interception\
+	${CRTSRC}/lib/sanitizer_common\
+	${CRTSRC}/lib/lsan\
+	${CRTSRC}/lib/ubsan
+
+SRCS=	interception_linux.cc\
+	interception_mac.cc\
+	interception_win.cc\
+	interception_type_test.cc\
+	sanitizer_allocator.cc\
+	sanitizer_common.cc\
+	sanitizer_deadlock_detector1.cc\
+	sanitizer_deadlock_detector2.cc\
+	sanitizer_flags.cc\
+	sanitizer_flag_parser.cc\
+	sanitizer_libc.cc\
+	sanitizer_libignore.cc\
+	sanitizer_linux.cc\
+	sanitizer_mac.cc\
+	sanitizer_persistent_allocator.cc\
+	sanitizer_platform_limits_linux.cc\
+	sanitizer_platform_limits_posix.cc\
+	sanitizer_posix.cc\
+	sanitizer_printf.cc\
+	sanitizer_procmaps_common.cc\
+	sanitizer_procmaps_freebsd.cc\
+	sanitizer_procmaps_linux.cc\
+	sanitizer_procmaps_mac.cc\
+	sanitizer_stackdepot.cc\
+	sanitizer_stacktrace.cc\
+	sanitizer_stacktrace_printer.cc\
+	sanitizer_suppressions.cc\
+	sanitizer_symbolizer.cc\
+	sanitizer_symbolizer_libbacktrace.cc\
+	sanitizer_symbolizer_mac.cc\
+	sanitizer_symbolizer_win.cc\
+	sanitizer_tls_get_addr.cc\
+	sanitizer_thread_registry.cc\
+	sanitizer_win.cc\
+	sanitizer_common_libcdep.cc\
+	sanitizer_coverage_libcdep.cc\
+	sanitizer_coverage_mapping_libcdep.cc\
+	sanitizer_linux_libcdep.cc\
+	sanitizer_posix_libcdep.cc\
+	sanitizer_stacktrace_libcdep.cc\
+	sanitizer_stoptheworld_linux_libcdep.cc\
+	sanitizer_symbolizer_libcdep.cc\
+	sanitizer_symbolizer_posix_libcdep.cc\
+	sanitizer_unwind_linux_libcdep.cc\
+	lsan_common.cc\
+	lsan_common_linux.cc\
+	ubsan_diag.cc\
+	ubsan_init.cc\
+	ubsan_flags.cc\
+	ubsan_handlers.cc\
+	ubsan_value.cc\
+	asan_allocator.cc\
+	asan_activation.cc\
+	asan_debugging.cc\
+	asan_fake_stack.cc\
+	asan_flags.cc\
+	asan_globals.cc\
+	asan_interceptors.cc\
+	asan_linux.cc\
+	asan_mac.cc\
+	asan_malloc_linux.cc\
+	asan_malloc_mac.cc\
+	asan_malloc_win.cc\
+	asan_poisoning.cc\
+	asan_posix.cc\
+	asan_report.cc\
+	asan_rtl.cc\
+	asan_stack.cc\
+	asan_stats.cc\
+	asan_suppressions.cc\
+	asan_thread.cc\
+	asan_win.cc\
+	asan_new_delete.cc\
+	ubsan_handlers_cxx.cc\
+	ubsan_type_hash.cc\
+	ubsan_type_hash_itanium.cc\
+	ubsan_type_hash_win.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
+CXXFLAGS+=				${CXXFLAGS.${.IMPSRC:T}}
diff --git a/lib/libclang_rt/profile/Makefile b/lib/libclang_rt/profile/Makefile
index 6acbb4eb8c11..68ba991a45f8 100644
--- a/lib/libclang_rt/profile/Makefile
+++ b/lib/libclang_rt/profile/Makefile
@@ -8,9 +8,12 @@ LIB=	clang_rt.profile-${CRTARCH}
 
 SRCS=	GCDAProfiling.c\
 	InstrProfiling.c\
+	InstrProfilingValue.c\
 	InstrProfilingBuffer.c\
 	InstrProfilingFile.c\
+	InstrProfilingWriter.c\
 	InstrProfilingPlatformDarwin.c\
+	InstrProfilingPlatformLinux.c\
 	InstrProfilingPlatformOther.c\
 	InstrProfilingRuntime.cc\
 	InstrProfilingUtil.c
diff --git a/lib/libclang_rt/safestack/Makefile b/lib/libclang_rt/safestack/Makefile
index f684fe2035c8..f7694122317b 100644
--- a/lib/libclang_rt/safestack/Makefile
+++ b/lib/libclang_rt/safestack/Makefile
@@ -42,6 +42,7 @@ SRCS=	interception_linux.cc\
 	sanitizer_tls_get_addr.cc\
 	sanitizer_thread_registry.cc\
 	sanitizer_win.cc\
+	sanitizer_common_nolibc.cc\
 	safestack.cc
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/ubsan_standalone/Makefile b/lib/libclang_rt/ubsan_standalone/Makefile
index 3ba5ca0ebaa6..fddd2edc2562 100644
--- a/lib/libclang_rt/ubsan_standalone/Makefile
+++ b/lib/libclang_rt/ubsan_standalone/Makefile
@@ -46,7 +46,6 @@ SRCS=	sanitizer_allocator.cc\
 	sanitizer_stoptheworld_linux_libcdep.cc\
 	sanitizer_symbolizer_libcdep.cc\
 	sanitizer_symbolizer_posix_libcdep.cc\
-	sanitizer_symbolizer_process_libcdep.cc\
 	sanitizer_unwind_linux_libcdep.cc\
 	ubsan_diag.cc\
 	ubsan_init.cc\
diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile
index 86daee4aabf0..3c7896df4bb8 100644
--- a/lib/libcompiler_rt/Makefile
+++ b/lib/libcompiler_rt/Makefile
@@ -44,6 +44,7 @@ SRCF=	absvdi2 \
 	divmoddi4 \
 	divmodsi4 \
 	divsc3 \
+	divtc3 \
 	divti3 \
 	divxc3 \
 	enable_execute_stack \