From 6f96d58c0de191ac479d0fa83c3b9a514f4d3c48 Mon Sep 17 00:00:00 2001
From: Chih-Hung Hsieh <chh@google.com>
Date: Thu, 18 Dec 2014 17:10:56 -0800
Subject: [PATCH] Must use Clang assembler for mips target.
GNU assembler has internal error with clang's output.
BUG: 18807290
Change-Id: Iabbe991720fc562884f19d79bded903505fc891d
---
linker/Android.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/linker/Android.mk b/linker/Android.mk
index d6e009575..0383e7b7e 100644
--- a/linker/Android.mk
+++ b/linker/Android.mk
@@ -19,6 +19,13 @@ LOCAL_SRC_FILES_x86_64 := arch/x86_64/begin.S
LOCAL_SRC_FILES_mips := arch/mips/begin.S
LOCAL_SRC_FILES_mips64 := arch/mips64/begin.S
+# GNU assembler aborted with clang's output for linker.cpp:
+# Assertion failure in get_line_subseg at
+# /s/ndk-toolchain/src/build/../binutils/binutils-2.24/gas/dwarf2dbg.c line 271.
+ifeq ($(TARGET_ARCH),mips)
+ LOCAL_CLANG_CFLAGS += -integrated-as
+endif
+
LOCAL_LDFLAGS := \
-shared \
-Wl,-Bsymbolic \