From 71f9b34fbeef00f3bd34364dadad41bff60b6b1d Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Tue, 24 Jun 2014 04:31:08 +0000
Subject: Revert "Revert "Prevent symbols from libgcc from being reexported.""

This reverts commit 4e4e1a5d78ff6dd9394b9b116c012046da409e99.

Change-Id: I8e78c3a59598e052e02965dd37b3fba8f567eed9
---
 libm/Android.mk | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'libm')

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
-- 
cgit v1.1