diff --git a/linker/Android.mk b/linker/Android.mk
index d6e0095757d0df30255b8f9f86d9984e0d3d261f..0383e7b7e395213e311109a107d4abeee0761d81 100644 (file)
--- a/linker/Android.mk
+++ b/linker/Android.mk
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 \