From d19b8487b8f2b54eb873c8c356337e2ad7924c65 Mon Sep 17 00:00:00 2001
From: Alexey Samsonov <samsonov@google.com>
Date: Wed, 19 Mar 2014 14:50:10 +0000
Subject: [PATCH] [Make] Build sanitizer runtimes with -std=c++11

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@204239 91177308-0d34-0410-b5e6-96231b3b80d8
---
 make/platform/clang_darwin.mk | 5 ++++-
 make/platform/clang_linux.mk  | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk
index 96eca7b7a..dc8417908 100644
--- a/make/platform/clang_darwin.mk
+++ b/make/platform/clang_darwin.mk
@@ -159,6 +159,7 @@ CFLAGS.10.4		:= $(CFLAGS) $(OSX_DEPLOYMENT_ARGS)
 CFLAGS.asan_osx_dynamic := \
 	$(CFLAGS) -mmacosx-version-min=10.6 -fno-builtin \
 	-gline-tables-only \
+	-std=c++11 \
 	-DMAC_INTERPOSE_FUNCTIONS=1
 
 CFLAGS.asan_iossim_dynamic := \
@@ -166,9 +167,11 @@ CFLAGS.asan_iossim_dynamic := \
         -isysroot $(IOSSIM_SDK_PATH) \
         -fno-builtin \
 	-gline-tables-only \
+	-std=c++11 \
 	-DMAC_INTERPOSE_FUNCTIONS=1
 
-CFLAGS.ubsan_osx	:= $(CFLAGS) -mmacosx-version-min=10.6 -fno-builtin
+CFLAGS.ubsan_osx := $(CFLAGS) -mmacosx-version-min=10.6 -fno-builtin \
+	-std=c++11
 
 CFLAGS.ios.i386		:= $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)
 CFLAGS.ios.x86_64	:= $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)
diff --git a/make/platform/clang_linux.mk b/make/platform/clang_linux.mk
index 2486eff06..567ea5d01 100644
--- a/make/platform/clang_linux.mk
+++ b/make/platform/clang_linux.mk
@@ -86,7 +86,7 @@ endif
 ###
 
 CFLAGS := -Wall -Werror -O3 -fomit-frame-pointer
-SANITIZER_CFLAGS := -fPIE -fno-builtin -gline-tables-only
+SANITIZER_CFLAGS := -std=c++11 -fPIE -fno-builtin -gline-tables-only
 
 CFLAGS.full-i386 := $(CFLAGS) -m32
 CFLAGS.full-x86_64 := $(CFLAGS) -m64
-- 
2.11.4.GIT