summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2014-07-24 09:14:56 -0700
committerStephen Hines <srhines@google.com>2014-07-25 00:51:54 -0700
commit3aba5bed905af018db8eb9c92ba7685b4aa2b3ec (patch)
tree694897d09ed931389b601b861d7210977d78e797
parent73abdfe437fbb56b31ff5872d9ae38f8d9c23e5d (diff)
downloadexternal_libcxx-3aba5bed905af018db8eb9c92ba7685b4aa2b3ec.tar.gz
external_libcxx-3aba5bed905af018db8eb9c92ba7685b4aa2b3ec.tar.bz2
external_libcxx-3aba5bed905af018db8eb9c92ba7685b4aa2b3ec.zip
Remove MIPS workaround for shared text relocations.
Bug: 14296739 Updates to LLVM and libc++ have removed the remaining spurious shared text relocations from the MIPS build of libc++. We no longer need to disable linker warnings as errors, since we don't trigger the warning. Change-Id: I82ec8c76decc92d93a5ce87d9a172e8cbcdb82b8
-rw-r--r--Android.mk9
1 files changed, 0 insertions, 9 deletions
diff --git a/Android.mk b/Android.mk
index 047e9d11f..65b44b713 100644
--- a/Android.mk
+++ b/Android.mk
@@ -76,15 +76,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libc++
LOCAL_SHARED_LIBRARIES := libdl
LOCAL_SYSTEM_SHARED_LIBRARIES := libc libm
-# Bug: 14296739
-# The MIPS target in LLVM is spuriously generating a text relocation for
-# __gxx_personality_v0 in the .eh_frame section. This triggers a linker
-# warning, since it is not considered PIC. Disable warnings as errors
-# for this link step until we can get the bug fixed.
-ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH), mips mips64))
-LOCAL_LDFLAGS := -Wl,--no-fatal-warnings
-endif
-
ifneq ($(TARGET_ARCH),arm)
LOCAL_SHARED_LIBRARIES += libdl
endif