am 30c958f7
: am 42a5a177
: Merge "Revert "Revert "Prevent symbols from libgcc from being reexported."""
* commit '30c958f7f5dfd712f11026c5caa78aa7d67f082d': Revert "Revert "Prevent symbols from libgcc from being reexported.""
This commit is contained in:
commit
c492450147
@ -973,6 +973,13 @@ 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))
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user