From a371750681a84c8f0445fa041e817582e12c125f Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Fri, 17 Oct 2014 16:27:03 -0700 Subject: [PATCH] Add -no-integrated-as at local level. Later we will enable integrated-as as default at the global level. BUG: 17820427 BUG: 17302991 Change-Id: I233204ca04d7222b2cb1fbd0fa48a482f8b63f6f --- libc/Android.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libc/Android.mk b/libc/Android.mk index 330e51758..1688abe06 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -853,10 +853,12 @@ LOCAL_SRC_FILES := $(libc_bionic_src_files) 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)