summaryrefslogtreecommitdiffstats
path: root/clang/runtime
diff options
context:
space:
mode:
authorAlexey Samsonov <vonosmas@gmail.com>2015-03-23 23:14:05 +0000
committerAlexey Samsonov <vonosmas@gmail.com>2015-03-23 23:14:05 +0000
commit498f3c341699a5ecf9375e542f7ca337860f19d4 (patch)
tree5ac8cfb7a89cbae22dfb5f50ebb4c744aeb82614 /clang/runtime
parentacf28bea84bf1c40a41177bfe6f57e77033fc448 (diff)
downloadbcm5719-llvm-498f3c341699a5ecf9375e542f7ca337860f19d4.tar.gz
bcm5719-llvm-498f3c341699a5ecf9375e542f7ca337860f19d4.zip
[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 llvm-svn: 233035
Diffstat (limited to 'clang/runtime')
-rw-r--r--clang/runtime/compiler-rt/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/runtime/compiler-rt/Makefile b/clang/runtime/compiler-rt/Makefile
index c310453b2b3..997643857d9 100644
--- a/clang/runtime/compiler-rt/Makefile
+++ b/clang/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 := \
OpenPOWER on IntegriCloud