[compiler-rt] 0fefa6d - [NFC][sanitizer] Add a few missed RTSanitizerCommonSymbolizerInternal

[Vitaly Buka via llvm-commits]

Author: Vitaly Buka
Date: 2023-09-08T15:01:38-07:00
New Revision: 0fefa6d01bf78b9ec65236e0885337ca9dad4d9b

URL: https://github.com/llvm/llvm-project/commit/0fefa6d01bf78b9ec65236e0885337ca9dad4d9b
DIFF: https://github.com/llvm/llvm-project/commit/0fefa6d01bf78b9ec65236e0885337ca9dad4d9b.diff

LOG: [NFC][sanitizer] Add a few missed RTSanitizerCommonSymbolizerInternal

Reland edb211cb78317ad73aa4bd2d3df75194b7f23a72 and
5d7b75e2a5846f72f04a6fdb25a0df338f1825a1 without stats broken on OSX.

Added: 
    

Modified: 
    compiler-rt/lib/hwasan/CMakeLists.txt
    compiler-rt/lib/memprof/CMakeLists.txt
    compiler-rt/lib/ubsan/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/hwasan/CMakeLists.txt b/compiler-rt/lib/hwasan/CMakeLists.txt
index 1b5775d9435d7e0..e7b3f5e005f8e2e 100644
--- a/compiler-rt/lib/hwasan/CMakeLists.txt
+++ b/compiler-rt/lib/hwasan/CMakeLists.txt
@@ -164,6 +164,8 @@ function(add_hwasan_runtimes arch use_aliases)
                 RTSanitizerCommonLibc
                 RTSanitizerCommonCoverage
                 RTSanitizerCommonSymbolizer
+                # FIXME: disable tagging when in symbolizer.
+                # RTSanitizerCommonSymbolizerInternal
                 RTLSanCommon
                 RTUbsan
     CFLAGS ${hwasan_rtl_flags}
@@ -201,6 +203,8 @@ function(add_hwasan_runtimes arch use_aliases)
             RTSanitizerCommonLibc
             RTSanitizerCommonCoverage
             RTSanitizerCommonSymbolizer
+            # FIXME: disable tagging when in symbolizer.
+            # RTSanitizerCommonSymbolizerInternal
             RTLSanCommon
             RTUbsan
             RTUbsan_cxx

diff  --git a/compiler-rt/lib/memprof/CMakeLists.txt b/compiler-rt/lib/memprof/CMakeLists.txt
index 2459ce13ab743cb..3f55c2f5e075eed 100644
--- a/compiler-rt/lib/memprof/CMakeLists.txt
+++ b/compiler-rt/lib/memprof/CMakeLists.txt
@@ -127,7 +127,10 @@ set(MEMPROF_COMMON_RUNTIME_OBJECT_LIBS
   RTSanitizerCommon
   RTSanitizerCommonLibc
   RTSanitizerCommonCoverage
-  RTSanitizerCommonSymbolizer)
+  RTSanitizerCommonSymbolizer
+  # FIXME: hangs.
+  # RTSanitizerCommonSymbolizerInternal
+)
 
 add_compiler_rt_runtime(clang_rt.memprof
   STATIC

diff  --git a/compiler-rt/lib/ubsan/CMakeLists.txt b/compiler-rt/lib/ubsan/CMakeLists.txt
index 520a024fbedee59..93730561523a94c 100644
--- a/compiler-rt/lib/ubsan/CMakeLists.txt
+++ b/compiler-rt/lib/ubsan/CMakeLists.txt
@@ -71,6 +71,9 @@ append_list_if(COMPILER_RT_HAS_LIBDL dl UBSAN_DYNAMIC_LIBS)
 append_list_if(COMPILER_RT_HAS_LIBLOG log UBSAN_DYNAMIC_LIBS)
 append_list_if(COMPILER_RT_HAS_LIBRT rt UBSAN_DYNAMIC_LIBS)
 append_list_if(COMPILER_RT_HAS_LIBPTHREAD pthread UBSAN_DYNAMIC_LIBS)
+if (COMPILER_RT_ENABLE_INTERNAL_SYMBOLIZER)
+  append_list_if(COMPILER_RT_HAS_LIBM m UBSAN_DYNAMIC_LIBS)
+endif()
 
 add_compiler_rt_component(ubsan)
 
@@ -204,6 +207,8 @@ else()
               RTSanitizerCommonLibc
               RTSanitizerCommonCoverage
               RTSanitizerCommonSymbolizer
+              # FIXME: Some wrong with C++ demangling.
+              # RTSanitizerCommonSymbolizerInternal
               RTUbsan
               RTUbsan_standalone
               RTInterception
@@ -248,6 +253,8 @@ else()
                 RTSanitizerCommonLibc
                 RTSanitizerCommonCoverage
                 RTSanitizerCommonSymbolizer
+                # FIXME: Some wrong with C++ demangling.
+                # RTSanitizerCommonSymbolizerInternal
                 RTUbsan
                 RTUbsan_cxx
                 RTUbsan_standalone