From 3bd438800d434c987bd3e8479c6dbe14178622ae Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Wed, 29 Jan 2014 12:36:45 +0000 Subject: [PATCH] Remove -arm-enable-ehabi from Android build rules. It's enabled by default. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@200392 91177308-0d34-0410-b5e6-96231b3b80d8 --- make/platform/clang_linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/platform/clang_linux.mk b/make/platform/clang_linux.mk index e80c5b1c7..fe39a2d73 100644 --- a/make/platform/clang_linux.mk +++ b/make/platform/clang_linux.mk @@ -110,7 +110,7 @@ ANDROID_COMMON_FLAGS := -target arm-linux-androideabi \ --sysroot=$(LLVM_ANDROID_TOOLCHAIN_DIR)/sysroot \ -B$(LLVM_ANDROID_TOOLCHAIN_DIR) CFLAGS.asan-arm-android := $(CFLAGS) -fPIC -fno-builtin \ - $(ANDROID_COMMON_FLAGS) -mllvm -arm-enable-ehabi -fno-rtti + $(ANDROID_COMMON_FLAGS) -fno-rtti LDFLAGS.asan-arm-android := $(LDFLAGS) $(ANDROID_COMMON_FLAGS) -ldl -lm -llog \ -Wl,-soname=libclang_rt.asan-arm-android.so -Wl,-z,defs -- 2.11.4.GIT