summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2014-10-15 23:52:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-15 23:52:47 +0000
commitd73c77192a0dc3377a59bc35bdb4c6edbba3639b (patch)
tree18ac2d78a238a2bbde7bf5d358fff24f5ccd77a7
parent2336d7d66364903dd98364a9d7fb5849c981b1fd (diff)
parente3e9a2a4f28eecf404101d137cb98e4e7d002cae (diff)
downloadlibcxxabi-d73c77192a0dc3377a59bc35bdb4c6edbba3639b.tar.gz
am e3e9a2a4: Disable Clang arm integrated assembler.
* commit 'e3e9a2a4f28eecf404101d137cb98e4e7d002cae': Disable Clang arm integrated assembler.
-rw-r--r--Android.mk10
1 files changed, 10 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index dc27f21..396cfde 100644
--- a/Android.mk
+++ b/Android.mk
@@ -81,6 +81,16 @@ LOCAL_WHOLE_STATIC_LIBRARIES_mips64 := libunwind
LOCAL_WHOLE_STATIC_LIBRARIES_x86 := libunwind
LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 := libunwind
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+# src/Unwind/UnwindRegistersSave.S does not compile.
+LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
+# When src/cxa_exception.cpp is compiled with Clang assembler
+# __cxa_end_cleanup_impl, although marked as used, was discarded
+# since it is used only in embedded assembly code.
+# This caused the following warning when linking libc++.so:
+# libc++_static.a(cxa_exception.o)(.text.__cxa_end_cleanup+0x2):
+# warning: relocation refers to discarded section
+# See also http://llvm.org/bugs/show_bug.cgi?id=21292.
+LOCAL_CLANG_CFLAGS_arm += -no-integrated-as
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)