summaryrefslogtreecommitdiffstats
path: root/compiler-rt
diff options
context:
space:
mode:
authorAlexey Samsonov <samsonov@google.com>2012-11-16 12:51:23 +0000
committerAlexey Samsonov <samsonov@google.com>2012-11-16 12:51:23 +0000
commit77d35747be66d16de9c3a33e7f060ce3107f7a90 (patch)
tree4b1a8852bcb8b70aa64df697eb72ae6589907919 /compiler-rt
parentd71b4e456829ffb3773b968200663447782ed219 (diff)
downloadbcm5719-llvm-77d35747be66d16de9c3a33e7f060ce3107f7a90.tar.gz
bcm5719-llvm-77d35747be66d16de9c3a33e7f060ce3107f7a90.zip
UBSan: fix support on Darwin in 'make' build system. Patch by Jean-Daniel Dupas.
llvm-svn: 168167
Diffstat (limited to 'compiler-rt')
-rw-r--r--compiler-rt/make/platform/clang_darwin.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler-rt/make/platform/clang_darwin.mk b/compiler-rt/make/platform/clang_darwin.mk
index 399edee034c..fe84a056592 100644
--- a/compiler-rt/make/platform/clang_darwin.mk
+++ b/compiler-rt/make/platform/clang_darwin.mk
@@ -134,7 +134,7 @@ CFLAGS.asan_osx_dynamic := \
$(CFLAGS) -mmacosx-version-min=10.5 -fno-builtin \
-DMAC_INTERPOSE_FUNCTIONS=1
-CFLAGS.ubsan_osx := $(CFLAGS) $(OSX_DEPLOYMENT_ARGS)
+CFLAGS.ubsan_osx := $(CFLAGS) -mmacosx-version-min=10.5 -fno-builtin
CFLAGS.ios.i386 := $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)
CFLAGS.ios.x86_64 := $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)
@@ -188,7 +188,7 @@ FUNCTIONS.asan_osx_dynamic := $(AsanFunctions) $(InterceptionFunctions) \
$(SanitizerCommonFunctions) \
$(AsanDynamicFunctions)
-FUNCTIONS.ubsan_osx := $(UbsanFunctions)
+FUNCTIONS.ubsan_osx := $(UbsanFunctions) $(SanitizerCommonFunctions)
CCKEXT_COMMON_FUNCTIONS := \
absvdi2 \
OpenPOWER on IntegriCloud