Merge llvm-project main llvmorg-18-init-15088-gd14ee76181fb

This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvm-project main llvmorg-18-init-15088-gd14ee76181fb.

PR:		276104
MFC after:	1 month

11 files changed, 88 insertions, 10 deletions

diff --git a/lib/libclang_rt/asan/Makefile b/lib/libclang_rt/asan/Makefile
index 6156371241da..630b2d4ea065 100644
--- a/lib/libclang_rt/asan/Makefile
+++ b/lib/libclang_rt/asan/Makefile
@@ -27,6 +27,7 @@ SRCS+=		asan/asan_stats.cpp
 SRCS+=		asan/asan_suppressions.cpp
 SRCS+=		asan/asan_thread.cpp
 SRCS+=		interception/interception_linux.cpp
+SRCS+=		lsan/lsan_common.cpp
 SRCS+=		sanitizer_common/sancov_flags.cpp
 SRCS+=		sanitizer_common/sanitizer_allocator.cpp
 SRCS+=		sanitizer_common/sanitizer_allocator_checks.cpp
@@ -36,7 +37,7 @@ SRCS+=		sanitizer_common/sanitizer_common.cpp
 SRCS+=		sanitizer_common/sanitizer_common_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cpp
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cpp
-SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cpp
+SRCS+=		sanitizer_common/sanitizer_dl.cpp
 SRCS+=		sanitizer_common/sanitizer_errno.cpp
 SRCS+=		sanitizer_common/sanitizer_file.cpp
 SRCS+=		sanitizer_common/sanitizer_flag_parser.cpp
@@ -52,6 +53,7 @@ SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_printf.cpp
 SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cpp
 SRCS+=		sanitizer_common/sanitizer_procmaps_common.cpp
+SRCS+=		sanitizer_common/sanitizer_range.cpp
 SRCS+=		sanitizer_common/sanitizer_stack_store.cpp
 SRCS+=		sanitizer_common/sanitizer_stackdepot.cpp
 SRCS+=		sanitizer_common/sanitizer_stacktrace.cpp
@@ -61,6 +63,7 @@ SRCS+=		sanitizer_common/sanitizer_suppressions.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_markup.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_report.cpp
 SRCS+=		sanitizer_common/sanitizer_termination.cpp
