diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-05-03 08:12:11 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-05-03 08:15:22 +0200 |
| commit | f44c9a24edf0dff4fd76562975533d58c1cd6dd4 (patch) | |
| tree | 196eb57d4feb0faca29e34dbb413c76cb4c761b6 /sysdeps/unix/sysv/linux/riscv | |
| parent | 17b67416c5ea65507c9b32aec1928afc88569eb2 (diff) | |
| download | glibc-f44c9a24edf0dff4fd76562975533d58c1cd6dd4.tar glibc-f44c9a24edf0dff4fd76562975533d58c1cd6dd4.tar.gz glibc-f44c9a24edf0dff4fd76562975533d58c1cd6dd4.tar.bz2 glibc-f44c9a24edf0dff4fd76562975533d58c1cd6dd4.zip | |
nptl: Move mtx_init into libc
The symbol was moved using scripts/move-symbol-to-libc.py.
The calls to __pthread_mutex_init, __pthread_mutexattr_init,
__pthread_mutexattr_settype are now private and no longer need
to be exported. This allows the removal of the newly added
GLIBC_2.34 symbol versions for those functions.
Also clean up some weak declarations in <libc-lockP.h> for
these functions. They are not needed and potentially incorrect
for static linking of mtx_init.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'sysdeps/unix/sysv/linux/riscv')
4 files changed, 4 insertions, 8 deletions
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist index 0bcd294c6d..b5b6bea53b 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist @@ -1266,6 +1266,7 @@ GLIBC_2.33 msgsnd F GLIBC_2.33 msync F GLIBC_2.33 mtrace F GLIBC_2.33 mtx_destroy F +GLIBC_2.33 mtx_init F GLIBC_2.33 munlock F GLIBC_2.33 munlockall F GLIBC_2.33 munmap F @@ -2009,12 +2010,9 @@ GLIBC_2.34 __libc_start_main F GLIBC_2.34 __pthread_cleanup_routine F GLIBC_2.34 __pthread_getspecific F GLIBC_2.34 __pthread_key_create F -GLIBC_2.34 __pthread_mutex_init F 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_setspecific F GLIBC_2.34 __pthread_unwind_next F GLIBC_2.34 call_once F @@ -2025,6 +2023,7 @@ GLIBC_2.34 cnd_signal F GLIBC_2.34 cnd_timedwait F GLIBC_2.34 cnd_wait F GLIBC_2.34 mtx_destroy F +GLIBC_2.34 mtx_init F GLIBC_2.34 pthread_cond_clockwait F GLIBC_2.34 pthread_condattr_getclock F GLIBC_2.34 pthread_condattr_getpshared F diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist index 899cdd8dac..e8fbf99ba0 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist @@ -13,7 +13,6 @@ GLIBC_2.33 __pthread_unregister_cancel_restore F GLIBC_2.33 flockfile F GLIBC_2.33 ftrylockfile F GLIBC_2.33 funlockfile F -GLIBC_2.33 mtx_init F GLIBC_2.33 mtx_lock F GLIBC_2.33 mtx_timedlock F GLIBC_2.33 mtx_trylock F diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist index c03a324ab9..da0a49ebb8 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist @@ -2168,6 +2168,7 @@ GLIBC_2.28 cnd_timedwait F GLIBC_2.28 cnd_wait F GLIBC_2.28 fcntl64 F GLIBC_2.28 mtx_destroy F +GLIBC_2.28 mtx_init F GLIBC_2.28 renameat2 F GLIBC_2.28 statx F GLIBC_2.28 thrd_current F @@ -2209,12 +2210,9 @@ GLIBC_2.34 __libc_start_main F GLIBC_2.34 __pthread_cleanup_routine F GLIBC_2.34 __pthread_getspecific F GLIBC_2.34 __pthread_key_create F -GLIBC_2.34 __pthread_mutex_init F 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_setspecific F GLIBC_2.34 __pthread_unwind_next F GLIBC_2.34 call_once F @@ -2225,6 +2223,7 @@ GLIBC_2.34 cnd_signal F GLIBC_2.34 cnd_timedwait F GLIBC_2.34 cnd_wait F GLIBC_2.34 mtx_destroy F +GLIBC_2.34 mtx_init F GLIBC_2.34 pthread_cond_clockwait F GLIBC_2.34 pthread_condattr_getclock F GLIBC_2.34 pthread_condattr_getpshared F diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist index 0f611f2217..880a5ca8a6 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist @@ -69,7 +69,6 @@ GLIBC_2.27 sem_timedwait F GLIBC_2.27 sem_trywait F GLIBC_2.27 sem_unlink F GLIBC_2.27 sem_wait F -GLIBC_2.28 mtx_init F GLIBC_2.28 mtx_lock F GLIBC_2.28 mtx_timedlock F GLIBC_2.28 mtx_trylock F |