tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Remove remaining ndk_cruft from LP64 platforms"

Browse source 
This reverts commit b1d0a2ae77.

Change-Id: I1da06be0b78a4f2a4cad7e4a19a3ee755f55a813
This commit is contained in:
Dimitry Ivanov 2015-12-15 01:34:14 +00:00
parent b1d0a2ae77
commit 23af25b747
12 changed files with 3591 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libc/Android.mk
View file

@ -1387,8 +1387,11 @@ LOCAL_ADDITIONAL_DEPENDENCIES := \
$(LOCAL_PATH)/libc.x86.map \ $(LOCAL_PATH)/libc.x86.map \
$(LOCAL_PATH)/libc.x86_64.map \ $(LOCAL_PATH)/libc.x86_64.map \
$(LOCAL_PATH)/libc.arm.brillo.map \ $(LOCAL_PATH)/libc.arm.brillo.map \
$(LOCAL_PATH)/libc.arm64.brillo.map \
$(LOCAL_PATH)/libc.mips.brillo.map \ $(LOCAL_PATH)/libc.mips.brillo.map \
$(LOCAL_PATH)/libc.mips64.brillo.map \
$(LOCAL_PATH)/libc.x86.brillo.map \ $(LOCAL_PATH)/libc.x86.brillo.map \
$(LOCAL_PATH)/libc.x86_64.brillo.map \
# Leave the symbols in the shared library so that stack unwinders can produce # Leave the symbols in the shared library so that stack unwinders can produce
# meaningful name resolution. # meaningful name resolution.
@ -1424,15 +1427,17 @@ ifdef BRILLO
LOCAL_LDFLAGS_arm += -Wl,--version-script,$(LOCAL_PATH)/libc.arm.brillo.map LOCAL_LDFLAGS_arm += -Wl,--version-script,$(LOCAL_PATH)/libc.arm.brillo.map
LOCAL_LDFLAGS_mips += -Wl,--version-script,$(LOCAL_PATH)/libc.mips.brillo.map LOCAL_LDFLAGS_mips += -Wl,--version-script,$(LOCAL_PATH)/libc.mips.brillo.map
LOCAL_LDFLAGS_x86 += -Wl,--version-script,$(LOCAL_PATH)/libc.x86.brillo.map LOCAL_LDFLAGS_x86 += -Wl,--version-script,$(LOCAL_PATH)/libc.x86.brillo.map
LOCAL_LDFLAGS_arm64 += -Wl,--version-script,$(LOCAL_PATH)/libc.arm64.brillo.map
LOCAL_LDFLAGS_mips64 += -Wl,--version-script,$(LOCAL_PATH)/libc.mips64.brillo.map
LOCAL_LDFLAGS_x86_64 += -Wl,--version-script,$(LOCAL_PATH)/libc.x86_64.brillo.map
else else
LOCAL_LDFLAGS_arm += -Wl,--version-script,$(LOCAL_PATH)/libc.arm.map LOCAL_LDFLAGS_arm += -Wl,--version-script,$(LOCAL_PATH)/libc.arm.map
LOCAL_LDFLAGS_mips += -Wl,--version-script,$(LOCAL_PATH)/libc.mips.map LOCAL_LDFLAGS_mips += -Wl,--version-script,$(LOCAL_PATH)/libc.mips.map
LOCAL_LDFLAGS_x86 += -Wl,--version-script,$(LOCAL_PATH)/libc.x86.map LOCAL_LDFLAGS_x86 += -Wl,--version-script,$(LOCAL_PATH)/libc.x86.map
endif
LOCAL_LDFLAGS_arm64 += -Wl,--version-script,$(LOCAL_PATH)/libc.arm64.map LOCAL_LDFLAGS_arm64 += -Wl,--version-script,$(LOCAL_PATH)/libc.arm64.map
LOCAL_LDFLAGS_mips64 += -Wl,--version-script,$(LOCAL_PATH)/libc.mips64.map LOCAL_LDFLAGS_mips64 += -Wl,--version-script,$(LOCAL_PATH)/libc.mips64.map
LOCAL_LDFLAGS_x86_64 += -Wl,--version-script,$(LOCAL_PATH)/libc.x86_64.map LOCAL_LDFLAGS_x86_64 += -Wl,--version-script,$(LOCAL_PATH)/libc.x86_64.map
endif
# We'd really like to do this for all architectures, but since this wasn't done # 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 # before, these symbols must continue to be exported on LP32 for binary

11
libc/bionic/ndk_cruft.cpp
View file

