From 75fc508ec743709a99c161539cb037244e2f8a8f Mon Sep 17 00:00:00 2001
From: Alexey Samsonov <vonosmas@gmail.com>
Date: Thu, 5 Jun 2014 00:58:28 +0000
Subject: [PATCH] [Deadlock detector] Fix CMake build rules for shared runtime

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@210232 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/tsan/dd/CMakeLists.txt | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/lib/tsan/dd/CMakeLists.txt b/lib/tsan/dd/CMakeLists.txt
index a21e2dd57..932872155 100644
--- a/lib/tsan/dd/CMakeLists.txt
+++ b/lib/tsan/dd/CMakeLists.txt
@@ -34,18 +34,15 @@ if(CAN_TARGET_x86_64 AND UNIX AND NOT APPLE AND NOT ANDROID)
     CFLAGS ${DD_CFLAGS}
     DEFS ${DD_COMMON_DEFINITIONS})
 
-  add_library(RTDD OBJECT ${DD_SOURCES})
-  set_target_compile_flags(RTDD ${DD_CFLAGS})
-  set_property(TARGET RTDD APPEND PROPERTY
-    COMPILE_DEFINITIONS ${DD_COMMON_DEFINITIONS})
-  set_property(TARGET RTDD APPEND PROPERTY
-    COMPILE_DEFINITIONS ${DD_DYNAMIC_DEFINITIONS})
-
-  add_library(clang_rt.dyndd-${arch} SHARED
-    $<TARGET_OBJECTS:RTDD>
-    $<TARGET_OBJECTS:RTInterception.${arch}>
-    $<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
-    $<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>)
+  add_compiler_rt_object_library(RTDD ${arch}
+    SOURCES ${DD_SOURCES} CFLAGS ${DD_CFLAGS}
+    DEFS ${DD_COMMON_DEFINITIONS} ${DD_DYNAMIC_DEFINITIONS})
+
+  add_compiler_rt_runtime(clang_rt.dyndd-${arch} ${arch} SHARED
+    SOURCES $<TARGET_OBJECTS:RTDD.${arch}>
+            $<TARGET_OBJECTS:RTInterception.${arch}>
+            $<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
+            $<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>)
   target_link_libraries(clang_rt.dyndd-${arch} pthread dl)
 endif()
 
-- 
2.11.4.GIT