diff options
author | Alexey Samsonov <vonosmas@gmail.com> | 2015-03-23 23:14:05 +0000 |
---|---|---|
committer | Alexey Samsonov <vonosmas@gmail.com> | 2015-03-23 23:14:05 +0000 |
commit | db7f9c7396adfc698e583b7ca61ecb1575a75d8f (patch) | |
tree | 8538b263519ee4046531c6715cf79c541359211f /runtime | |
parent | 6ad2072125e9fdac5a59db424b093087b1518323 (diff) |
[UBSan] Use shared library for UBSan on OS X (Clang part).
Summary:
UBSan is now used in the same way as ASan, and is supported on
OSX and on iOS simulator. At the moment ASan and UBSan can't be used
together due to PR21112, but I hope to resolve it soon by
embedding UBSan into ASan.
Test Plan: regression test suite.
Reviewers: zaks.anna, kubabrecka
Subscribers: cfe-commits
Differential Revision: http://reviews.llvm.org/D8471
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@233035 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/compiler-rt/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/compiler-rt/Makefile b/runtime/compiler-rt/Makefile index c310453b2b..997643857d 100644 --- a/runtime/compiler-rt/Makefile +++ b/runtime/compiler-rt/Makefile @@ -79,7 +79,7 @@ RuntimeLibrary.darwin.Configs := \ eprintf.a 10.4.a osx.a cc_kext.a \ asan_osx_dynamic.dylib \ profile_osx.a \ - ubsan_osx.a + ubsan_osx_dynamic.dylib IOS_SDK := $(shell xcrun --show-sdk-path -sdk iphoneos 2> /dev/null) IOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2> /dev/null) @@ -93,7 +93,8 @@ RuntimeLibrary.darwin.Configs += cc_kext_ios5.a endif ifneq ($(IOSSIM_SDK),) -RuntimeLibrary.darwin.Configs += asan_iossim_dynamic.dylib +RuntimeLibrary.darwin.Configs += asan_iossim_dynamic.dylib \ + ubsan_iossim_dynamic.dylib endif RuntimeLibrary.macho_embedded.Configs := \ |