diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux/x86_64')
-rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/64/libc.abilist | 12 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/cancellation.S | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/libc-lowlevellock.S | 6 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist | 12 |
4 files changed, 31 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist index 914b5908f0..56d1fe0aec 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist @@ -377,6 +377,15 @@ GLIBC_2.2.5 __profile_frequency F __progname D 0x8 __progname_full D 0x8 + __pthread_getspecific F + __pthread_key_create F + __pthread_mutex_lock F + __pthread_mutex_unlock F + __pthread_once F + __pthread_rwlock_rdlock F + __pthread_rwlock_unlock F + __pthread_rwlock_wrlock F + __pthread_setspecific F __pwrite64 F __rawmemchr F __rcmd_errstr D 0x8 @@ -527,6 +536,8 @@ GLIBC_2.2.5 _obstack_free F _obstack_memory_used F _obstack_newchunk F + _pthread_cleanup_pop_restore F + _pthread_cleanup_push_defer F _res D 0x238 _res_hconf D 0x48 _rpc_dtablesize F @@ -1299,6 +1310,7 @@ GLIBC_2.2.5 pthread_mutex_init F pthread_mutex_lock F pthread_mutex_unlock F + pthread_once F pthread_self F pthread_setcancelstate F pthread_setcanceltype F diff --git a/sysdeps/unix/sysv/linux/x86_64/cancellation.S b/sysdeps/unix/sysv/linux/x86_64/cancellation.S index 4c34bebc42..52a27dcc5e 100644 --- a/sysdeps/unix/sysv/linux/x86_64/cancellation.S +++ b/sysdeps/unix/sysv/linux/x86_64/cancellation.S @@ -26,7 +26,7 @@ # define __pthread_unwind __GI___pthread_unwind # endif #else -# ifndef SHARED +# if !defined SHARED && !defined HAVE_ASM_SECONDARY_DIRECTIVE .weak __pthread_unwind # endif #endif diff --git a/sysdeps/unix/sysv/linux/x86_64/libc-lowlevellock.S b/sysdeps/unix/sysv/linux/x86_64/libc-lowlevellock.S index 111e9c88ed..cf3f206445 100644 --- a/sysdeps/unix/sysv/linux/x86_64/libc-lowlevellock.S +++ b/sysdeps/unix/sysv/linux/x86_64/libc-lowlevellock.S @@ -16,4 +16,10 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ +#if IS_IN (libc) && !defined SHARED +/* Allow libpthread.a to override the ones in libc.a. */ + weak_extern (__lll_lock_wait_private) + weak_extern (__lll_unlock_wake_private) +#endif + #include "lowlevellock.S" diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist index 0f64c8d20f..dacadc0155 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist @@ -341,6 +341,15 @@ GLIBC_2.16 __profile_frequency F __progname D 0x4 __progname_full D 0x4 + __pthread_getspecific F + __pthread_key_create F + __pthread_mutex_lock F + __pthread_mutex_unlock F + __pthread_once F + __pthread_rwlock_rdlock F + __pthread_rwlock_unlock F + __pthread_rwlock_wrlock F + __pthread_setspecific F __ptsname_r_chk F __pwrite64 F __rawmemchr F @@ -543,6 +552,8 @@ GLIBC_2.16 _obstack_free F _obstack_memory_used F _obstack_newchunk F + _pthread_cleanup_pop_restore F + _pthread_cleanup_push_defer F _res D 0x200 _res_hconf D 0x30 _rpc_dtablesize F @@ -1448,6 +1459,7 @@ GLIBC_2.16 pthread_mutex_init F pthread_mutex_lock F pthread_mutex_unlock F + pthread_once F pthread_self F pthread_setcancelstate F pthread_setcanceltype F |