summaryrefslogtreecommitdiffstats
path: root/libm
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-06-18 17:18:33 -0700
committerDan Albert <danalbert@google.com>2014-06-21 00:09:31 -0700
commit65e80cf62200085f72c1c081aea2d6e9b800cde2 (patch)
tree093c5a57b9b5409115d0230bdf8d325ddf3b2d0e /libm
parent0d7415fb225573c37ff9e880957cd2044dd658ce (diff)
downloadbionic-65e80cf62200085f72c1c081aea2d6e9b800cde2.zip
bionic-65e80cf62200085f72c1c081aea2d6e9b800cde2.tar.gz
bionic-65e80cf62200085f72c1c081aea2d6e9b800cde2.tar.bz2
Prevent symbols from libgcc from being reexported.
Since this was not done earlier, there are binary compatibility concerns that prevent us from being able to apply this to LP32. Bug: 11156955 Change-Id: Ie717c3ae4b81c749548a45a993c834e109700b27
Diffstat (limited to 'libm')
-rw-r--r--libm/Android.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/libm/Android.mk b/libm/Android.mk
index 90b4906..994caa0 100644
--- a/libm/Android.mk
+++ b/libm/Android.mk
@@ -291,5 +291,12 @@ LOCAL_MODULE:= libm
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_SYSTEM_SHARED_LIBRARIES := libc
LOCAL_WHOLE_STATIC_LIBRARIES := libm
+
+# We'd really like to do this for all architectures, but since this wasn't done
+# before, these symbols must continue to be exported on LP32 for binary
+# compatibility.
+LOCAL_LDFLAGS_arm64 := -Wl,--exclude-libs,libgcc.a
+LOCAL_LDFLAGS_mips64 := -Wl,--exclude-libs,libgcc.a
+LOCAL_LDFLAGS_x86_64 := -Wl,--exclude-libs,libgcc.a
include $(BUILD_SHARED_LIBRARY)
endif