generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix LDFLAGS for arm and x86"

Browse Source
This commit is contained in:
Dimitry Ivanov 2015-10-29 00:43:00 +00:00 committed by Gerrit Code Review
commit 5ccad497d4
8 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libc/Android.mk
View File

@ -1417,13 +1417,17 @@ endif
LOCAL_CXX_STL := none
LOCAL_SYSTEM_SHARED_LIBRARIES :=
# TODO: This is to work around b/24465209. Remove after root cause is fixed
LOCAL_LDFLAGS_arm := -Wl,--hash-style=both
LOCAL_LDFLAGS_x86 := -Wl,--hash-style=both
# Don't re-export new/delete and friends, even if the compiler really wants to.
LOCAL_LDFLAGS_arm := -Wl,--version-script,$(LOCAL_PATH)/libc.arm.map
LOCAL_LDFLAGS_arm64 := -Wl,--version-script,$(LOCAL_PATH)/libc.arm64.map
LOCAL_LDFLAGS_mips := -Wl,--version-script,$(LOCAL_PATH)/libc.mips.map
LOCAL_LDFLAGS_mips64 := -Wl,--version-script,$(LOCAL_PATH)/libc.mips64.map
LOCAL_LDFLAGS_x86 := -Wl,--version-script,$(LOCAL_PATH)/libc.x86.map
LOCAL_LDFLAGS_x86_64 := -Wl,--version-script,$(LOCAL_PATH)/libc.x86_64.map
LOCAL_LDFLAGS_arm += -Wl,--version-script,$(LOCAL_PATH)/libc.arm.map
LOCAL_LDFLAGS_arm64 += -Wl,--version-script,$(LOCAL_PATH)/libc.arm64.map
LOCAL_LDFLAGS_mips += -Wl,--version-script,$(LOCAL_PATH)/libc.mips.map
LOCAL_LDFLAGS_mips64 += -Wl,--version-script,$(LOCAL_PATH)/libc.mips64.map
LOCAL_LDFLAGS_x86 += -Wl,--version-script,$(LOCAL_PATH)/libc.x86.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
@ -1434,10 +1438,6 @@ LOCAL_LDFLAGS_64 := -Wl,--exclude-libs,libgcc.a
# prevent the build system from using this flag.
LOCAL_NO_EXCLUDE_LIBS := true
# TODO: This is to work around b/24465209. Remove after root cause is fixed
LOCAL_LDFLAGS_arm := -Wl,--hash-style=both
LOCAL_LDFLAGS_x86 := -Wl,--hash-style=both
$(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))

3
libc/libc.arm.map
View File

@ -385,7 +385,6 @@ LIBC {
endmntent;
endpwent;
endservent;
endusershell;
endutent;
environ;
epoll_create;
@ -576,7 +575,6 @@ LIBC {
gettid;
gettimeofday;
getuid;
getusershell;
getutent;
getwc;
getwchar;
@ -1024,7 +1022,6 @@ LIBC {
setstate;
settimeofday;
setuid;
setusershell;
setutent;
setvbuf;
setxattr;

3
libc/libc.arm64.map
View File

@ -243,7 +243,6 @@ LIBC {
endmntent;
endpwent;
endservent;
endusershell;
endutent;
environ;
epoll_create;
@ -428,7 +427,6 @@ LIBC {
gettid;
gettimeofday;
getuid;
getusershell;
getutent;
getwc;
getwchar;
@ -881,7 +879,6 @@ LIBC {
setstate;
settimeofday;
setuid;
setusershell;
setutent;
setvbuf;
setxattr;

3
libc/libc.mips.map
View File

@ -349,7 +349,6 @@ LIBC {
endmntent;
endpwent;
endservent;
endusershell;
endutent;
environ;
epoll_create;
@ -540,7 +539,6 @@ LIBC {
gettid;
gettimeofday;
getuid;
getusershell;
getutent;
getwc;
getwchar;
@ -987,7 +985,6 @@ LIBC {
setstate;
settimeofday;
setuid;
setusershell;
setutent;
setvbuf;
setxattr;

3
libc/libc.mips64.map
View File

@ -243,7 +243,6 @@ LIBC {
endmntent;
endpwent;
endservent;
endusershell;
endutent;
environ;
epoll_create;
@ -428,7 +427,6 @@ LIBC {
gettid;
gettimeofday;
getuid;
getusershell;
getutent;
getwc;
getwchar;
@ -881,7 +879,6 @@ LIBC {
setstate;
settimeofday;
setuid;
setusershell;
setutent;
setvbuf;
setxattr;

3
libc/libc.x86.map
View File

@ -347,7 +347,6 @@ LIBC {
endmntent;
endpwent;
endservent;
endusershell;
endutent;
environ;
epoll_create;
@ -538,7 +537,6 @@ LIBC {
gettid;
gettimeofday;
getuid;
getusershell;
getutent;
getwc;
getwchar;
@ -985,7 +983,6 @@ LIBC {
setstate;
settimeofday;
setuid;
setusershell;
setutent;
setvbuf;
setxattr;

3
libc/libc.x86_64.map
View File

@ -243,7 +243,6 @@ LIBC {
endmntent;
endpwent;
endservent;
endusershell;
endutent;
environ;
epoll_create;
@ -428,7 +427,6 @@ LIBC {
gettid;
gettimeofday;
getuid;
getusershell;
getutent;
getwc;
getwchar;
@ -881,7 +879,6 @@ LIBC {
setstate;
settimeofday;
setuid;
setusershell;
setutent;
setvbuf;
setxattr;

12
libm/Android.mk
View File

@ -525,12 +525,12 @@ LOCAL_ADDITIONAL_DEPENDENCIES := \
LOCAL_LDFLAGS_arm := -Wl,--hash-style=both
LOCAL_LDFLAGS_x86 := -Wl,--hash-style=both
LOCAL_LDFLAGS_arm := -Wl,--version-script,$(LOCAL_PATH)/libm.arm.map
LOCAL_LDFLAGS_arm64 := -Wl,--version-script,$(LOCAL_PATH)/libm.arm64.map
LOCAL_LDFLAGS_mips := -Wl,--version-script,$(LOCAL_PATH)/libm.mips.map
LOCAL_LDFLAGS_mips64 := -Wl,--version-script,$(LOCAL_PATH)/libm.mips64.map
LOCAL_LDFLAGS_x86 := -Wl,--version-script,$(LOCAL_PATH)/libm.x86.map
LOCAL_LDFLAGS_x86_64 := -Wl,--version-script,$(LOCAL_PATH)/libm.x86_64.map
LOCAL_LDFLAGS_arm += -Wl,--version-script,$(LOCAL_PATH)/libm.arm.map
LOCAL_LDFLAGS_arm64 += -Wl,--version-script,$(LOCAL_PATH)/libm.arm64.map
LOCAL_LDFLAGS_mips += -Wl,--version-script,$(LOCAL_PATH)/libm.mips.map
LOCAL_LDFLAGS_mips64 += -Wl,--version-script,$(LOCAL_PATH)/libm.mips64.map
LOCAL_LDFLAGS_x86 += -Wl,--version-script,$(LOCAL_PATH)/libm.x86.map
LOCAL_LDFLAGS_x86_64 += -Wl,--version-script,$(LOCAL_PATH)/libm.x86_64.map
LOCAL_MODULE := libm