diff --git a/lib/libclang_rt/asan/Makefile b/lib/libclang_rt/asan/Makefile
index 41578e4336a1..e8a98f584577 100644
--- a/lib/libclang_rt/asan/Makefile
+++ b/lib/libclang_rt/asan/Makefile
@@ -7,6 +7,8 @@ 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
@@ -14,8 +16,6 @@ SRCS+=		asan/asan_interceptors.cc
 SRCS+=		asan/asan_linux.cc
 SRCS+=		asan/asan_mac.cc
 SRCS+=		asan/asan_malloc_linux.cc
-SRCS+=		asan/asan_malloc_mac.cc
-SRCS+=		asan/asan_malloc_win.cc
 SRCS+=		asan/asan_memory_profile.cc
 SRCS+=		asan/asan_poisoning.cc
 SRCS+=		asan/asan_posix.cc
@@ -33,10 +33,12 @@ 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_common.cc
 SRCS+=		sanitizer_common/sanitizer_common_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_coverage_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cc
 SRCS+=		sanitizer_common/sanitizer_coverage_mapping_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cc
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cc
diff --git a/lib/libclang_rt/asan_dynamic/Makefile b/lib/libclang_rt/asan_dynamic/Makefile
index bc478815eb39..118fa1b2e968 100644
--- a/lib/libclang_rt/asan_dynamic/Makefile
+++ b/lib/libclang_rt/asan_dynamic/Makefile
@@ -8,6 +8,8 @@ SHLIB_NAME=	libclang_rt.asan-${CRTARCH}.so
 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
@@ -15,8 +17,6 @@ SRCS+=		asan/asan_interceptors.cc
 SRCS+=		asan/asan_linux.cc
 SRCS+=		asan/asan_mac.cc
 SRCS+=		asan/asan_malloc_linux.cc
-SRCS+=		asan/asan_malloc_mac.cc
-SRCS+=		asan/asan_malloc_win.cc
 SRCS+=		asan/asan_memory_profile.cc
 SRCS+=		asan/asan_new_delete.cc
 SRCS+=		asan/asan_poisoning.cc
@@ -34,10 +34,12 @@ 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_common.cc
 SRCS+=		sanitizer_common/sanitizer_common_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_coverage_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cc
 SRCS+=		sanitizer_common/sanitizer_coverage_mapping_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cc
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cc
diff --git a/lib/libclang_rt/safestack/Makefile b/lib/libclang_rt/safestack/Makefile
index 050b05c70338..661212075ab4 100644
--- a/lib/libclang_rt/safestack/Makefile
+++ b/lib/libclang_rt/safestack/Makefile
@@ -19,7 +19,6 @@ 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_s390.cc
 SRCS+=		sanitizer_common/sanitizer_linux_x86_64.S
 SRCS+=		sanitizer_common/sanitizer_mac.cc
 SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cc
diff --git a/lib/libclang_rt/stats/Makefile b/lib/libclang_rt/stats/Makefile
index 7516ec4cb20e..84872811ea15 100644
--- a/lib/libclang_rt/stats/Makefile
+++ b/lib/libclang_rt/stats/Makefile
@@ -4,10 +4,12 @@
 
 LIB=		clang_rt.stats-${CRTARCH}
 
+SRCS+=		sanitizer_common/sancov_flags.cc
 SRCS+=		sanitizer_common/sanitizer_allocator.cc
 SRCS+=		sanitizer_common/sanitizer_common.cc
 SRCS+=		sanitizer_common/sanitizer_common_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_coverage_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cc
 SRCS+=		sanitizer_common/sanitizer_coverage_mapping_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cc
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cc
@@ -17,7 +19,6 @@ 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_linux_s390.cc
 SRCS+=		sanitizer_common/sanitizer_linux_x86_64.S
 SRCS+=		sanitizer_common/sanitizer_mac.cc
 SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cc
diff --git a/lib/libclang_rt/ubsan_standalone/Makefile b/lib/libclang_rt/ubsan_standalone/Makefile
index c7c65fda5852..ed008e54ae2e 100644
--- a/lib/libclang_rt/ubsan_standalone/Makefile
+++ b/lib/libclang_rt/ubsan_standalone/Makefile
@@ -4,10 +4,12 @@
 
 LIB=		clang_rt.ubsan_standalone-${CRTARCH}
 
+SRCS+=		sanitizer_common/sancov_flags.cc
 SRCS+=		sanitizer_common/sanitizer_allocator.cc
 SRCS+=		sanitizer_common/sanitizer_common.cc
 SRCS+=		sanitizer_common/sanitizer_common_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_coverage_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cc
 SRCS+=		sanitizer_common/sanitizer_coverage_mapping_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cc
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cc
@@ -17,7 +19,6 @@ 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_linux_s390.cc
 SRCS+=		sanitizer_common/sanitizer_linux_x86_64.S
 SRCS+=		sanitizer_common/sanitizer_mac.cc
 SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cc