From 45d28e3a303ac47efce4ce98b40d33112d4314d2 Mon Sep 17 00:00:00 2001 From: zijunzhao Date: Tue, 9 Nov 2021 16:36:06 +0000 Subject: [PATCH] Revert "add tsan shared lib" This reverts commit 92c9b340be4164f44772ddf5a50a4a5acdbd6607. --- compiler-rt/cmake/config-ix.cmake | 6 ------ compiler-rt/lib/tsan/CMakeLists.txt | 31 ++-------------------------- compiler-rt/test/tsan/CMakeLists.txt | 31 ---------------------------- 3 files changed, 2 insertions(+), 66 deletions(-) diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake index 5cae61213bf6..970239486fee 100644 --- a/compiler-rt/cmake/config-ix.cmake +++ b/compiler-rt/cmake/config-ix.cmake @@ -741,12 +741,6 @@ else() set(COMPILER_RT_HAS_TSAN FALSE) endif() -if (OS_NAME MATCHES "Linux|FreeBSD|Windows|NetBSD|SunOS") - set(COMPILER_RT_TSAN_HAS_STATIC_RUNTIME TRUE) -else() - set(COMPILER_RT_TSAN_HAS_STATIC_RUNTIME FALSE) -endif() - if (COMPILER_RT_HAS_SANITIZER_COMMON AND UBSAN_SUPPORTED_ARCH AND OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD|Windows|Android|Fuchsia|SunOS") set(COMPILER_RT_HAS_UBSAN TRUE) diff --git a/compiler-rt/lib/tsan/CMakeLists.txt b/compiler-rt/lib/tsan/CMakeLists.txt index c3284a5dc422..b58ce95267b5 100644 --- a/compiler-rt/lib/tsan/CMakeLists.txt +++ b/compiler-rt/lib/tsan/CMakeLists.txt @@ -24,15 +24,6 @@ append_list_if(SANITIZER_LIMIT_FRAME_SIZE -Wframe-larger-than=530 append_list_if(COMPILER_RT_HAS_WGLOBAL_CONSTRUCTORS_FLAG -Wglobal-constructors TSAN_RTL_CFLAGS) -set(TSAN_RTL_DYNAMIC_CFLAGS ${TSAN_RTL_CFLAGS}) -list(REMOVE_ITEM TSAN_RTL_DYNAMIC_CFLAGS -fPIE) - -set(TSAN_DYNAMIC_LINK_LIBS ${SANITIZER_CXX_ABI_LIBRARIES} ${SANITIZER_COMMON_LINK_LIBS}) - -append_list_if(COMPILER_RT_HAS_LIBDL dl TSAN_DYNAMIC_LINK_LIBS) -append_list_if(COMPILER_RT_HAS_LIBM m TSAN_DYNAMIC_LINK_LIBS) -append_list_if(COMPILER_RT_HAS_LIBPTHREAD pthread TSAN_DYNAMIC_LINK_LIBS) - set(TSAN_SOURCES rtl/tsan_clock.cpp rtl/tsan_debugging.cpp @@ -49,6 +40,7 @@ set(TSAN_SOURCES rtl/tsan_md5.cpp rtl/tsan_mman.cpp rtl/tsan_mutexset.cpp + rtl/tsan_preinit.cpp rtl/tsan_report.cpp rtl/tsan_rtl.cpp rtl/tsan_rtl_access.cpp @@ -67,10 +59,6 @@ set(TSAN_CXX_SOURCES rtl/tsan_new_delete.cpp ) -set(TSAN_PREINIT_SOURCES - rtl/tsan_preinit.cpp - ) - if(APPLE) list(APPEND TSAN_SOURCES rtl/tsan_interceptors_mac.cpp @@ -251,7 +239,7 @@ else() add_compiler_rt_runtime(clang_rt.tsan STATIC ARCHS ${arch} - SOURCES ${TSAN_SOURCES} ${TSAN_ASM_SOURCES} ${TSAN_PREINIT_SOURCES} + SOURCES ${TSAN_SOURCES} ${TSAN_ASM_SOURCES} $ $ $ @@ -271,21 +259,6 @@ else() PARENT_TARGET tsan) list(APPEND TSAN_RUNTIME_LIBRARIES clang_rt.tsan-${arch} clang_rt.tsan_cxx-${arch}) - add_compiler_rt_runtime(clang_rt.tsan - SHARED - ARCHS ${arch} - SOURCES ${TSAN_SOURCES} ${TSAN_ASM_SOURCES} - $ - $ - $ - $ - $ - $ - ADDITIONAL_HEADERS ${TSAN_HEADERS} - CFLAGS ${TSAN_RTL_DYNAMIC_CFLAGS} - LINK_LIBS ${TSAN_DYNAMIC_LINK_LIBS} - LINK_FLAGS ${SANITIZER_COMMON_LINK_FLAGS} - PARENT_TARGET tsan) add_sanitizer_rt_symbols(clang_rt.tsan ARCHS ${arch} EXTRA rtl/tsan.syms.extra) diff --git a/compiler-rt/test/tsan/CMakeLists.txt b/compiler-rt/test/tsan/CMakeLists.txt index 1b267ae472ea..318a91f73ef7 100644 --- a/compiler-rt/test/tsan/CMakeLists.txt +++ b/compiler-rt/test/tsan/CMakeLists.txt @@ -17,9 +17,7 @@ else() set(TSAN_HAS_LIBCXX False) endif() -set(TSAN_DYNAMIC_TEST_DEPS ${TSAN_TEST_DEPS}) set(TSAN_TESTSUITES) -set(TSAN_DYNAMIC_TESTSUITES) if (NOT DEFINED TSAN_TEST_DEFLAKE_THRESHOLD) set(TSAN_TEST_DEFLAKE_THRESHOLD "10") @@ -51,19 +49,6 @@ foreach(arch ${TSAN_TEST_ARCH}) ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py ) list(APPEND TSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) - - if(COMPILER_RT_TSAN_HAS_STATIC_RUNTIME) - string(TOLOWER "-${arch}-${OS_NAME}-dynamic" TSAN_TEST_CONFIG_SUFFIX) - set(CONFIG_NAME ${ARCH_UPPER_CASE}${OS_NAME}DynamicConfig) - configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg.py - MAIN_CONFIG - ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py - ) - list(APPEND TSAN_DYNAMIC_TESTSUITES - ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) - endif() endforeach() # iOS and iOS simulator test suites @@ -113,27 +98,11 @@ if(COMPILER_RT_INCLUDE_TESTS) configure_lit_site_cfg( ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg.py) - if(COMPILER_RT_TSAN_HAS_STATIC_RUNTIME) - configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in - ${CMAKE_CURRENT_BINARY_DIR}/Unit/dynamic/lit.site.cfg.py) - endif() list(APPEND TSAN_TEST_DEPS TsanUnitTests) list(APPEND TSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Unit) - if(COMPILER_RT_TSAN_HAS_STATIC_RUNTIME) - list(APPEND TSAN_DYNAMIC_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Unit/dynamic) - endif() endif() add_lit_testsuite(check-tsan "Running ThreadSanitizer tests" ${TSAN_TESTSUITES} DEPENDS ${TSAN_TEST_DEPS}) set_target_properties(check-tsan PROPERTIES FOLDER "Compiler-RT Tests") - -if(COMPILER_RT_TSAN_HAS_STATIC_RUNTIME) - add_lit_testsuite(check-tsan-dynamic "Running the ThreadSanitizer tests with dynamic runtime" - ${TSAN_DYNAMIC_TESTSUITES} - EXCLUDE_FROM_CHECK_ALL - DEPENDS ${TSAN_DYNAMIC_TEST_DEPS}) - set_target_properties(check-tsan-dynamic PROPERTIES FOLDER "Compiler-RT Misc") -endif()