From: Stephen Hines <srhines@google.com>
Date: Wed, 11 Jul 2018 00:50:03 +0000 (+0000)
Subject: Add libcxxabi option back for sanitizer use.
X-Git-Tag: llvmorg-7.0.0-rc1~1765
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6812c28ef3dbb5a3ed2d717499b68c3831fbc20f;p=platform%2Fupstream%2Fllvm.git

Add libcxxabi option back for sanitizer use.

Summary:
A prior refactoring accidentally dropped the case for using libc++abi as
the out-of-tree C++ runtime library for sanitizers. This patch restores
that functionality, which is used by Android, which can't depend on the
full libc++ for these libraries.

Reviewers: phosek, EricWF

Reviewed By: phosek

Subscribers: meikeb, kongyi, chh, mgorny, delcypher, llvm-commits, #sanitizers, pirama

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

llvm-svn: 336749
---

diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index 6ece416..be4066f 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -353,6 +353,8 @@ if (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libc++")
   else()
     append_list_if(COMPILER_RT_HAS_LIBCXX c++ SANITIZER_CXX_ABI_LIBRARY)
   endif()
+elseif (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libcxxabi")
+  list(APPEND SANITIZER_CXX_ABI_LIBRARY "c++abi")
 elseif (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libstdc++")
   append_list_if(COMPILER_RT_HAS_LIBSTDCXX stdc++ SANITIZER_CXX_ABI_LIBRARY)
 endif()