commit 6f40a8ac7445e1abc1748e1b5ed42b2c5e264ea4
author Duane Sand <duane.sand@imgtec.com> Thu Jan 08 10:36:56 2015 -0800
committer Duane Sand <duane.sand@imgtec.com> Fri Jan 09 10:24:11 2015 -0800
tree 4e7d5ba5ac70cb9fa26c6e904a03d8cfa98bc764
parent 8623dc75479f88e7ccdec708b5c7ca0abeb285d1

Revert "Must use Clang assembler for mips target."

This reverts commit 6f96d58c0de191ac479d0fa83c3b9a514f4d3c48.

linker/Android.mk

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