Update compiler-rt to 3.9.0 release, and update the build glue for

libcompiler_rt and libclang_rt.

1 files changed, 80 insertions, 83 deletions

diff --git a/lib/libclang_rt/asan_dynamic/Makefile b/lib/libclang_rt/asan_dynamic/Makefile
index 8bd44e7be339..bc478815eb39 100644
--- a/lib/libclang_rt/asan_dynamic/Makefile
+++ b/lib/libclang_rt/asan_dynamic/Makefile
@@ -5,89 +5,86 @@
 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
+SRCS+=		asan/asan_activation.cc
+SRCS+=		asan/asan_allocator.cc
+SRCS+=		asan/asan_debugging.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_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
+SRCS+=		asan/asan_posix.cc
+SRCS+=		asan/asan_report.cc
+SRCS+=		asan/asan_rtl.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/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_mapping_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cc
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.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_linux_x86_64.S
+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),