commit 91583867582e76f87371d23da155332d18252ce1
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jun 27 22:39:48 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 27 22:39:49 2016 +0000
tree 5793851e1c908b5d0410096a3aa24bca2c2d83f5
parent bb400855c3219c43cfbb5f1e437371b9ced4fa91
parent 8d414dd2b1d9503f6d4b3d9310796be50a824ede

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

libc/Android.bp

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