7 files changed, 14 insertions, 0 deletions

diff --git a/lib/libclang_rt/asan/Makefile b/lib/libclang_rt/asan/Makefile
index 6a7d22b7bde99..3984cfd6f19a5 100644
--- a/lib/libclang_rt/asan/Makefile
+++ b/lib/libclang_rt/asan/Makefile
@@ -48,6 +48,7 @@ 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
@@ -68,6 +69,7 @@ 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
diff --git a/lib/libclang_rt/asan_dynamic/Makefile b/lib/libclang_rt/asan_dynamic/Makefile
index d4fcbee346db0..d1579d7417ada 100644
--- a/lib/libclang_rt/asan_dynamic/Makefile
+++ b/lib/libclang_rt/asan_dynamic/Makefile
@@ -51,6 +51,7 @@ 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
@@ -71,6 +72,7 @@ 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
diff --git a/lib/libclang_rt/msan/Makefile b/lib/libclang_rt/msan/Makefile
index 1ea0689c58f28..1130684149feb 100644
--- a/lib/libclang_rt/msan/Makefile
+++ b/lib/libclang_rt/msan/Makefile
@@ -32,6 +32,7 @@ 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
@@ -52,6 +53,7 @@ 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
diff --git a/lib/libclang_rt/safestack/Makefile b/lib/libclang_rt/safestack/Makefile
index 8f49840003423..54ef485352f2a 100644
--- a/lib/libclang_rt/safestack/Makefile
+++ b/lib/libclang_rt/safestack/Makefile
@@ -20,6 +20,7 @@ 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
diff --git a/lib/libclang_rt/stats/Makefile b/lib/libclang_rt/stats/Makefile
index 93b6c1f7c9875..1540df19c7260 100644
--- a/lib/libclang_rt/stats/Makefile
+++ b/lib/libclang_rt/stats/Makefile
@@ -20,6 +20,7 @@ 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
@@ -40,6 +41,7 @@ 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
 
diff --git a/lib/libclang_rt/tsan/Makefile b/lib/libclang_rt/tsan/Makefile
index 3f73c2c7946e9..259be95d303dc 100644
--- a/lib/libclang_rt/tsan/Makefile
+++ b/lib/libclang_rt/tsan/Makefile
@@ -24,6 +24,7 @@ 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
@@ -44,6 +45,7 @@ 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
diff --git a/lib/libclang_rt/ubsan_standalone/Makefile b/lib/libclang_rt/ubsan_standalone/Makefile
index c343066934658..936d4777a221f 100644
--- a/lib/libclang_rt/ubsan_standalone/Makefile
+++ b/lib/libclang_rt/ubsan_standalone/Makefile
@@ -24,6 +24,7 @@ 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
@@ -44,6 +45,8 @@ 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