diff --git a/lib/libclang_rt/asan/warn.txt b/lib/libclang_rt/asan/warn.txt
new file mode 100644
index 000000000000..3d3fe896efa9
--- /dev/null
+++ b/lib/libclang_rt/asan/warn.txt
@@ -0,0 +1,60 @@
+--- sanitizer_common/sanitizer_symbolizer_markup.o ---
+/share/dim/src/freebsd/llvm-18-update/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp:31:32: warning: format specifies type 'void *' but the argument has type 'uptr' (aka 'unsigned long') [-Wformat]
+   31 |   buffer->AppendF(kFormatData, DI->start);
+      |                   ~~~~~~~~~~~  ^~~~~~~~~
+/share/dim/src/freebsd/llvm-18-update/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h:33:46: note: format string is defined here
+   33 | constexpr const char *kFormatData = "{{{data:%p}}}";
+      |                                              ^~
+      |                                              %lu
+/share/dim/src/freebsd/llvm-18-update/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp:46:43: warning: format specifies type 'void *' but the argument has type 'uptr' (aka 'unsigned long') [-Wformat]
+   46 |   buffer->AppendF(kFormatFrame, frame_no, address);
+      |                   ~~~~~~~~~~~~            ^~~~~~~
+/share/dim/src/freebsd/llvm-18-update/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h:36:48: note: format string is defined here
+   36 | constexpr const char *kFormatFrame = "{{{bt:%u:%p}}}";
+      |                                                ^~
+      |                                                %lu
+/share/dim/src/freebsd/llvm-18-update/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp:51:62: warning: format specifies type 'void *' but the argument has type 'uptr' (aka 'unsigned long') [-Wformat]
+   51 |   internal_snprintf(buffer, sizeof(buffer), kFormatFunction, addr);
+      |                                             ~~~~~~~~~~~~~~~  ^~~~
+/share/dim/src/freebsd/llvm-18-update/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h:29:48: note: format string is defined here
+   29 | constexpr const char *kFormatFunction = "{{{pc:%p}}}";
+      |                                                ^~
+      |                                                %lu
+/share/dim/src/freebsd/llvm-18-update/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp:99:34: warning: format specifies type 'int' but the argument has type 'uptr' (aka 'unsigned long') [-Wformat]
+   99 |   buffer->AppendF(kFormatModule, moduleId, module.full_name(),
+      |                   ~~~~~~~~~~~~~  ^~~~~~~~
+/share/dim/src/freebsd/llvm-18-update/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h:39:50: note: format string is defined here
+   39 | constexpr const char *kFormatModule = "{{{module:%d:%s:elf:%s}}}";
+      |                                                  ^~
+      |                                                  %lu
+/share/dim/src/freebsd/llvm-18-update/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp:121:34: warning: format specifies type 'void *' but the argument has type 'uptr' (aka 'unsigned long') [-Wformat]
+  121 |     buffer->AppendF(kFormatMmap, range.beg, range.end - range.beg, moduleId,
+      |                     ~~~~~~~~~~~  ^~~~~~~~~
+/share/dim/src/freebsd/llvm-18-update/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h:42:46: note: format string is defined here
+   42 | constexpr const char *kFormatMmap = "{{{mmap:%p:0x%x:load:%d:%s:0x%x}}}";
+      |                                              ^~
+      |                                              %lu
+/share/dim/src/freebsd/llvm-18-update/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp:121:45: warning: format specifies type 'unsigned int' but the argument has type 'uptr' (aka 'unsigned long') [-Wformat]
+  121 |     buffer->AppendF(kFormatMmap, range.beg, range.end - range.beg, moduleId,
+      |                     ~~~~~~~~~~~             ^~~~~~~~~~~~~~~~~~~~~
+/share/dim/src/freebsd/llvm-18-update/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h:42:51: note: format string is defined here
+   42 | constexpr const char *kFormatMmap = "{{{mmap:%p:0x%x:load:%d:%s:0x%x}}}";
+      |                                                   ^~
+      |                                                   %lx
+/share/dim/src/freebsd/llvm-18-update/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp:121:68: warning: format specifies type 'int' but the argument has type 'uptr' (aka 'unsigned long') [-Wformat]
+  121 |     buffer->AppendF(kFormatMmap, range.beg, range.end - range.beg, moduleId,
+      |                     ~~~~~~~~~~~                                    ^~~~~~~~
+/share/dim/src/freebsd/llvm-18-update/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h:42:59: note: format string is defined here
+   42 | constexpr const char *kFormatMmap = "{{{mmap:%p:0x%x:load:%d:%s:0x%x}}}";
+      |                                                           ^~
+      |                                                           %lu
+/share/dim/src/freebsd/llvm-18-update/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup.cpp:122:42: warning: format specifies type 'unsigned int' but the argument has type 'uptr' (aka 'unsigned long') [-Wformat]
+  121 |     buffer->AppendF(kFormatMmap, range.beg, range.end - range.beg, moduleId,
+      |                     ~~~~~~~~~~~
+  122 |                     accessBuffer.data(), range.beg - module.base_address());
+      |                                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+/share/dim/src/freebsd/llvm-18-update/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_markup_constants.h:42:67: note: format string is defined here
+   42 | constexpr const char *kFormatMmap = "{{{mmap:%p:0x%x:load:%d:%s:0x%x}}}";
+      |                                                                   ^~
+      |                                                                   %lx
+8 warnings generated.
diff --git a/lib/libclang_rt/asan_dynamic/Makefile b/lib/libclang_rt/asan_dynamic/Makefile
index 1ba9840946b6..ed70c7c3dc34 100644
--- a/lib/libclang_rt/asan_dynamic/Makefile
+++ b/lib/libclang_rt/asan_dynamic/Makefile
@@ -30,6 +30,7 @@ SRCS+=		asan/asan_stats.cpp
 SRCS+=		asan/asan_suppressions.cpp
 SRCS+=		asan/asan_thread.cpp
 SRCS+=		interception/interception_linux.cpp
+SRCS+=		lsan/lsan_common.cpp
 SRCS+=		sanitizer_common/sancov_flags.cpp
 SRCS+=		sanitizer_common/sanitizer_allocator.cpp
 SRCS+=		sanitizer_common/sanitizer_allocator_checks.cpp
@@ -39,7 +40,7 @@ SRCS+=		sanitizer_common/sanitizer_common.cpp
 SRCS+=		sanitizer_common/sanitizer_common_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cpp
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cpp
-SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cpp
+SRCS+=		sanitizer_common/sanitizer_dl.cpp
 SRCS+=		sanitizer_common/sanitizer_errno.cpp
 SRCS+=		sanitizer_common/sanitizer_file.cpp
 SRCS+=		sanitizer_common/sanitizer_flag_parser.cpp
@@ -55,6 +56,7 @@ SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_printf.cpp
 SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cpp
 SRCS+=		sanitizer_common/sanitizer_procmaps_common.cpp
+SRCS+=		sanitizer_common/sanitizer_range.cpp
 SRCS+=		sanitizer_common/sanitizer_stack_store.cpp
 SRCS+=		sanitizer_common/sanitizer_stackdepot.cpp
 SRCS+=		sanitizer_common/sanitizer_stacktrace.cpp
@@ -64,6 +66,7 @@ SRCS+=		sanitizer_common/sanitizer_suppressions.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_markup.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_report.cpp
 SRCS+=		sanitizer_common/sanitizer_termination.cpp
diff --git a/lib/libclang_rt/cfi/Makefile b/lib/libclang_rt/cfi/Makefile
index 604c3cd9a593..5fdbb9fd6cc3 100644
--- a/lib/libclang_rt/cfi/Makefile
+++ b/lib/libclang_rt/cfi/Makefile
@@ -10,7 +10,7 @@ SRCS+=		sanitizer_common/sanitizer_allocator_checks.cpp
 SRCS+=		sanitizer_common/sanitizer_common.cpp
 SRCS+=		sanitizer_common/sanitizer_common_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cpp
-SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cpp
+SRCS+=		sanitizer_common/sanitizer_dl.cpp
 SRCS+=		sanitizer_common/sanitizer_errno.cpp
 SRCS+=		sanitizer_common/sanitizer_file.cpp
 SRCS+=		sanitizer_common/sanitizer_flag_parser.cpp
@@ -26,6 +26,7 @@ SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_printf.cpp
 SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cpp
 SRCS+=		sanitizer_common/sanitizer_procmaps_common.cpp
+SRCS+=		sanitizer_common/sanitizer_range.cpp
 SRCS+=		sanitizer_common/sanitizer_suppressions.cpp
 SRCS+=		sanitizer_common/sanitizer_termination.cpp
 SRCS+=		sanitizer_common/sanitizer_thread_arg_retval.cpp
diff --git a/lib/libclang_rt/cfi_diag/Makefile b/lib/libclang_rt/cfi_diag/Makefile
index 4f4bb9472bb7..66a5d2c88e8d 100644
--- a/lib/libclang_rt/cfi_diag/Makefile
+++ b/lib/libclang_rt/cfi_diag/Makefile
@@ -14,7 +14,7 @@ SRCS+=		sanitizer_common/sanitizer_common.cpp
 SRCS+=		sanitizer_common/sanitizer_common_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cpp
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cpp
-SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cpp
+SRCS+=		sanitizer_common/sanitizer_dl.cpp
 SRCS+=		sanitizer_common/sanitizer_errno.cpp
 SRCS+=		sanitizer_common/sanitizer_file.cpp
 SRCS+=		sanitizer_common/sanitizer_flag_parser.cpp
@@ -30,6 +30,7 @@ SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_printf.cpp
 SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cpp
 SRCS+=		sanitizer_common/sanitizer_procmaps_common.cpp
+SRCS+=		sanitizer_common/sanitizer_range.cpp
 SRCS+=		sanitizer_common/sanitizer_stack_store.cpp
 SRCS+=		sanitizer_common/sanitizer_stackdepot.cpp
 SRCS+=		sanitizer_common/sanitizer_stacktrace.cpp
@@ -39,6 +40,7 @@ SRCS+=		sanitizer_common/sanitizer_suppressions.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_markup.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_report.cpp
 SRCS+=		sanitizer_common/sanitizer_termination.cpp
diff --git a/lib/libclang_rt/compiler-rt-vars.mk b/lib/libclang_rt/compiler-rt-vars.mk
index 2af64e8568af..5a9f115697d9 100644
--- a/lib/libclang_rt/compiler-rt-vars.mk
+++ b/lib/libclang_rt/compiler-rt-vars.mk
@@ -1,4 +1,4 @@
-CLANG_SUBDIR=clang/17
+CLANG_SUBDIR=clang/18
 CLANGDIR=	/usr/lib/${CLANG_SUBDIR}
 SANITIZER_LIBDIR=		${CLANGDIR}/lib/freebsd
 SANITIZER_SHAREDIR=		${CLANGDIR}/share
diff --git a/lib/libclang_rt/dd/Makefile b/lib/libclang_rt/dd/Makefile
index 80ed7e497797..558d7cfb6982 100644
--- a/lib/libclang_rt/dd/Makefile
+++ b/lib/libclang_rt/dd/Makefile
@@ -9,7 +9,7 @@ SRCS+=		sanitizer_common/sanitizer_allocator_checks.cpp
 SRCS+=		sanitizer_common/sanitizer_common.cpp
 SRCS+=		sanitizer_common/sanitizer_common_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cpp
-SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cpp
+SRCS+=		sanitizer_common/sanitizer_dl.cpp
 SRCS+=		sanitizer_common/sanitizer_errno.cpp
 SRCS+=		sanitizer_common/sanitizer_file.cpp
 SRCS+=		sanitizer_common/sanitizer_flag_parser.cpp
@@ -25,6 +25,7 @@ SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_printf.cpp
 SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cpp
 SRCS+=		sanitizer_common/sanitizer_procmaps_common.cpp
+SRCS+=		sanitizer_common/sanitizer_range.cpp
 SRCS+=		sanitizer_common/sanitizer_suppressions.cpp
 SRCS+=		sanitizer_common/sanitizer_termination.cpp
 SRCS+=		sanitizer_common/sanitizer_thread_arg_retval.cpp
diff --git a/lib/libclang_rt/msan/Makefile b/lib/libclang_rt/msan/Makefile
index 474b08a640a7..18afe7e474f1 100644
--- a/lib/libclang_rt/msan/Makefile
+++ b/lib/libclang_rt/msan/Makefile
@@ -22,7 +22,7 @@ SRCS+=		sanitizer_common/sanitizer_common.cpp
 SRCS+=		sanitizer_common/sanitizer_common_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cpp
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cpp
-SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cpp
+SRCS+=		sanitizer_common/sanitizer_dl.cpp
 SRCS+=		sanitizer_common/sanitizer_errno.cpp
 SRCS+=		sanitizer_common/sanitizer_file.cpp
 SRCS+=		sanitizer_common/sanitizer_flag_parser.cpp
@@ -38,6 +38,7 @@ SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_printf.cpp
 SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cpp
 SRCS+=		sanitizer_common/sanitizer_procmaps_common.cpp
+SRCS+=		sanitizer_common/sanitizer_range.cpp
 SRCS+=		sanitizer_common/sanitizer_stack_store.cpp
 SRCS+=		sanitizer_common/sanitizer_stackdepot.cpp
 SRCS+=		sanitizer_common/sanitizer_stacktrace.cpp
@@ -47,6 +48,7 @@ SRCS+=		sanitizer_common/sanitizer_suppressions.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_markup.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_report.cpp
 SRCS+=		sanitizer_common/sanitizer_termination.cpp
diff --git a/lib/libclang_rt/stats/Makefile b/lib/libclang_rt/stats/Makefile
index 2fd929575123..63ed5eb22c5f 100644
--- a/lib/libclang_rt/stats/Makefile
+++ b/lib/libclang_rt/stats/Makefile
@@ -10,7 +10,7 @@ SRCS+=		sanitizer_common/sanitizer_chained_origin_depot.cpp
 SRCS+=		sanitizer_common/sanitizer_common.cpp
 SRCS+=		sanitizer_common/sanitizer_common_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cpp
-SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cpp
+SRCS+=		sanitizer_common/sanitizer_dl.cpp
 SRCS+=		sanitizer_common/sanitizer_errno.cpp
 SRCS+=		sanitizer_common/sanitizer_file.cpp
 SRCS+=		sanitizer_common/sanitizer_flag_parser.cpp
@@ -26,6 +26,7 @@ SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_printf.cpp
 SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cpp
 SRCS+=		sanitizer_common/sanitizer_procmaps_common.cpp
+SRCS+=		sanitizer_common/sanitizer_range.cpp
 SRCS+=		sanitizer_common/sanitizer_stack_store.cpp
 SRCS+=		sanitizer_common/sanitizer_stackdepot.cpp
 SRCS+=		sanitizer_common/sanitizer_stacktrace.cpp
@@ -35,6 +36,7 @@ SRCS+=		sanitizer_common/sanitizer_suppressions.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_markup.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_report.cpp
 SRCS+=		sanitizer_common/sanitizer_termination.cpp
diff --git a/lib/libclang_rt/tsan/Makefile b/lib/libclang_rt/tsan/Makefile
index f3f5bd41668c..906156a48204 100644
--- a/lib/libclang_rt/tsan/Makefile
+++ b/lib/libclang_rt/tsan/Makefile
@@ -13,7 +13,7 @@ SRCS+=		sanitizer_common/sanitizer_common.cpp
 SRCS+=		sanitizer_common/sanitizer_common_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cpp
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cpp
-SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cpp
+SRCS+=		sanitizer_common/sanitizer_dl.cpp
 SRCS+=		sanitizer_common/sanitizer_errno.cpp
 SRCS+=		sanitizer_common/sanitizer_file.cpp
 SRCS+=		sanitizer_common/sanitizer_flag_parser.cpp
@@ -29,6 +29,7 @@ SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_printf.cpp
 SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cpp
 SRCS+=		sanitizer_common/sanitizer_procmaps_common.cpp
+SRCS+=		sanitizer_common/sanitizer_range.cpp
 SRCS+=		sanitizer_common/sanitizer_stack_store.cpp
 SRCS+=		sanitizer_common/sanitizer_stackdepot.cpp
 SRCS+=		sanitizer_common/sanitizer_stacktrace.cpp
@@ -38,6 +39,7 @@ SRCS+=		sanitizer_common/sanitizer_suppressions.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_markup.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_report.cpp
 SRCS+=		sanitizer_common/sanitizer_termination.cpp
diff --git a/lib/libclang_rt/ubsan_standalone/Makefile b/lib/libclang_rt/ubsan_standalone/Makefile
index 95d1c0405e2d..6b4964715b5a 100644
--- a/lib/libclang_rt/ubsan_standalone/Makefile
+++ b/lib/libclang_rt/ubsan_standalone/Makefile
@@ -13,7 +13,7 @@ SRCS+=		sanitizer_common/sanitizer_common.cpp
 SRCS+=		sanitizer_common/sanitizer_common_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cpp
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cpp
-SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cpp
+SRCS+=		sanitizer_common/sanitizer_dl.cpp
 SRCS+=		sanitizer_common/sanitizer_errno.cpp
 SRCS+=		sanitizer_common/sanitizer_file.cpp
 SRCS+=		sanitizer_common/sanitizer_flag_parser.cpp
@@ -29,6 +29,7 @@ SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_printf.cpp
 SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cpp
 SRCS+=		sanitizer_common/sanitizer_procmaps_common.cpp
+SRCS+=		sanitizer_common/sanitizer_range.cpp
 SRCS+=		sanitizer_common/sanitizer_stack_store.cpp
 SRCS+=		sanitizer_common/sanitizer_stackdepot.cpp
 SRCS+=		sanitizer_common/sanitizer_stacktrace.cpp
@@ -38,6 +39,7 @@ SRCS+=		sanitizer_common/sanitizer_suppressions.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_libcdep.cpp
+SRCS+=		sanitizer_common/sanitizer_symbolizer_markup.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_symbolizer_report.cpp
 SRCS+=		sanitizer_common/sanitizer_termination.cpp