From f44c9a24edf0dff4fd76562975533d58c1cd6dd4 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 3 May 2021 08:12:11 +0200 Subject: 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 for these functions. They are not needed and potentially incorrect for static linking of mtx_init. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist | 5 ++--- sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist | 5 ++--- sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist | 1 - 4 files changed, 4 insertions(+), 8 deletions(-) (limited to 'sysdeps/unix/sysv/linux/m68k') diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist index 00f92af83c..80ab210444 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist @@ -129,6 +129,7 @@ GLIBC_2.28 cnd_wait F GLIBC_2.28 fcntl 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 @@ -173,12 +174,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 @@ -189,6 +187,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/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist index ce54e903a4..4fc51e55c5 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist @@ -3,7 +3,6 @@ GLIBC_2.12 pthread_getname_np F GLIBC_2.12 pthread_setname_np F GLIBC_2.18 pthread_getattr_default_np F GLIBC_2.18 pthread_setattr_default_np 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 diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist index 6c0537be6e..80eacfcd27 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist @@ -2056,6 +2056,7 @@ GLIBC_2.28 cnd_wait F GLIBC_2.28 fcntl 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 @@ -2262,12 +2263,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 @@ -2278,6 +2276,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/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist index 54e0db13d2..2861f052b0 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist @@ -69,7 +69,6 @@ GLIBC_2.2 pthread_yield F GLIBC_2.2 sem_timedwait F GLIBC_2.2.3 __libpthread_version_placeholder F GLIBC_2.2.6 __libpthread_version_placeholder 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 -- cgit 1.4.1