[compiler-rt] r314369 - [ubsan] Merge ubsan_standalone_cxx shared library.

[Evgeniy Stepanov via llvm-commits]

Author: eugenis
Date: Wed Sep 27 17:31:09 2017
New Revision: 314369

URL: http://llvm.org/viewvc/llvm-project?rev=314369&view=rev
Log:
[ubsan] Merge ubsan_standalone_cxx shared library.

Summary:
Link everything, including the C++ bits, in the single
ubsan_standalone SHARED library. This matches ASan setup.

Reviewers: vitalybuka

Subscribers: kubamracek, llvm-commits, mgorny

Differential Revision: https://reviews.llvm.org/D38340

Modified:
    compiler-rt/trunk/lib/ubsan/CMakeLists.txt

Modified: compiler-rt/trunk/lib/ubsan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/ubsan/CMakeLists.txt?rev=314369&r1=314368&r2=314369&view=diff
==============================================================================
--- compiler-rt/trunk/lib/ubsan/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/ubsan/CMakeLists.txt Wed Sep 27 17:31:09 2017
@@ -164,24 +164,13 @@ else()
         OBJECT_LIBS RTSanitizerCommon
               RTSanitizerCommonLibc
               RTUbsan
+              RTUbsan_cxx
               RTUbsan_standalone
               RTInterception
         CFLAGS ${UBSAN_CFLAGS}
         LINK_FLAGS ${SANITIZER_COMMON_LINK_FLAGS}
         LINK_LIBS ${UBSAN_DYNAMIC_LIBS}
         PARENT_TARGET ubsan)
-
-      add_compiler_rt_runtime(clang_rt.ubsan_standalone_cxx
-        SHARED
-        ARCHS ${UBSAN_SUPPORTED_ARCH}
-        OBJECT_LIBS RTSanitizerCommon
-                RTSanitizerCommonLibc
-                RTUbsan
-                RTUbsan_cxx
-        CFLAGS ${UBSAN_CXXFLAGS}
-        LINK_FLAGS ${SANITIZER_COMMON_LINK_FLAGS}
-        LINK_LIBS ${UBSAN_DYNAMIC_LIBS}
-        PARENT_TARGET ubsan)
 
       set(ARCHS_FOR_SYMBOLS ${UBSAN_SUPPORTED_ARCH})
       list(REMOVE_ITEM ARCHS_FOR_SYMBOLS i386)