From: Evgeniy Stepanov <eugeni.stepanov@gmail.com>
Date: Wed, 29 Jan 2014 12:36:18 +0000 (+0000)
Subject: Remove -arm-enable-ehabi from Android build rules. It's enabled by default.
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=commitdiff_plain;h=e89e31275306295457d92d2406c2ead571736683

Remove -arm-enable-ehabi from Android build rules. It's enabled by default.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200391 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/cmake/platforms/Android.cmake b/cmake/platforms/Android.cmake
index 35df5ebd132..49a435f67c1 100644
--- a/cmake/platforms/Android.cmake
+++ b/cmake/platforms/Android.cmake
@@ -22,7 +22,7 @@ ENDIF()
 
 SET(ANDROID "1" CACHE STRING "ANDROID" FORCE)
 
-SET(ANDROID_COMMON_FLAGS "-target arm-linux-androideabi --sysroot=${LLVM_ANDROID_TOOLCHAIN_DIR}/sysroot -B${LLVM_ANDROID_TOOLCHAIN_DIR} -mllvm -arm-enable-ehabi")
+SET(ANDROID_COMMON_FLAGS "-target arm-linux-androideabi --sysroot=${LLVM_ANDROID_TOOLCHAIN_DIR}/sysroot -B${LLVM_ANDROID_TOOLCHAIN_DIR}")
 SET(CMAKE_C_FLAGS "${ANDROID_COMMON_FLAGS}" CACHE STRING "toolchain_cflags" FORCE)
 SET(CMAKE_CXX_FLAGS "${ANDROID_COMMON_FLAGS}" CACHE STRING "toolchain_cxxflags" FORCE)
 SET(CMAKE_LINK_FLAGS "${ANDROID_COMMON_FLAGS}" CACHE STRING "toolchain_linkflags" FORCE)