Skip to content

Commit cb0a183

Browse files
vitalybukavitalybuka
committed
[NFC][sanitizer] Add and use empty RTSanitizerCommonSymbolizerInternal
Follow patches will add implementation. For llvm/llvm-project#30098 Reviewed By: Enna1, phosek Differential Revision: https://reviews.llvm.org/D157921
1 parent ac00cca commit cb0a183

File tree

9 files changed

+22
-4
lines changed

9 files changed

+22
-4
lines changed

‎compiler-rt/lib/asan/tests/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS AND NOT ANDROID)
274274
$<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
275275
$<TARGET_OBJECTS:RTSanitizerCommonCoverage.${arch}>
276276
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizer.${arch}>
277+
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizerInternal.${arch}>
277278
$<TARGET_OBJECTS:RTLSanCommon.${arch}>
278279
$<TARGET_OBJECTS:RTUbsan.${arch}>
279280
$<TARGET_OBJECTS:RTUbsan_cxx.${arch}>)
@@ -300,6 +301,7 @@ if(ANDROID)
300301
$<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
301302
$<TARGET_OBJECTS:RTSanitizerCommonCoverage.${arch}>
302303
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizer.${arch}>
304+
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizerInternal.${arch}>
303305
$<TARGET_OBJECTS:RTLSanCommon.${arch}>
304306
$<TARGET_OBJECTS:RTUbsan.${arch}>
305307
$<TARGET_OBJECTS:RTUbsan_cxx.${arch}>

‎compiler-rt/lib/dfsan/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ foreach(arch ${DFSAN_SUPPORTED_ARCH})
4343
$<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
4444
$<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
4545
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizer.${arch}>
46+
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizerInternal.${arch}>
4647
ADDITIONAL_HEADERS ${DFSAN_RTL_HEADERS}
4748
CFLAGS ${DFSAN_CFLAGS}
4849
PARENT_TARGET dfsan)

‎compiler-rt/lib/gwp_asan/tests/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH IN_LIST GWP_ASAN_SUPPORTED_ARCH)
5959
$<TARGET_OBJECTS:RTGwpAsanOptionsParser.${arch}>
6060
$<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
6161
$<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
62-
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizer.${arch}>)
62+
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizer.${arch}>
63+
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizerInternal.${arch}>)
6364

6465
add_library(${GWP_ASAN_TEST_RUNTIME} STATIC
6566
${GWP_ASAN_TEST_RUNTIME_OBJECTS})

‎compiler-rt/lib/lsan/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ if(COMPILER_RT_HAS_LSAN)
7878
$<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
7979
$<TARGET_OBJECTS:RTSanitizerCommonCoverage.${arch}>
8080
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizer.${arch}>
81+
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizerInternal.${arch}>
8182
$<TARGET_OBJECTS:RTLSanCommon.${arch}>
8283
ADDITIONAL_HEADERS ${LSAN_HEADERS}
8384
CFLAGS ${LSAN_CFLAGS}

‎compiler-rt/lib/memprof/tests/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH IN_LIST MEMPROF_SUPPORTED_ARCH)
5858
$<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
5959
$<TARGET_OBJECTS:RTSanitizerCommonCoverage.${arch}>
6060
$<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
61-
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizer.${arch}>)
61+
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizer.${arch}>
62+
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizerInternal.${arch}>)
6263
set_target_compile_flags(MemProfUnitTests ${MEMPROF_UNITTEST_CFLAGS})
6364
set_target_link_flags(MemProfUnitTests ${MEMPROF_UNITTEST_LINK_FLAGS})
6465
target_link_libraries(MemProfUnitTests ${MEMPROF_UNITTEST_LINK_LIBRARIES})

‎compiler-rt/lib/msan/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ foreach(arch ${MSAN_SUPPORTED_ARCH})
5757
$<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
5858
$<TARGET_OBJECTS:RTSanitizerCommonCoverage.${arch}>
5959
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizer.${arch}>
60+
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizerInternal.${arch}>
6061
$<TARGET_OBJECTS:RTUbsan.${arch}>
6162
ADDITIONAL_HEADERS ${MSAN_RTL_HEADERS}
6263
CFLAGS ${MSAN_RTL_CFLAGS}

‎compiler-rt/lib/sanitizer_common/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,3 +355,10 @@ endif()
355355
if(COMPILER_RT_INCLUDE_TESTS)
356356
add_subdirectory(tests)
357357
endif()
358+
359+
360+
foreach(arch ${SANITIZER_COMMON_SUPPORTED_ARCH})
361+
# Library implementing InternalSymbolizer. Empty by default.
362+
add_library(RTSanitizerCommonSymbolizerInternal.${arch}
363+
OBJECT IMPORTED GLOBAL)
364+
endforeach()

‎compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,8 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS AND NOT ANDROID)
220220
add_sanitizer_common_lib("RTSanitizerCommon.test.${arch}"
221221
$<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
222222
$<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
223-
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizer.${arch}>)
223+
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizer.${arch}>
224+
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizerInternal.${arch}>)
224225
endforeach()
225226
endif()
226227
foreach(arch ${SANITIZER_UNITTEST_SUPPORTED_ARCH})
@@ -236,7 +237,8 @@ if(ANDROID)
236237
${COMPILER_RT_GMOCK_SOURCE}
237238
$<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
238239
$<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
239-
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizer.${arch}>)
240+
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizer.${arch}>
241+
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizerInternal.${arch}>)
240242
set_target_compile_flags(SanitizerTest ${SANITIZER_TEST_CFLAGS_COMMON})
241243
# Setup correct output directory and link flags.
242244
set_target_properties(SanitizerTest PROPERTIES

‎compiler-rt/lib/tsan/rtl/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ else()
246246
$<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
247247
$<TARGET_OBJECTS:RTSanitizerCommonCoverage.${arch}>
248248
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizer.${arch}>
249+
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizerInternal.${arch}>
249250
$<TARGET_OBJECTS:RTUbsan.${arch}>
250251
ADDITIONAL_HEADERS ${TSAN_HEADERS}
251252
CFLAGS ${TSAN_RTL_CFLAGS}
@@ -269,6 +270,7 @@ else()
269270
$<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
270271
$<TARGET_OBJECTS:RTSanitizerCommonCoverage.${arch}>
271272
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizer.${arch}>
273+
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizerInternal.${arch}>
272274
$<TARGET_OBJECTS:RTUbsan.${arch}>
273275
ADDITIONAL_HEADERS ${TSAN_HEADERS}
274276
CFLAGS ${TSAN_RTL_DYNAMIC_CFLAGS}

0 commit comments

Comments
 (0)