@ -49,8 +49,11 @@
extern "C" { extern "C" {
// Brillo and LP64 don't need to support any legacy cruft. // Brillo doesn't need to support any legacy cruft.
#if !defined(__BRILLO__) && !defined(__LP64__) #if !defined(__BRILLO__)
// Most of the cruft is only for 32-bit Android targets.
#if !defined(__LP64__)
// These were accidentally declared in <unistd.h> because we stupidly used to inline // These were accidentally declared in <unistd.h> because we stupidly used to inline
// getpagesize() and __getpageshift(). Needed for backwards compatibility with old NDK apps. // getpagesize() and __getpageshift(). Needed for backwards compatibility with old NDK apps.
@ -364,6 +367,8 @@ long __set_errno(int n) {
return __set_errno_internal(n); return __set_errno_internal(n);
} }
#endif // !defined(__LP64__)
// This was never implemented in bionic, only needed for ABI compatibility with the NDK. // This was never implemented in bionic, only needed for ABI compatibility with the NDK.
// In the M time frame, over 1000 apps have a reference to this! // In the M time frame, over 1000 apps have a reference to this!
void endpwent() { } void endpwent() { }
@ -387,6 +392,6 @@ int dlmalloc_trim(size_t pad) {
} }
#endif #endif
#endif // !defined(__BRILLO__) && !defined (__LP64__) #endif // !defined(__BRILLO__)
} // extern "C" } // extern "C"

6
libc/libc.arm.map
View file

