Merge "Revert "Temporary apply LIBC version to __pthread_gettid""
This commit is contained in:
commit
a42483baad
|
@ -340,17 +340,10 @@ size_t dlmalloc_usable_size(void* ptr) {
|
|||
}
|
||||
|
||||
// In L we added a public pthread_gettid_np, but some apps were using the private API.
|
||||
pid_t __pthread_gettid_libc(pthread_t t) {
|
||||
pid_t __pthread_gettid(pthread_t t) {
|
||||
return pthread_gettid_np(t);
|
||||
}
|
||||
|
||||
pid_t __pthread_gettid_libc_private(pthread_t t) {
|
||||
return pthread_gettid_np(t);
|
||||
}
|
||||
|
||||
__asm__(".symver __pthread_gettid_libc,__pthread_gettid@LIBC");
|
||||
__asm__(".symver __pthread_gettid_libc_private,__pthread_gettid@@LIBC_PRIVATE");
|
||||
|
||||
// Older versions of apportable used dlmalloc directly instead of malloc,
|
||||
// so export this compatibility shim that simply calls malloc.
|
||||
void* dlmalloc(size_t size) {
|
||||
|
|
|
@ -122,7 +122,6 @@ LIBC {
|
|||
__pselect6; # arm x86 mips
|
||||
__pthread_cleanup_pop;
|
||||
__pthread_cleanup_push;
|
||||
__pthread_gettid; # arm x86 mips nobrillo
|
||||
__ptrace; # arm x86 mips
|
||||
__putlong;
|
||||
__putshort;
|
||||
|
|
|
@ -123,7 +123,6 @@ LIBC {
|
|||
__pselect6; # arm x86 mips
|
||||
__pthread_cleanup_pop;
|
||||
__pthread_cleanup_push;
|
||||
__pthread_gettid; # arm x86 mips nobrillo
|
||||
__ptrace; # arm x86 mips
|
||||
__putlong;
|
||||
__putshort;
|
||||
|
|
|
@ -120,7 +120,6 @@ LIBC {
|
|||
__pselect6; # arm x86 mips
|
||||
__pthread_cleanup_pop;
|
||||
__pthread_cleanup_push;
|
||||
__pthread_gettid; # arm x86 mips nobrillo
|
||||
__ptrace; # arm x86 mips
|
||||
__putlong;
|
||||
__putshort;
|
||||
|
|
|
@ -120,7 +120,6 @@ LIBC {
|
|||
__pselect6; # arm x86 mips
|
||||
__pthread_cleanup_pop;
|
||||
__pthread_cleanup_push;
|
||||
__pthread_gettid; # arm x86 mips nobrillo
|
||||
__ptrace; # arm x86 mips
|
||||
__putlong;
|
||||
__putshort;
|
||||
|
|
Loading…
Reference in New Issue