Merge "Re-land "Fix invalid using decl in bionic relocation_packer""
diff --git a/libc/Android.mk b/libc/Android.mk
index a8581ac..3fac083 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -1390,11 +1390,6 @@
LOCAL_LDFLAGS_mips64 += -Wl,--version-script,$(LOCAL_PATH)/libc.mips64.map
LOCAL_LDFLAGS_x86_64 += -Wl,--version-script,$(LOCAL_PATH)/libc.x86_64.map
-# 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_64 := -Wl,--exclude-libs,libgcc.a
-
# Unfortunately --exclude-libs clobbers our version script, so we have to
# prevent the build system from using this flag.
LOCAL_NO_EXCLUDE_LIBS := true
diff --git a/libm/Android.mk b/libm/Android.mk
index b07e426..0070bd1 100644
--- a/libm/Android.mk
+++ b/libm/Android.mk
@@ -578,10 +578,5 @@
LOCAL_CXX_STL := none
-# 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_64 := -Wl,--exclude-libs,libgcc.a
-
include $(BUILD_SHARED_LIBRARY)
endif