commit b2f5a5886697bbae644de6dcee8c3a7b2cf894e0
author Pirama Arumuga Nainar <pirama@google.com> Thu Jun 30 00:16:54 2016 +0000
committer Pirama Arumuga Nainar <pirama@google.com> Thu Jun 30 00:16:54 2016 +0000
tree c118ed244ee2f5d4795aefe44d64737cfc46be62
parent 8d414dd2b1d9503f6d4b3d9310796be50a824ede

Revert "Skip Clang's integrated-as for hand-coded assembly"

This reverts commit 8d414dd2b1d9503f6d4b3d9310796be50a824ede.

Reverting this since https://android-review.googlesource.com/#/c/244800/ adds -fno-integrated-as globally.

Change-Id: I29f53a385c16f44ead5dc744b0f2dd18a4af1731

libc/Android.bp

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