[compiler-rt] 74496b0 - [asan][hwasan] Link RTUbsan_cxx into shared runtime

[Vitaly Buka via llvm-commits]

Author: Vitaly Buka
Date: 2024-12-24T23:37:59-08:00
New Revision: 74496b03f7db43caae4c3bda79379623a4657a00

URL: https://github.com/llvm/llvm-project/commit/74496b03f7db43caae4c3bda79379623a4657a00
DIFF: https://github.com/llvm/llvm-project/commit/74496b03f7db43caae4c3bda79379623a4657a00.diff

LOG: [asan][hwasan] Link RTUbsan_cxx into shared runtime

There is no shared version RTUbsan_cxx.
Fix android after #121006.

Added: 
    

Modified: 
    compiler-rt/lib/asan/CMakeLists.txt
    compiler-rt/lib/hwasan/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/asan/CMakeLists.txt b/compiler-rt/lib/asan/CMakeLists.txt
index a2c15806f81a28..e2f39f224df9c2 100644
--- a/compiler-rt/lib/asan/CMakeLists.txt
+++ b/compiler-rt/lib/asan/CMakeLists.txt
@@ -318,6 +318,7 @@ else()
               # add_dependencies(clang_rt.asan-dynamic-${arch} clang_rt.asan-dynamic-${arch}-version-list)
               # generates an order-only dependency in ninja.
               RTAsan_dynamic_version_script_dummy
+              RTUbsan_cxx
               ${ASAN_DYNAMIC_WEAK_INTERCEPTION}
       CFLAGS ${ASAN_DYNAMIC_CFLAGS}
       LINK_FLAGS ${ASAN_DYNAMIC_LINK_FLAGS}

diff  --git a/compiler-rt/lib/hwasan/CMakeLists.txt b/compiler-rt/lib/hwasan/CMakeLists.txt
index 4372603b45a486..207394130d0359 100644
--- a/compiler-rt/lib/hwasan/CMakeLists.txt
+++ b/compiler-rt/lib/hwasan/CMakeLists.txt
@@ -219,6 +219,7 @@ function(add_hwasan_runtimes arch use_aliases)
             RTSanitizerCommonSymbolizerInternal
             RTLSanCommon
             RTUbsan
+            RTUbsan_cxx
             # The only purpose of RTHWAsan_dynamic_version_script_dummy is to
             # carry a dependency of the shared runtime on the version script.
             # Replacing it with a straightforward