aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2016-06-27 22:39:48 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-06-27 22:39:49 +0000
commit91583867582e76f87371d23da155332d18252ce1 (patch)
tree5793851e1c908b5d0410096a3aa24bca2c2d83f5
parentbb400855c3219c43cfbb5f1e437371b9ced4fa91 (diff)
parent8d414dd2b1d9503f6d4b3d9310796be50a824ede (diff)
downloadbionic-91583867582e76f87371d23da155332d18252ce1.tar.gz
Merge "Skip Clang's integrated-as for hand-coded assembly"
-rw-r--r--libc/Android.bp4
1 files changed, 4 insertions, 0 deletions
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"],