1 files changed, 39 insertions, 17 deletions
diff --git a/lib/tsan/tests/CMakeLists.txt b/lib/tsan/tests/CMakeLists.txt
index 7cc079f3d27a..f73a89242859 100644
--- a/lib/tsan/tests/CMakeLists.txt
+++ b/lib/tsan/tests/CMakeLists.txt
@@ -3,22 +3,44 @@ include_directories(../rtl)
 add_custom_target(TsanUnitTests)
 set_target_properties(TsanUnitTests PROPERTIES
   FOLDER "TSan unittests")
-function(add_tsan_unittest testname)
-  # Build unit tests only on 64-bit Linux.
-  if(UNIX AND NOT APPLE
-      AND CAN_TARGET_x86_64
-      AND CMAKE_SIZEOF_VOID_P EQUAL 8
-      AND NOT LLVM_BUILD_32_BITS)
-    add_unittest(TsanUnitTests ${testname} ${ARGN})
-    # Link with TSan runtime.
-    target_link_libraries(${testname} clang_rt.tsan-x86_64)
-    # Compile tests with the same flags as TSan runtime.
-    set_target_compile_flags(${testname} ${TSAN_CFLAGS})
-    # Link tests with -pie.
-    set_property(TARGET ${testname} APPEND_STRING
-      PROPERTY LINK_FLAGS " -pie")
+
+set(TSAN_UNITTEST_CFLAGS
+  ${TSAN_CFLAGS}
+  ${COMPILER_RT_GTEST_INCLUDE_CFLAGS}
+  -I${COMPILER_RT_SOURCE_DIR}/lib
+  -I${COMPILER_RT_SOURCE_DIR}/lib/tsan/rtl
+  -DGTEST_HAS_RTTI=0)
+
+# tsan_compile(obj_list, source, arch, {headers})
+macro(tsan_compile obj_list source arch)
+  get_filename_component(basename ${source} NAME)
+  set(output_obj "${basename}.${arch}.o")
+  get_target_flags_for_arch(${arch} TARGET_CFLAGS)
+  clang_compile(${output_obj} ${source}
+          CFLAGS ${TSAN_UNITTEST_CFLAGS} ${TARGET_CFLAGS}
+          DEPS gtest ${TSAN_RUNTIME_LIBRARIES} ${ARGN})
+  list(APPEND ${obj_list} ${output_obj})
+endmacro()
+
+macro(add_tsan_unittest testname)
+  # Build unit tests only for 64-bit Linux.
+  if(UNIX AND NOT APPLE AND CAN_TARGET_x86_64)
+    parse_arguments(TEST "SOURCES;HEADERS" "" ${ARGN})
+    set(TEST_OBJECTS)
+    foreach(SOURCE ${TEST_SOURCES} ${COMPILER_RT_GTEST_SOURCE})
+      tsan_compile(TEST_OBJECTS ${SOURCE} x86_64 ${TEST_HEADERS})
+    endforeach()
+    get_target_flags_for_arch(${arch} TARGET_LINK_FLAGS)
+    add_compiler_rt_test(TsanUnitTests ${testname}
+            OBJECTS ${TEST_OBJECTS}
+            DEPS ${TSAN_RUNTIME_LIBRARIES} ${TEST_OBJECTS}
+            LINK_FLAGS ${TARGET_LINK_FLAGS}
+                       -fsanitize=thread
+                       -lstdc++ -lm)
   endif()
-endfunction()
+endmacro()
 
-add_subdirectory(rtl)
-add_subdirectory(unit)
+if(COMPILER_RT_CAN_EXECUTE_TESTS)
+  add_subdirectory(rtl)
+  add_subdirectory(unit)
+endif()