@ -383,7 +383,7 @@ LIBC {
dup3; dup3;
duplocale; duplocale;
endmntent; endmntent;
endpwent; # arm x86 mips nobrillo endpwent; # arm arm64 x86 x86_64 mips mips64 nobrillo
endservent; endservent;
endutent; endutent;
environ; environ;
@ -1447,8 +1447,8 @@ LIBC_PRIVATE {
_Unwind_VRS_Set; # arm _Unwind_VRS_Set; # arm
atexit; # arm atexit; # arm
dlmalloc; # arm x86 mips nobrillo dlmalloc; # arm x86 mips nobrillo
dlmalloc_inspect_all; # arm x86 mips nobrillo dlmalloc_inspect_all; # arm arm64 x86 x86_64 mips mips64 nobrillo
dlmalloc_trim; # arm x86 mips nobrillo dlmalloc_trim; # arm arm64 x86 x86_64 mips mips64 nobrillo
dlmalloc_usable_size; # arm x86 mips nobrillo dlmalloc_usable_size; # arm x86 mips nobrillo
gMallocLeakZygoteChild; gMallocLeakZygoteChild;
SHA1Final; # arm x86 mips SHA1Final; # arm x86 mips

1185
libc/libc.arm64.brillo.map Normal file
View file

File diff suppressed because it is too large Load diff

3
libc/libc.arm64.map
View file

@ -241,6 +241,7 @@ LIBC {
dup3; dup3;
duplocale; duplocale;
endmntent; endmntent;
endpwent; # arm arm64 x86 x86_64 mips mips64 nobrillo
endservent; endservent;
endutent; endutent;
environ; environ;
@ -1181,5 +1182,7 @@ LIBC_N {
LIBC_PRIVATE { LIBC_PRIVATE {
global: global:
dlmalloc_inspect_all; # arm arm64 x86 x86_64 mips mips64 nobrillo
dlmalloc_trim; # arm arm64 x86 x86_64 mips mips64 nobrillo
gMallocLeakZygoteChild; gMallocLeakZygoteChild;
} LIBC_N; } LIBC_N;

6
libc/libc.map.txt
View file

@ -387,7 +387,7 @@ LIBC {
dup3; dup3;
duplocale; duplocale;
endmntent; endmntent;
endpwent; # arm x86 mips nobrillo endpwent; # arm arm64 x86 x86_64 mips mips64 nobrillo
endservent; endservent;
endutent; endutent;
environ; environ;
@ -1474,8 +1474,8 @@ LIBC_PRIVATE {
_Unwind_VRS_Set; # arm _Unwind_VRS_Set; # arm
atexit; # arm atexit; # arm
dlmalloc; # arm x86 mips nobrillo dlmalloc; # arm x86 mips nobrillo
dlmalloc_inspect_all; # arm x86 mips nobrillo dlmalloc_inspect_all; # arm arm64 x86 x86_64 mips mips64 nobrillo
dlmalloc_trim; # arm x86 mips nobrillo dlmalloc_trim; # arm arm64 x86 x86_64 mips mips64 nobrillo
dlmalloc_usable_size; # arm x86 mips nobrillo dlmalloc_usable_size; # arm x86 mips nobrillo
gMallocLeakZygoteChild; gMallocLeakZygoteChild;
SHA1Final; # arm x86 mips SHA1Final; # arm x86 mips

6
libc/libc.mips.map
View file

@ -347,7 +347,7 @@ LIBC {
dup3; dup3;
duplocale; duplocale;
endmntent; endmntent;
endpwent; # arm x86 mips nobrillo endpwent; # arm arm64 x86 x86_64 mips mips64 nobrillo
endservent; endservent;
endutent; endutent;
environ; environ;
@ -1303,8 +1303,8 @@ LIBC_PRIVATE {
__accept4; # arm x86 mips __accept4; # arm x86 mips
__bionic_brk; # arm x86 mips __bionic_brk; # arm x86 mips
dlmalloc; # arm x86 mips nobrillo dlmalloc; # arm x86 mips nobrillo
dlmalloc_inspect_all; # arm x86 mips nobrillo dlmalloc_inspect_all; # arm arm64 x86 x86_64 mips mips64 nobrillo
dlmalloc_trim; # arm x86 mips nobrillo dlmalloc_trim; # arm arm64 x86 x86_64 mips mips64 nobrillo
dlmalloc_usable_size; # arm x86 mips nobrillo dlmalloc_usable_size; # arm x86 mips nobrillo
gMallocLeakZygoteChild; gMallocLeakZygoteChild;
SHA1Final; # arm x86 mips SHA1Final; # arm x86 mips

1185
libc/libc.mips64.brillo.map Normal file
View file

File diff suppressed because it is too large Load diff

3
libc/libc.mips64.map
View file

@ -241,6 +241,7 @@ LIBC {
dup3; dup3;
duplocale; duplocale;
endmntent; endmntent;
endpwent; # arm arm64 x86 x86_64 mips mips64 nobrillo
endservent; endservent;
endutent; endutent;
environ; environ;
@ -1181,5 +1182,7 @@ LIBC_N {
LIBC_PRIVATE { LIBC_PRIVATE {
global: global:
dlmalloc_inspect_all; # arm arm64 x86 x86_64 mips mips64 nobrillo
dlmalloc_trim; # arm arm64 x86 x86_64 mips mips64 nobrillo
gMallocLeakZygoteChild; gMallocLeakZygoteChild;
} LIBC_N; } LIBC_N;

6
libc/libc.x86.map
View file

@ -345,7 +345,7 @@ LIBC {
dup3; dup3;
duplocale; duplocale;
endmntent; endmntent;
endpwent; # arm x86 mips nobrillo endpwent; # arm arm64 x86 x86_64 mips mips64 nobrillo
endservent; endservent;
endutent; endutent;
environ; environ;
@ -1302,8 +1302,8 @@ LIBC_PRIVATE {
__bionic_brk; # arm x86 mips __bionic_brk; # arm x86 mips
__bionic_libgcc_compat_symbols; # arm x86 __bionic_libgcc_compat_symbols; # arm x86
dlmalloc; # arm x86 mips nobrillo dlmalloc; # arm x86 mips nobrillo
dlmalloc_inspect_all; # arm x86 mips nobrillo dlmalloc_inspect_all; # arm arm64 x86 x86_64 mips mips64 nobrillo
dlmalloc_trim; # arm x86 mips nobrillo dlmalloc_trim; # arm arm64 x86 x86_64 mips mips64 nobrillo
dlmalloc_usable_size; # arm x86 mips nobrillo dlmalloc_usable_size; # arm x86 mips nobrillo
gMallocLeakZygoteChild; gMallocLeakZygoteChild;
SHA1Final; # arm x86 mips SHA1Final; # arm x86 mips

1185
libc/libc.x86_64.brillo.map Normal file
View file

File diff suppressed because it is too large Load diff

3
libc/libc.x86_64.map
View file

@ -241,6 +241,7 @@ LIBC {
dup3; dup3;
duplocale; duplocale;
endmntent; endmntent;
endpwent; # arm arm64 x86 x86_64 mips mips64 nobrillo
endservent; endservent;
endutent; endutent;
environ; environ;
@ -1181,5 +1182,7 @@ LIBC_N {
LIBC_PRIVATE { LIBC_PRIVATE {
global: global:
dlmalloc_inspect_all; # arm arm64 x86 x86_64 mips mips64 nobrillo
dlmalloc_trim; # arm arm64 x86 x86_64 mips mips64 nobrillo
gMallocLeakZygoteChild; gMallocLeakZygoteChild;
} LIBC_N; } LIBC_N;