diff options
| author | Dan Albert <danalbert@google.com> | 2014-06-23 20:12:05 +0000 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-06-23 20:12:05 +0000 |
| commit | 4e4e1a5d78ff6dd9394b9b116c012046da409e99 (patch) | |
| tree | 68252d281005257fa0e1664fa095e9eb1e11844d | |
| parent | 65e80cf62200085f72c1c081aea2d6e9b800cde2 (diff) | |
| download | bionic-4e4e1a5d78ff6dd9394b9b116c012046da409e99.zip bionic-4e4e1a5d78ff6dd9394b9b116c012046da409e99.tar.gz bionic-4e4e1a5d78ff6dd9394b9b116c012046da409e99.tar.bz2 | |
Revert "Prevent symbols from libgcc from being reexported."
This reverts commit 65e80cf62200085f72c1c081aea2d6e9b800cde2.
Change-Id: I5f94b123f73db8d0b03cd71a5cffa0662776a017
| -rw-r--r-- | libc/Android.mk | 7 | ||||
| -rw-r--r-- | libm/Android.mk | 7 |
2 files changed, 0 insertions, 14 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index 7febccd..1b3965e 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -971,13 +971,6 @@ LOCAL_SHARED_LIBRARIES := libdl LOCAL_WHOLE_STATIC_LIBRARIES := libc_common LOCAL_SYSTEM_SHARED_LIBRARIES := -# 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 - $(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags)) $(eval $(call patch-up-arch-specific-flags,LOCAL_SRC_FILES,libc_arch_dynamic_src_files)) $(eval $(call patch-up-arch-specific-flags,LOCAL_SRC_FILES,libc_static_common_src_files)) diff --git a/libm/Android.mk b/libm/Android.mk index 994caa0..90b4906 100644 --- a/libm/Android.mk +++ b/libm/Android.mk @@ -291,12 +291,5 @@ 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 |