aboutsummaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authorPirama Arumuga Nainar <pirama@google.com>2016-06-29 17:09:30 -0700
committerPirama Arumuga Nainar <pirama@google.com>2016-06-30 04:50:50 +0000
commit58e2dcdedaae34d1b7e026235e04e6ff1f685f23 (patch)
tree2ed063258882bc4dca305343910f7dba02892c85 /cc
parent5d2038fe06c01c450795492668884477e41e4877 (diff)
downloadbuild_soong-58e2dcdedaae34d1b7e026235e04e6ff1f685f23.tar.gz
build_soong-58e2dcdedaae34d1b7e026235e04e6ff1f685f23.tar.bz2
build_soong-58e2dcdedaae34d1b7e026235e04e6ff1f685f23.zip
Disable integrated-as for Mips
Bug: http://b/29771478 Hand-coded assembly in various projects will fail to compile after Clang switches to integrated assembler for Mips. Disable integrated-as for Mips. Test: Verified Mips builds on AOSP both with the old Clang prebuilts and the new prebuilts (https://android-review.googlesource.com/#/c/243871/) Change-Id: Idf441cb9c6c2afc8997d5ee56420885930087918
Diffstat (limited to 'cc')
-rw-r--r--cc/mips_device.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/cc/mips_device.go b/cc/mips_device.go
index f9dc5c68..7204e361 100644
--- a/cc/mips_device.go
+++ b/cc/mips_device.go
@@ -52,6 +52,7 @@ var (
mipsClangCflags = append(mipsCflags, []string{
"-fPIC",
+ "-fno-integrated-as",
}...)
mipsCppflags = []string{
@@ -219,7 +220,7 @@ func (t *toolchainMips) ToolchainClangCflags() string {
}
func (t *toolchainMips) ClangAsflags() string {
- return "-fPIC"
+ return "-fPIC -fno-integrated-as"
}
func (t *toolchainMips) ClangCflags() string {