summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2014-01-16 10:16:19 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2014-01-16 10:16:19 +0000
commitac0efee29edb02871acdd136c90506b311a49484 (patch)
treeb216fe9c6b3d9f8c55d6e263ff3f168ffecccd19 /make
parent4f65242f12696d39c53e7bf84ab31c8819782315 (diff)
[asan] Nuke ASAN_FLEXIBLE_MAPPING_AND_OFFSET.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@199370 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'make')
-rw-r--r--make/platform/clang_darwin.mk6
-rw-r--r--make/platform/clang_linux.mk6
2 files changed, 4 insertions, 8 deletions
diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk
index 7381725d5..bba104a43 100644
--- a/make/platform/clang_darwin.mk
+++ b/make/platform/clang_darwin.mk
@@ -150,16 +150,14 @@ CFLAGS.10.4 := $(CFLAGS) $(OSX_DEPLOYMENT_ARGS)
CFLAGS.asan_osx_dynamic := \
$(CFLAGS) -mmacosx-version-min=10.6 -fno-builtin \
-gline-tables-only \
- -DMAC_INTERPOSE_FUNCTIONS=1 \
- -DASAN_FLEXIBLE_MAPPING_AND_OFFSET=1
+ -DMAC_INTERPOSE_FUNCTIONS=1
CFLAGS.asan_iossim_dynamic := \
$(CFLAGS) -mios-simulator-version-min=7.0 \
-isysroot $(IOSSIM_SDK_PATH) \
-fno-builtin \
-gline-tables-only \
- -DMAC_INTERPOSE_FUNCTIONS=1 \
- -DASAN_FLEXIBLE_MAPPING_AND_OFFSET=1
+ -DMAC_INTERPOSE_FUNCTIONS=1
CFLAGS.ubsan_osx := $(CFLAGS) -mmacosx-version-min=10.6 -fno-builtin
diff --git a/make/platform/clang_linux.mk b/make/platform/clang_linux.mk
index 5796e8671..ce700b849 100644
--- a/make/platform/clang_linux.mk
+++ b/make/platform/clang_linux.mk
@@ -94,10 +94,8 @@ CFLAGS.profile-i386 := $(CFLAGS) -m32
CFLAGS.profile-x86_64 := $(CFLAGS) -m64
CFLAGS.san-i386 := $(CFLAGS) -m32 $(SANITIZER_CFLAGS) -fno-rtti
CFLAGS.san-x86_64 := $(CFLAGS) -m64 $(SANITIZER_CFLAGS) -fno-rtti
-CFLAGS.asan-i386 := $(CFLAGS) -m32 $(SANITIZER_CFLAGS) -fno-rtti \
- -DASAN_FLEXIBLE_MAPPING_AND_OFFSET=1
-CFLAGS.asan-x86_64 := $(CFLAGS) -m64 $(SANITIZER_CFLAGS) -fno-rtti \
- -DASAN_FLEXIBLE_MAPPING_AND_OFFSET=1
+CFLAGS.asan-i386 := $(CFLAGS) -m32 $(SANITIZER_CFLAGS) -fno-rtti
+CFLAGS.asan-x86_64 := $(CFLAGS) -m64 $(SANITIZER_CFLAGS) -fno-rtti
CFLAGS.tsan-x86_64 := $(CFLAGS) -m64 $(SANITIZER_CFLAGS) -fno-rtti
CFLAGS.msan-x86_64 := $(CFLAGS) -m64 $(SANITIZER_CFLAGS) -fno-rtti
CFLAGS.ubsan-i386 := $(CFLAGS) -m32 $(SANITIZER_CFLAGS) -fno-rtti