Remove assembler workaround since we have the fix.
Fix is in https://android-review.googlesource.com/#/c/189112
Change-Id: Ia853e5fb84334729c13e4ef254faf417d46c4186
diff --git a/Android.bp b/Android.bp
index 95f8b4e..3141f93 100644
--- a/Android.bp
+++ b/Android.bp
@@ -55,14 +55,6 @@
arch: {
arm: {
include_dirs: ["external/libunwind_llvm/include"],
- // 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.
- clang_cflags: ["-no-integrated-as"],
cppflags: ["-DLIBCXXABI_USE_LLVM_UNWINDER=1"],
},
arm64: {
diff --git a/Android.mk b/Android.mk
index 38362c1..cb63f11 100644
--- a/Android.mk
+++ b/Android.mk
@@ -67,14 +67,6 @@
LOCAL_RTTI_FLAG := $(LIBCXXABI_RTTI_FLAG)
LOCAL_CXX_STL := none
LOCAL_SANITIZE := never
-# 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)
