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/sparc/sparc32/libc.abilist | 5 +++++ sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist | 3 --- sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist | 5 +++++ sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist | 3 --- 4 files changed, 10 insertions(+), 6 deletions(-) (limited to 'sysdeps/unix/sysv/linux/sparc') diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist index 463845a..0267084 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist @@ -198,6 +198,7 @@ GLIBC_2.0 __pthread_mutex_trylock F GLIBC_2.0 __pthread_mutex_unlock F GLIBC_2.0 __pthread_mutexattr_destroy F GLIBC_2.0 __pthread_mutexattr_init F +GLIBC_2.0 __pthread_mutexattr_settype F GLIBC_2.0 __pthread_once F GLIBC_2.0 __pthread_setspecific F GLIBC_2.0 __rcmd_errstr D 0x4 @@ -890,6 +891,7 @@ GLIBC_2.0 pthread_mutex_unlock F GLIBC_2.0 pthread_mutexattr_destroy F GLIBC_2.0 pthread_mutexattr_getkind_np F GLIBC_2.0 pthread_mutexattr_init F +GLIBC_2.0 pthread_mutexattr_setkind_np F GLIBC_2.0 pthread_once F GLIBC_2.0 pthread_self F GLIBC_2.0 pthread_setcancelstate F @@ -1568,6 +1570,7 @@ GLIBC_2.1 printf_size F GLIBC_2.1 printf_size_info F GLIBC_2.1 pthread_attr_init F GLIBC_2.1 pthread_mutexattr_gettype F +GLIBC_2.1 pthread_mutexattr_settype F GLIBC_2.1 pthread_rwlock_rdlock F GLIBC_2.1 pthread_rwlock_unlock F GLIBC_2.1 pthread_rwlock_wrlock F @@ -2264,6 +2267,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 @@ -2289,6 +2293,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/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist index 4cbea0f..ad49b0f 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist @@ -3,7 +3,6 @@ GLIBC_2.0 _IO_ftrylockfile F GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F GLIBC_2.0 __h_errno_location F -GLIBC_2.0 __pthread_mutexattr_settype F GLIBC_2.0 flockfile F GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F @@ -11,7 +10,6 @@ GLIBC_2.0 pthread_cancel F GLIBC_2.0 pthread_create F GLIBC_2.0 pthread_detach F GLIBC_2.0 pthread_join F -GLIBC_2.0 pthread_mutexattr_setkind_np F GLIBC_2.0 pthread_testcancel F GLIBC_2.0 sem_destroy F GLIBC_2.0 sem_getvalue F @@ -27,7 +25,6 @@ GLIBC_2.1 pthread_attr_setstackaddr F GLIBC_2.1 pthread_attr_setstacksize F GLIBC_2.1 pthread_create F GLIBC_2.1 pthread_getconcurrency F -GLIBC_2.1 pthread_mutexattr_settype F GLIBC_2.1 pthread_rwlock_destroy F GLIBC_2.1 pthread_rwlock_init F GLIBC_2.1 pthread_rwlock_tryrdlock F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist index eaf8e1d..ef32c4e 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist @@ -408,6 +408,7 @@ GLIBC_2.2 __pthread_mutex_trylock F GLIBC_2.2 __pthread_mutex_unlock F GLIBC_2.2 __pthread_mutexattr_destroy F GLIBC_2.2 __pthread_mutexattr_init F +GLIBC_2.2 __pthread_mutexattr_settype F GLIBC_2.2 __pthread_once F GLIBC_2.2 __pthread_rwlock_rdlock F GLIBC_2.2 __pthread_rwlock_unlock F @@ -1351,7 +1352,9 @@ GLIBC_2.2 pthread_mutexattr_getkind_np F GLIBC_2.2 pthread_mutexattr_getpshared F GLIBC_2.2 pthread_mutexattr_gettype F GLIBC_2.2 pthread_mutexattr_init F +GLIBC_2.2 pthread_mutexattr_setkind_np F GLIBC_2.2 pthread_mutexattr_setpshared F +GLIBC_2.2 pthread_mutexattr_settype F GLIBC_2.2 pthread_once F GLIBC_2.2 pthread_rwlock_rdlock F GLIBC_2.2 pthread_rwlock_unlock F @@ -2183,6 +2186,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 @@ -2208,6 +2212,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/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist index e17660f..fa70e3e 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist @@ -8,7 +8,6 @@ GLIBC_2.2 _IO_ftrylockfile F GLIBC_2.2 _IO_funlockfile F GLIBC_2.2 __errno_location F GLIBC_2.2 __h_errno_location F -GLIBC_2.2 __pthread_mutexattr_settype F GLIBC_2.2 __pthread_rwlock_destroy F GLIBC_2.2 __pthread_rwlock_init F GLIBC_2.2 __pthread_rwlock_tryrdlock F @@ -39,8 +38,6 @@ GLIBC_2.2 pthread_detach F GLIBC_2.2 pthread_getconcurrency F GLIBC_2.2 pthread_getcpuclockid F GLIBC_2.2 pthread_join F -GLIBC_2.2 pthread_mutexattr_setkind_np F -GLIBC_2.2 pthread_mutexattr_settype F GLIBC_2.2 pthread_rwlock_destroy F GLIBC_2.2 pthread_rwlock_init F GLIBC_2.2 pthread_rwlock_timedrdlock F -- cgit v1.1