summaryrefslogtreecommitdiffstats
path: root/linker
diff options
context:
space:
mode:
authorDuane Sand <duane.sand@imgtec.com>2015-01-08 10:36:56 -0800
committerDuane Sand <duane.sand@imgtec.com>2015-01-09 10:24:11 -0800
commit6f40a8ac7445e1abc1748e1b5ed42b2c5e264ea4 (patch)
tree4e7d5ba5ac70cb9fa26c6e904a03d8cfa98bc764 /linker
parent8623dc75479f88e7ccdec708b5c7ca0abeb285d1 (diff)
downloadbionic-6f40a8ac7445e1abc1748e1b5ed42b2c5e264ea4.zip
bionic-6f40a8ac7445e1abc1748e1b5ed42b2c5e264ea4.tar.gz
bionic-6f40a8ac7445e1abc1748e1b5ed42b2c5e264ea4.tar.bz2
Revert "Must use Clang assembler for mips target."
This reverts commit 6f96d58c0de191ac479d0fa83c3b9a514f4d3c48.
Diffstat (limited to 'linker')
-rw-r--r--linker/Android.mk7
1 files changed, 0 insertions, 7 deletions
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_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 \