summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2014-01-29 12:36:45 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2014-01-29 12:36:45 +0000
commit3bd438800d434c987bd3e8479c6dbe14178622ae (patch)
treec6a19189f7030ab1a4bd2bfb6ef480dafacf259a /make
parenta365df8de5f8bff18b196df787eb00501fc67430 (diff)
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
Diffstat (limited to 'make')
-rw-r--r--make/platform/clang_linux.mk2
1 files changed, 1 insertions, 1 deletions
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