From: Alexey Samsonov <samsonov@google.com>
Date: Fri, 16 Nov 2012 12:51:23 +0000 (+0000)
Subject: UBSan: fix support on Darwin in 'make' build system. Patch by Jean-Daniel Dupas.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=77d35747be66d16de9c3a33e7f060ce3107f7a90;p=platform%2Fupstream%2Fllvm.git

UBSan: fix support on Darwin in 'make' build system. Patch by Jean-Daniel Dupas.

llvm-svn: 168167
---

diff --git a/compiler-rt/make/platform/clang_darwin.mk b/compiler-rt/make/platform/clang_darwin.mk
index 399edee..fe84a05 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 \