From aeefe8c1bb6e0e422f83b8602af90c8a2d31fa23 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. llvm-svn: 200392 --- compiler-rt/make/platform/clang_linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler-rt/make/platform/clang_linux.mk b/compiler-rt/make/platform/clang_linux.mk index e80c5b1c7cee..fe39a2d731af 100644 --- a/compiler-rt/make/platform/clang_linux.mk +++ b/compiler-rt/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