diff options
| author | Leo Li <aoli@google.com> | 2017-07-26 21:16:15 +0000 |
|---|---|---|
| committer | Leo Li <aoli@google.com> | 2017-07-26 21:16:15 +0000 |
| commit | 861f5212c5583d72b48c528657bffc5aafe2a7c0 (patch) | |
| tree | 65fa1cde106277e6181a5855c412327781afd08b /lib/ubsan | |
| parent | 01ebee35b138b3c3d1e850ac44d5aef681f3f57e (diff) | |
Add liblog to ubsan `UBSAN_DYNAMIC_LIBS`
Summary: liblog is still required to create ubsan runtimes on Android when __ANDROID_API__ < 21.
Reviewers: eugenis, vsk
Subscribers: kubamracek, mgorny, pirama, srhines, llvm-commits
Differential Revision: https://reviews.llvm.org/D35915
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@309180 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ubsan')
| -rw-r--r-- | lib/ubsan/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ubsan/CMakeLists.txt b/lib/ubsan/CMakeLists.txt index 457a6b475..cf4b30bd3 100644 --- a/lib/ubsan/CMakeLists.txt +++ b/lib/ubsan/CMakeLists.txt @@ -35,6 +35,7 @@ append_rtti_flag(ON UBSAN_CXXFLAGS) append_list_if(SANITIZER_CAN_USE_CXXABI -DUBSAN_CAN_USE_CXXABI UBSAN_CXXFLAGS) append_list_if(COMPILER_RT_HAS_LIBDL dl UBSAN_DYNAMIC_LIBS) +append_list_if(COMPILER_RT_HAS_LIBLOG log UBSAN_DYNAMIC_LIBS) append_list_if(COMPILER_RT_HAS_LIBRT rt UBSAN_DYNAMIC_LIBS) append_list_if(COMPILER_RT_HAS_LIBPTHREAD pthread UBSAN_DYNAMIC_LIBS) @@ -129,7 +130,7 @@ else() add_compiler_rt_object_libraries(RTUbsan_standalone ARCHS ${UBSAN_SUPPORTED_ARCH} SOURCES ${UBSAN_STANDALONE_SOURCES} CFLAGS ${UBSAN_STANDALONE_CFLAGS}) - + # Standalone UBSan runtimes. add_compiler_rt_runtime(clang_rt.ubsan_standalone STATIC @@ -140,7 +141,7 @@ else() RTUbsan_standalone CFLAGS ${UBSAN_CFLAGS} PARENT_TARGET ubsan) - + add_compiler_rt_runtime(clang_rt.ubsan_standalone_cxx STATIC ARCHS ${UBSAN_SUPPORTED_ARCH} |