diff options
| author | Chih-Hung Hsieh | 2014-12-18 19:27:22 -0600 |
|---|---|---|
| committer | Gerrit Code Review | 2014-12-18 19:27:23 -0600 |
| commit | 65e6985617d035ef45da86f8c8bcceea7bc47239 (patch) | |
| tree | 4c766226bddc20bde47abf3b47bf1df684451332 | |
| parent | 7eb9b6c537c32280571fead8676634c3dfc6388e (diff) | |
| parent | 6f96d58c0de191ac479d0fa83c3b9a514f4d3c48 (diff) | |
| download | platform-bionic-65e6985617d035ef45da86f8c8bcceea7bc47239.tar.gz platform-bionic-65e6985617d035ef45da86f8c8bcceea7bc47239.tar.xz platform-bionic-65e6985617d035ef45da86f8c8bcceea7bc47239.zip | |
Merge "Must use Clang assembler for mips target."
| -rw-r--r-- | linker/Android.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/linker/Android.mk b/linker/Android.mk index d6e00957..0383e7b7 100644 --- a/linker/Android.mk +++ b/linker/Android.mk | |||
| @@ -19,6 +19,13 @@ LOCAL_SRC_FILES_x86_64 := arch/x86_64/begin.S | |||
| 19 | LOCAL_SRC_FILES_mips := arch/mips/begin.S | 19 | LOCAL_SRC_FILES_mips := arch/mips/begin.S |
| 20 | LOCAL_SRC_FILES_mips64 := arch/mips64/begin.S | 20 | LOCAL_SRC_FILES_mips64 := arch/mips64/begin.S |
| 21 | 21 | ||
| 22 | # GNU assembler aborted with clang's output for linker.cpp: | ||
| 23 | # Assertion failure in get_line_subseg at | ||
| 24 | # /s/ndk-toolchain/src/build/../binutils/binutils-2.24/gas/dwarf2dbg.c line 271. | ||
| 25 | ifeq ($(TARGET_ARCH),mips) | ||
| 26 | LOCAL_CLANG_CFLAGS += -integrated-as | ||
| 27 | endif | ||
| 28 | |||
| 22 | LOCAL_LDFLAGS := \ | 29 | LOCAL_LDFLAGS := \ |
| 23 | -shared \ | 30 | -shared \ |
| 24 | -Wl,-Bsymbolic \ | 31 | -Wl,-Bsymbolic \ |