commit 65e6985617d035ef45da86f8c8bcceea7bc47239
author Chih-Hung Hsieh <chh@google.com> Fri Dec 19 01:27:22 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 19 01:27:23 2014 +0000
tree 4c766226bddc20bde47abf3b47bf1df684451332
parent 7eb9b6c537c32280571fead8676634c3dfc6388e
parent 6f96d58c0de191ac479d0fa83c3b9a514f4d3c48

Merge "Must use Clang assembler for mips target."

linker/Android.mk

diff --git a/linker/Android.mk b/linker/Android.mk
index d6e0095..0383e7b 100644
--- a/linker/Android.mk
+++ b/linker/Android.mk
@@ -19,6 +19,13 @@
 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 \