commit 1fec29e77bea7b5e1e4c5d5b6fae2804a5998b19
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jun 30 20:33:41 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 30 20:33:42 2016 +0000
tree 9c9330973682aec301c4f8286680e4b956acc3b2
parent 60be638ae64b263b30eac19c84992d685d7d7832
parent b2f5a5886697bbae644de6dcee8c3a7b2cf894e0

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

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"],