commit 9a7404824b3dfaad6ba14a41aab5f14132392a92
author Chih-Hung Hsieh <chh@google.com> Mon Oct 20 16:51:05 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 20 16:51:06 2014 +0000
tree 14fd4426eace2605998c406e4198d9b42154e1af
parent dec4de456c046881fb1e8c7c7d0c27a11ef09eb7
parent a371750681a84c8f0445fa041e817582e12c125f

Merge "Add -no-integrated-as at local level."

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index 330e517..1688abe 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -853,10 +853,12 @@
 LOCAL_CFLAGS := $(libc_common_cflags) \
     -Wframe-larger-than=2048 \
 
-ifeq ($(TARGET_ARCH),x86_64)
-  # Clang assembler has problem with ssse3-strcmp-slm.S, http://b/17302991
-  LOCAL_CLANG_ASFLAGS += -no-integrated-as
-endif
+# ssse3-strcmp-slm.S does not compile with Clang.
+LOCAL_CLANG_ASFLAGS_x86_64 += -no-integrated-as
+
+# memcpy.S, memchr.S, etc. do not compile with Clang.
+LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
+LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as
 
 LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
 LOCAL_CPPFLAGS := $(libc_common_cppflags)