From b76c066d092d78124deeba9b687f5b10924e97de Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 23 Apr 2021 09:49:00 +0200 Subject: nptl: Move pthread_mutexattr_settype, __pthread_mutexattr_settype into libc And pthread_mutexattr_setkind_np as a compatibility symbol. __pthread_mutexattr_settype is used in mtx_init from libpthread, so this commit adds a GLIBC_2.34 symbol version for it. The symbols were moved using scripts/move-symbol-to-libc.py. --- sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist | 5 +++++ sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'sysdeps/unix/sysv/linux/x86_64/x32') diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist index 94392513d6..26b781c501 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist @@ -349,6 +349,7 @@ GLIBC_2.16 __pthread_mutex_trylock F GLIBC_2.16 __pthread_mutex_unlock F GLIBC_2.16 __pthread_mutexattr_destroy F GLIBC_2.16 __pthread_mutexattr_init F +GLIBC_2.16 __pthread_mutexattr_settype F GLIBC_2.16 __pthread_once F GLIBC_2.16 __pthread_rwlock_rdlock F GLIBC_2.16 __pthread_rwlock_unlock F @@ -1494,11 +1495,13 @@ GLIBC_2.16 pthread_mutexattr_getrobust F GLIBC_2.16 pthread_mutexattr_getrobust_np F GLIBC_2.16 pthread_mutexattr_gettype F GLIBC_2.16 pthread_mutexattr_init F +GLIBC_2.16 pthread_mutexattr_setkind_np F GLIBC_2.16 pthread_mutexattr_setprioceiling F GLIBC_2.16 pthread_mutexattr_setprotocol F GLIBC_2.16 pthread_mutexattr_setpshared F GLIBC_2.16 pthread_mutexattr_setrobust F GLIBC_2.16 pthread_mutexattr_setrobust_np F +GLIBC_2.16 pthread_mutexattr_settype F GLIBC_2.16 pthread_once F GLIBC_2.16 pthread_rwlock_rdlock F GLIBC_2.16 pthread_rwlock_unlock F @@ -2249,6 +2252,7 @@ GLIBC_2.34 __pthread_mutex_lock F GLIBC_2.34 __pthread_mutex_trylock F GLIBC_2.34 __pthread_mutex_unlock F GLIBC_2.34 __pthread_mutexattr_init F +GLIBC_2.34 __pthread_mutexattr_settype F GLIBC_2.34 __pthread_once F GLIBC_2.34 __pthread_setspecific F GLIBC_2.34 __pthread_unwind_next F @@ -2274,6 +2278,7 @@ GLIBC_2.34 pthread_mutexattr_setprioceiling F GLIBC_2.34 pthread_mutexattr_setprotocol F GLIBC_2.34 pthread_mutexattr_setpshared F GLIBC_2.34 pthread_mutexattr_setrobust F +GLIBC_2.34 pthread_mutexattr_settype F GLIBC_2.34 pthread_once F GLIBC_2.34 pthread_rwlock_rdlock F GLIBC_2.34 pthread_rwlock_unlock F diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist index 7c2828e2c9..e5f37f4340 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist @@ -3,7 +3,6 @@ GLIBC_2.16 _IO_ftrylockfile F GLIBC_2.16 _IO_funlockfile F GLIBC_2.16 __errno_location F GLIBC_2.16 __h_errno_location F -GLIBC_2.16 __pthread_mutexattr_settype F GLIBC_2.16 __pthread_register_cancel F GLIBC_2.16 __pthread_register_cancel_defer F GLIBC_2.16 __pthread_rwlock_destroy F @@ -43,8 +42,6 @@ GLIBC_2.16 pthread_getconcurrency F GLIBC_2.16 pthread_getcpuclockid F GLIBC_2.16 pthread_getname_np F GLIBC_2.16 pthread_join F -GLIBC_2.16 pthread_mutexattr_setkind_np F -GLIBC_2.16 pthread_mutexattr_settype F GLIBC_2.16 pthread_rwlock_destroy F GLIBC_2.16 pthread_rwlock_init F GLIBC_2.16 pthread_rwlock_timedrdlock F -- cgit 1.4.1