From 8d414dd2b1d9503f6d4b3d9310796be50a824ede Mon Sep 17 00:00:00 2001
From: Pirama Arumuga Nainar <pirama@google.com>
Date: Sat, 25 Jun 2016 12:53:06 -0700
Subject: [PATCH] Skip Clang's integrated-as for hand-coded assembly

Bug: http://b/28149048
Bug: http://b/29771478

Clang recently switched to using integrated assembler for Mips.
However, it fails to compile some of the hand-coded assembly files in
bionic.  Disable integrated-as for the time being.

Change-Id: I2eed4391f6827224da74383387bdd9105de5a857
---
 libc/Android.bp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libc/Android.bp b/libc/Android.bp
index ba62592ba..c7201cbcf 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1082,6 +1082,8 @@ cc_library_static {
                     "arch-mips/string/mips_strlen.c",
                 ],
             },
+            // http://b/29771478 - disable integrated-as for Mips
+            asflags: ["-fno-integrated-as"],
         },
         mips64: {
             srcs: [
@@ -1458,6 +1460,8 @@ cc_library_static {
         },
         mips: {
             srcs: ["arch-mips/syscalls/**/*.S"],
+            // http://b/29771478 - disable integrated-as for Mips
+            asflags: ["-fno-integrated-as"],
         },
         mips64: {
             srcs: ["arch-mips64/syscalls/**/*.S"],