From 58e2dcdedaae34d1b7e026235e04e6ff1f685f23 Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Wed, 29 Jun 2016 17:09:30 -0700 Subject: [PATCH] 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 --- cc/mips_device.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cc/mips_device.go b/cc/mips_device.go index f9dc5c689..7204e3610 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 {