diff mbox series

[v3,35/37] nptl: Move core condition variable functions into libc

Message ID 9d340a680944b1ca85ce52c38d6e7e062e619192.1615914632.git.fweimer@redhat.com
State Superseded
Delegated to: Adhemerval Zanella Netto
Headers show
Series libpthread removal: NPTL forwarders are gone | expand

Commit Message

Florian Weimer March 16, 2021, 5:31 p.m. UTC
Onl pthread_cond_clockwait did not have a forwarder, so it needs
a new symbol version.

Some complications arise due to the need to supply hidden aliases,
GLIBC_PRIVATE exports (for the C11 condition variable implementation
that still remains in libpthread) and 64-bit time_t stubs.

pthread_cond_broadcast, pthread_cond_signal,  pthread_cond_timedwait,
pthread_cond_wait, pthread_cond_clockwait have been moved using
scripts/move-symbol-to-libc.py.
---
 nptl/Makefile                                 | 16 ++---
 nptl/Versions                                 | 19 +++---
 nptl/forward.c                                | 61 -----------------
 nptl/libpthread-compat.c                      |  5 ++
 nptl/nptl-init.c                              | 10 ---
 nptl/old_pthread_cond_broadcast.c             |  4 +-
 nptl/old_pthread_cond_signal.c                |  4 +-
 nptl/old_pthread_cond_timedwait.c             |  4 +-
 nptl/old_pthread_cond_wait.c                  |  4 +-
 nptl/pthreadP.h                               |  9 ++-
 nptl/pthread_cond_broadcast.c                 | 11 ++--
 nptl/pthread_cond_signal.c                    |  9 ++-
 nptl/pthread_cond_wait.c                      | 66 +++++++++++++------
 sysdeps/nptl/pthread-functions.h              | 11 ----
 sysdeps/unix/sysv/linux/aarch64/libc.abilist  |  2 +
 .../sysv/linux/aarch64/libpthread.abilist     |  5 --
 sysdeps/unix/sysv/linux/alpha/libc.abilist    |  2 +
 .../unix/sysv/linux/alpha/libpthread.abilist  | 10 +--
 sysdeps/unix/sysv/linux/arc/libc.abilist      |  2 +
 .../unix/sysv/linux/arc/libpthread.abilist    |  5 --
 sysdeps/unix/sysv/linux/arm/be/libc.abilist   |  2 +
 .../unix/sysv/linux/arm/be/libpthread.abilist |  5 --
 sysdeps/unix/sysv/linux/arm/le/libc.abilist   |  2 +
 .../unix/sysv/linux/arm/le/libpthread.abilist |  5 --
 sysdeps/unix/sysv/linux/csky/libc.abilist     |  2 +
 .../unix/sysv/linux/csky/libpthread.abilist   |  5 --
 sysdeps/unix/sysv/linux/hppa/libc.abilist     |  2 +
 .../unix/sysv/linux/hppa/libpthread.abilist   | 10 +--
 sysdeps/unix/sysv/linux/i386/libc.abilist     |  2 +
 .../unix/sysv/linux/i386/libpthread.abilist   | 10 +--
 sysdeps/unix/sysv/linux/ia64/libc.abilist     |  2 +
 .../unix/sysv/linux/ia64/libpthread.abilist   | 10 +--
 .../sysv/linux/m68k/coldfire/libc.abilist     |  2 +
 .../linux/m68k/coldfire/libpthread.abilist    |  5 --
 .../unix/sysv/linux/m68k/m680x0/libc.abilist  |  2 +
 .../sysv/linux/m68k/m680x0/libpthread.abilist | 10 +--
 .../sysv/linux/microblaze/be/libc.abilist     |  2 +
 .../linux/microblaze/be/libpthread.abilist    |  5 --
 .../sysv/linux/microblaze/le/libc.abilist     |  2 +
 .../linux/microblaze/le/libpthread.abilist    |  5 --
 .../sysv/linux/mips/mips32/fpu/libc.abilist   |  2 +
 .../sysv/linux/mips/mips32/libpthread.abilist | 10 +--
 .../sysv/linux/mips/mips32/nofpu/libc.abilist |  2 +
 .../sysv/linux/mips/mips64/libpthread.abilist | 10 +--
 .../sysv/linux/mips/mips64/n32/libc.abilist   |  2 +
 .../sysv/linux/mips/mips64/n64/libc.abilist   |  2 +
 sysdeps/unix/sysv/linux/nios2/libc.abilist    |  2 +
 .../unix/sysv/linux/nios2/libpthread.abilist  |  5 --
 .../linux/powerpc/powerpc32/fpu/libc.abilist  |  2 +
 .../powerpc/powerpc32/libpthread.abilist      | 10 +--
 .../powerpc/powerpc32/nofpu/libc.abilist      |  2 +
 .../linux/powerpc/powerpc64/be/libc.abilist   |  2 +
 .../powerpc/powerpc64/be/libpthread.abilist   | 10 +--
 .../linux/powerpc/powerpc64/le/libc.abilist   |  2 +
 .../powerpc/powerpc64/le/libpthread.abilist   |  5 --
 .../unix/sysv/linux/riscv/rv32/libc.abilist   |  2 +
 .../sysv/linux/riscv/rv32/libpthread.abilist  |  5 --
 .../unix/sysv/linux/riscv/rv64/libc.abilist   |  2 +
 .../sysv/linux/riscv/rv64/libpthread.abilist  |  5 --
 .../unix/sysv/linux/s390/s390-32/libc.abilist |  2 +
 .../linux/s390/s390-32/libpthread.abilist     | 10 +--
 .../unix/sysv/linux/s390/s390-64/libc.abilist |  2 +
 .../linux/s390/s390-64/libpthread.abilist     | 10 +--
 sysdeps/unix/sysv/linux/sh/be/libc.abilist    |  2 +
 .../unix/sysv/linux/sh/be/libpthread.abilist  | 10 +--
 sysdeps/unix/sysv/linux/sh/le/libc.abilist    |  2 +
 .../unix/sysv/linux/sh/le/libpthread.abilist  | 10 +--
 .../sysv/linux/sparc/sparc32/libc.abilist     |  2 +
 .../linux/sparc/sparc32/libpthread.abilist    | 10 +--
 .../sysv/linux/sparc/sparc64/libc.abilist     |  2 +
 .../linux/sparc/sparc64/libpthread.abilist    | 10 +--
 .../unix/sysv/linux/x86_64/64/libc.abilist    |  2 +
 .../sysv/linux/x86_64/64/libpthread.abilist   | 10 +--
 .../unix/sysv/linux/x86_64/x32/libc.abilist   |  2 +
 .../sysv/linux/x86_64/x32/libpthread.abilist  |  5 --
 75 files changed, 176 insertions(+), 346 deletions(-)

Comments

Adhemerval Zanella March 26, 2021, 5:14 p.m. UTC | #1
On 16/03/2021 14:31, Florian Weimer via Libc-alpha wrote:
> Onl pthread_cond_clockwait did not have a forwarder, so it needs
> a new symbol version.
> 
> Some complications arise due to the need to supply hidden aliases,
> GLIBC_PRIVATE exports (for the C11 condition variable implementation
> that still remains in libpthread) and 64-bit time_t stubs.
> 
> pthread_cond_broadcast, pthread_cond_signal,  pthread_cond_timedwait,
> pthread_cond_wait, pthread_cond_clockwait have been moved using
> scripts/move-symbol-to-libc.py.

The patch can be simplified now that compat_symbol can reference multiple
target and I think you might want to use OTHER_SHLIB_COMPAT instead of
SHLIB_COMPAT in some places.

LGTM with the changes above.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

> ---
>  nptl/Makefile                                 | 16 ++---
>  nptl/Versions                                 | 19 +++---
>  nptl/forward.c                                | 61 -----------------
>  nptl/libpthread-compat.c                      |  5 ++
>  nptl/nptl-init.c                              | 10 ---
>  nptl/old_pthread_cond_broadcast.c             |  4 +-
>  nptl/old_pthread_cond_signal.c                |  4 +-
>  nptl/old_pthread_cond_timedwait.c             |  4 +-
>  nptl/old_pthread_cond_wait.c                  |  4 +-
>  nptl/pthreadP.h                               |  9 ++-
>  nptl/pthread_cond_broadcast.c                 | 11 ++--
>  nptl/pthread_cond_signal.c                    |  9 ++-
>  nptl/pthread_cond_wait.c                      | 66 +++++++++++++------
>  sysdeps/nptl/pthread-functions.h              | 11 ----
>  sysdeps/unix/sysv/linux/aarch64/libc.abilist  |  2 +
>  .../sysv/linux/aarch64/libpthread.abilist     |  5 --
>  sysdeps/unix/sysv/linux/alpha/libc.abilist    |  2 +
>  .../unix/sysv/linux/alpha/libpthread.abilist  | 10 +--
>  sysdeps/unix/sysv/linux/arc/libc.abilist      |  2 +
>  .../unix/sysv/linux/arc/libpthread.abilist    |  5 --
>  sysdeps/unix/sysv/linux/arm/be/libc.abilist   |  2 +
>  .../unix/sysv/linux/arm/be/libpthread.abilist |  5 --
>  sysdeps/unix/sysv/linux/arm/le/libc.abilist   |  2 +
>  .../unix/sysv/linux/arm/le/libpthread.abilist |  5 --
>  sysdeps/unix/sysv/linux/csky/libc.abilist     |  2 +
>  .../unix/sysv/linux/csky/libpthread.abilist   |  5 --
>  sysdeps/unix/sysv/linux/hppa/libc.abilist     |  2 +
>  .../unix/sysv/linux/hppa/libpthread.abilist   | 10 +--
>  sysdeps/unix/sysv/linux/i386/libc.abilist     |  2 +
>  .../unix/sysv/linux/i386/libpthread.abilist   | 10 +--
>  sysdeps/unix/sysv/linux/ia64/libc.abilist     |  2 +
>  .../unix/sysv/linux/ia64/libpthread.abilist   | 10 +--
>  .../sysv/linux/m68k/coldfire/libc.abilist     |  2 +
>  .../linux/m68k/coldfire/libpthread.abilist    |  5 --
>  .../unix/sysv/linux/m68k/m680x0/libc.abilist  |  2 +
>  .../sysv/linux/m68k/m680x0/libpthread.abilist | 10 +--
>  .../sysv/linux/microblaze/be/libc.abilist     |  2 +
>  .../linux/microblaze/be/libpthread.abilist    |  5 --
>  .../sysv/linux/microblaze/le/libc.abilist     |  2 +
>  .../linux/microblaze/le/libpthread.abilist    |  5 --
>  .../sysv/linux/mips/mips32/fpu/libc.abilist   |  2 +
>  .../sysv/linux/mips/mips32/libpthread.abilist | 10 +--
>  .../sysv/linux/mips/mips32/nofpu/libc.abilist |  2 +
>  .../sysv/linux/mips/mips64/libpthread.abilist | 10 +--
>  .../sysv/linux/mips/mips64/n32/libc.abilist   |  2 +
>  .../sysv/linux/mips/mips64/n64/libc.abilist   |  2 +
>  sysdeps/unix/sysv/linux/nios2/libc.abilist    |  2 +
>  .../unix/sysv/linux/nios2/libpthread.abilist  |  5 --
>  .../linux/powerpc/powerpc32/fpu/libc.abilist  |  2 +
>  .../powerpc/powerpc32/libpthread.abilist      | 10 +--
>  .../powerpc/powerpc32/nofpu/libc.abilist      |  2 +
>  .../linux/powerpc/powerpc64/be/libc.abilist   |  2 +
>  .../powerpc/powerpc64/be/libpthread.abilist   | 10 +--
>  .../linux/powerpc/powerpc64/le/libc.abilist   |  2 +
>  .../powerpc/powerpc64/le/libpthread.abilist   |  5 --
>  .../unix/sysv/linux/riscv/rv32/libc.abilist   |  2 +
>  .../sysv/linux/riscv/rv32/libpthread.abilist  |  5 --
>  .../unix/sysv/linux/riscv/rv64/libc.abilist   |  2 +
>  .../sysv/linux/riscv/rv64/libpthread.abilist  |  5 --
>  .../unix/sysv/linux/s390/s390-32/libc.abilist |  2 +
>  .../linux/s390/s390-32/libpthread.abilist     | 10 +--
>  .../unix/sysv/linux/s390/s390-64/libc.abilist |  2 +
>  .../linux/s390/s390-64/libpthread.abilist     | 10 +--
>  sysdeps/unix/sysv/linux/sh/be/libc.abilist    |  2 +
>  .../unix/sysv/linux/sh/be/libpthread.abilist  | 10 +--
>  sysdeps/unix/sysv/linux/sh/le/libc.abilist    |  2 +
>  .../unix/sysv/linux/sh/le/libpthread.abilist  | 10 +--
>  .../sysv/linux/sparc/sparc32/libc.abilist     |  2 +
>  .../linux/sparc/sparc32/libpthread.abilist    | 10 +--
>  .../sysv/linux/sparc/sparc64/libc.abilist     |  2 +
>  .../linux/sparc/sparc64/libpthread.abilist    | 10 +--
>  .../unix/sysv/linux/x86_64/64/libc.abilist    |  2 +
>  .../sysv/linux/x86_64/64/libpthread.abilist   | 10 +--
>  .../unix/sysv/linux/x86_64/x32/libc.abilist   |  2 +
>  .../sysv/linux/x86_64/x32/libpthread.abilist  |  5 --
>  75 files changed, 176 insertions(+), 346 deletions(-)
> 
> diff --git a/nptl/Makefile b/nptl/Makefile
> index e0ba8bea13..1cf72fd5df 100644
> --- a/nptl/Makefile
> +++ b/nptl/Makefile
> @@ -47,8 +47,12 @@ routines = \
>    lowlevellock \
>    nptl_deallocate_tsd \
>    nptl_nthreads \
> +  old_pthread_cond_broadcast \
>    old_pthread_cond_destroy \
>    old_pthread_cond_init \
> +  old_pthread_cond_signal \
> +  old_pthread_cond_timedwait \
> +  old_pthread_cond_wait \
>    pthread_atfork \
>    pthread_attr_copy \
>    pthread_attr_destroy \
> @@ -69,8 +73,11 @@ routines = \
>    pthread_attr_setsigmask \
>    pthread_attr_setsigmask_internal \
>    pthread_cleanup_upto \
> +  pthread_cond_broadcast \
>    pthread_cond_destroy \
>    pthread_cond_init \
> +  pthread_cond_signal \
> +  pthread_cond_wait \
>    pthread_condattr_destroy \
>    pthread_condattr_init \
>    pthread_equal \
> @@ -82,6 +89,7 @@ routines = \
>    pthread_key_create \
>    pthread_key_delete \
>    pthread_keys \
> +  pthread_mutex_cond_lock \
>    pthread_mutex_conf \
>    pthread_mutex_consistent \
>    pthread_mutex_destroy \
> @@ -130,10 +138,6 @@ libpthread-routines = \
>    nptl-init \
>    nptlfreeres \
>    old_pthread_atfork \
> -  old_pthread_cond_broadcast \
> -  old_pthread_cond_signal \
> -  old_pthread_cond_timedwait \
> -  old_pthread_cond_wait \
>    pt-allocrtsig \
>    pt-fcntl \
>    pt-interp \
> @@ -157,9 +161,6 @@ libpthread-routines = \
>    pthread_barrierattr_setpshared \
>    pthread_cancel \
>    pthread_clockjoin \
> -  pthread_cond_broadcast \
> -  pthread_cond_signal \
> -  pthread_cond_wait \
>    pthread_condattr_getclock \
>    pthread_condattr_getpshared \
>    pthread_condattr_setclock \
> @@ -174,7 +175,6 @@ libpthread-routines = \
>    pthread_join_common \
>    pthread_kill \
>    pthread_kill_other_threads \
> -  pthread_mutex_cond_lock \
>    pthread_mutex_getprioceiling \
>    pthread_mutex_setprioceiling \
>    pthread_mutex_timedlock \

Ok.

> diff --git a/nptl/Versions b/nptl/Versions
> index 2352b74c7e..a6c8746449 100644
> --- a/nptl/Versions
> +++ b/nptl/Versions
> @@ -95,6 +95,9 @@ libc {
>      thrd_sleep;
>      thrd_yield;
>    }
> +  GLIBC_2.30 {
> +    pthread_cond_clockwait;
> +  }
>    GLIBC_2.32 {
>      pthread_attr_getsigmask_np;
>      pthread_attr_setaffinity_np;
> @@ -116,6 +119,7 @@ libc {
>      __pthread_rwlock_unlock;
>      __pthread_rwlock_wrlock;
>      __pthread_setspecific;
> +    pthread_cond_clockwait;
>      pthread_getspecific;
>      pthread_key_create;
>      pthread_key_delete;
> @@ -155,8 +159,12 @@ libc {
>      __pthread_cleanup_pop;
>      __pthread_cleanup_push;
>      __pthread_cleanup_upto;
> +    __pthread_cond_broadcast; # Used by the C11 threads.
>      __pthread_cond_destroy; # Used by the C11 threads.
>      __pthread_cond_init; # Used by the C11 threads.
> +    __pthread_cond_signal; # Used by the C11 threads.
> +    __pthread_cond_timedwait; # Used by the C11 threads.
> +    __pthread_cond_wait; # Used by the C11 threads.
>      __pthread_current_priority;
>      __pthread_exit;
>      __pthread_force_elision;

Ok.

> @@ -209,10 +217,6 @@ libpthread {
>      pause;
>      pthread_atfork;
>      pthread_cancel;
> -    pthread_cond_broadcast;
> -    pthread_cond_signal;
> -    pthread_cond_timedwait;
> -    pthread_cond_wait;
>      pthread_create;
>      pthread_detach;
>      pthread_join;
> @@ -338,11 +342,7 @@ libpthread {
>    }
>  
>    GLIBC_2.3.2 {
> -    pthread_cond_broadcast;
> -    pthread_cond_init;
> -    pthread_cond_signal;
> -    pthread_cond_timedwait;
> -    pthread_cond_wait;
> +    __libpthread_version_placeholder;
>    }
>  
>    GLIBC_2.3.3 {
> @@ -419,7 +419,6 @@ libpthread {
>    }
>  
>    GLIBC_2.30 {
> -    pthread_cond_clockwait;
>      pthread_mutex_clocklock;
>      pthread_rwlock_clockrdlock;
>      pthread_rwlock_clockwrlock;

Ok.

> diff --git a/nptl/forward.c b/nptl/forward.c
> index c914baec4f..c819ab6f2a 100644
> --- a/nptl/forward.c
> +++ b/nptl/forward.c
> @@ -29,64 +29,3 @@
>  /* Pointers to the libc functions.  */
>  struct pthread_functions __libc_pthread_functions attribute_hidden;
>  int __libc_pthread_functions_init attribute_hidden;
> -
> -
> -#define FORWARD2(name, rettype, decl, params, defaction) \
> -rettype									      \
> -name decl								      \
> -{									      \
> -  if (!__libc_pthread_functions_init)					      \
> -    defaction;								      \
> -									      \
> -  return PTHFCT_CALL (ptr_##name, params);				      \
> -}
> -
> -#define FORWARD(name, decl, params, defretval) \
> -  FORWARD2 (name, int, decl, params, return defretval)
> -
> -
> -#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
> -FORWARD2 (__pthread_cond_broadcast_2_0, int attribute_compat_text_section,
> -	  (pthread_cond_2_0_t *cond), (cond), return 0)
> -compat_symbol (libc, __pthread_cond_broadcast_2_0, pthread_cond_broadcast,
> -	       GLIBC_2_0);
> -#endif
> -FORWARD (__pthread_cond_broadcast, (pthread_cond_t *cond), (cond), 0)
> -versioned_symbol (libc, __pthread_cond_broadcast, pthread_cond_broadcast,
> -		  GLIBC_2_3_2);
> -
> -#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
> -FORWARD2 (__pthread_cond_signal_2_0, int attribute_compat_text_section,
> -	  (pthread_cond_2_0_t *cond), (cond), return 0)
> -compat_symbol (libc, __pthread_cond_signal_2_0, pthread_cond_signal,
> -	       GLIBC_2_0);
> -#endif
> -FORWARD (__pthread_cond_signal, (pthread_cond_t *cond), (cond), 0)
> -versioned_symbol (libc, __pthread_cond_signal, pthread_cond_signal,
> -		  GLIBC_2_3_2);
> -
> -#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
> -FORWARD2 (__pthread_cond_wait_2_0, int attribute_compat_text_section,
> -	  (pthread_cond_2_0_t *cond, pthread_mutex_t *mutex), (cond, mutex),
> -	  return 0)
> -compat_symbol (libc, __pthread_cond_wait_2_0, pthread_cond_wait,
> -	       GLIBC_2_0);
> -#endif
> -FORWARD (__pthread_cond_wait, (pthread_cond_t *cond, pthread_mutex_t *mutex),
> -	 (cond, mutex), 0)
> -versioned_symbol (libc, __pthread_cond_wait, pthread_cond_wait,
> -		  GLIBC_2_3_2);
> -
> -#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
> -FORWARD2 (__pthread_cond_timedwait_2_0, int attribute_compat_text_section,
> -	  (pthread_cond_2_0_t *cond, pthread_mutex_t *mutex,
> -	   const struct timespec *abstime), (cond, mutex, abstime),
> -	  return 0)
> -compat_symbol (libc, __pthread_cond_timedwait_2_0, pthread_cond_timedwait,
> -	       GLIBC_2_0);
> -#endif
> -FORWARD (__pthread_cond_timedwait,
> -	 (pthread_cond_t *cond, pthread_mutex_t *mutex,
> -	  const struct timespec *abstime), (cond, mutex, abstime), 0)
> -versioned_symbol (libc, __pthread_cond_timedwait, pthread_cond_timedwait,
> -		  GLIBC_2_3_2);

Ok.

> diff --git a/nptl/libpthread-compat.c b/nptl/libpthread-compat.c
> index 820dcd6a8f..ee6ba66644 100644
> --- a/nptl/libpthread-compat.c
> +++ b/nptl/libpthread-compat.c
> @@ -50,3 +50,8 @@ compat_symbol_unique (libpthread,
>  compat_symbol_unique (libpthread,
>  		      __libpthread_version_placeholder, GLIBC_2_2_6);
>  #endif
> +
> +#if (SHLIB_COMPAT (libpthread, GLIBC_2_3_2, GLIBC_2_3_4))
> +compat_symbol_unique (libpthread,
> +		      __libpthread_version_placeholder, GLIBC_2_3_2);
> +#endif

Use compat_symbol instead.

> diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
> index cbc9430ecb..50bc19c4e3 100644
> --- a/nptl/nptl-init.c
> +++ b/nptl/nptl-init.c
> @@ -53,16 +53,6 @@ static const char nptl_version[] __attribute_used__ = VERSION;
>  #ifdef SHARED
>  static const struct pthread_functions pthread_functions =
>    {
> -    .ptr___pthread_cond_broadcast = __pthread_cond_broadcast,
> -    .ptr___pthread_cond_signal = __pthread_cond_signal,
> -    .ptr___pthread_cond_wait = __pthread_cond_wait,
> -    .ptr___pthread_cond_timedwait = __pthread_cond_timedwait,
> -# if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
> -    .ptr___pthread_cond_broadcast_2_0 = __pthread_cond_broadcast_2_0,
> -    .ptr___pthread_cond_signal_2_0 = __pthread_cond_signal_2_0,
> -    .ptr___pthread_cond_wait_2_0 = __pthread_cond_wait_2_0,
> -    .ptr___pthread_cond_timedwait_2_0 = __pthread_cond_timedwait_2_0,
> -# endif
>      .ptr__nptl_setxid = __nptl_setxid,
>    };
>  # define ptr_pthread_functions &pthread_functions

Ok.

> diff --git a/nptl/old_pthread_cond_broadcast.c b/nptl/old_pthread_cond_broadcast.c
> index 4224ad9cf3..52dbc58ae4 100644
> --- a/nptl/old_pthread_cond_broadcast.c
> +++ b/nptl/old_pthread_cond_broadcast.c
> @@ -23,7 +23,7 @@
>  #include <shlib-compat.h>
>  
>  
> -#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
> +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
>  int
>  __pthread_cond_broadcast_2_0 (pthread_cond_2_0_t *cond)
>  {

We can not use OTHER_SHLIB_COMPAT.

> @@ -42,6 +42,6 @@ __pthread_cond_broadcast_2_0 (pthread_cond_2_0_t *cond)
>  
>    return __pthread_cond_broadcast (cond->cond);
>  }
> -compat_symbol (libpthread, __pthread_cond_broadcast_2_0,
> +compat_symbol (libc, __pthread_cond_broadcast_2_0,
>  	       pthread_cond_broadcast, GLIBC_2_0);
>  #endif

Ok.

> diff --git a/nptl/old_pthread_cond_signal.c b/nptl/old_pthread_cond_signal.c
> index bab12fd57f..38dd48ccaa 100644
> --- a/nptl/old_pthread_cond_signal.c
> +++ b/nptl/old_pthread_cond_signal.c
> @@ -23,7 +23,7 @@
>  #include <shlib-compat.h>
>  
>  
> -#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
> +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
>  int
>  __pthread_cond_signal_2_0 (pthread_cond_2_0_t *cond)
>  {

Same as before.

> @@ -42,6 +42,6 @@ __pthread_cond_signal_2_0 (pthread_cond_2_0_t *cond)
>  
>    return __pthread_cond_signal (cond->cond);
>  }
> -compat_symbol (libpthread, __pthread_cond_signal_2_0, pthread_cond_signal,
> +compat_symbol (libc, __pthread_cond_signal_2_0, pthread_cond_signal,
>  	       GLIBC_2_0);
>  #endif

Ok.

> diff --git a/nptl/old_pthread_cond_timedwait.c b/nptl/old_pthread_cond_timedwait.c
> index fdddf3072f..14ef5e7efa 100644
> --- a/nptl/old_pthread_cond_timedwait.c
> +++ b/nptl/old_pthread_cond_timedwait.c
> @@ -23,7 +23,7 @@
>  #include <shlib-compat.h>
>  
>  
> -#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
> +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
>  int
>  __pthread_cond_timedwait_2_0 (pthread_cond_2_0_t *cond, pthread_mutex_t *mutex,
>  			      const struct timespec *abstime)

Same as before.

> @@ -43,6 +43,6 @@ __pthread_cond_timedwait_2_0 (pthread_cond_2_0_t *cond, pthread_mutex_t *mutex,
>  
>    return __pthread_cond_timedwait (cond->cond, mutex, abstime);
>  }
> -compat_symbol (libpthread, __pthread_cond_timedwait_2_0,
> +compat_symbol (libc, __pthread_cond_timedwait_2_0,
>  	       pthread_cond_timedwait, GLIBC_2_0);
>  #endif

Ok.

> diff --git a/nptl/old_pthread_cond_wait.c b/nptl/old_pthread_cond_wait.c
> index 156493d6be..a45bbd89e7 100644
> --- a/nptl/old_pthread_cond_wait.c
> +++ b/nptl/old_pthread_cond_wait.c
> @@ -23,7 +23,7 @@
>  #include <shlib-compat.h>
>  
>  
> -#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
> +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
>  int
>  __pthread_cond_wait_2_0 (pthread_cond_2_0_t *cond, pthread_mutex_t *mutex)
>  {

Same as before.

> @@ -42,6 +42,6 @@ __pthread_cond_wait_2_0 (pthread_cond_2_0_t *cond, pthread_mutex_t *mutex)
>  
>    return __pthread_cond_wait (cond->cond, mutex);
>  }
> -compat_symbol (libpthread, __pthread_cond_wait_2_0, pthread_cond_wait,
> +compat_symbol (libc, __pthread_cond_wait_2_0, pthread_cond_wait,
>  	       GLIBC_2_0);
>  #endif

Ok.

> diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
> index 4feebdf09e..786c566e81 100644
> --- a/nptl/pthreadP.h
> +++ b/nptl/pthreadP.h
> @@ -457,13 +457,16 @@ libc_hidden_proto (__pthread_rwlock_wrlock)
>  extern int __pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock);
>  extern int __pthread_rwlock_unlock (pthread_rwlock_t *__rwlock);
>  extern int __pthread_cond_broadcast (pthread_cond_t *cond);
> +libc_hidden_proto (__pthread_cond_broadcast)
>  extern int __pthread_cond_destroy (pthread_cond_t *cond);
>  libc_hidden_proto (__pthread_cond_destroy)
>  extern int __pthread_cond_init (pthread_cond_t *cond,
>  				const pthread_condattr_t *cond_attr);
>  libc_hidden_proto (__pthread_cond_init)
>  extern int __pthread_cond_signal (pthread_cond_t *cond);
> +libc_hidden_proto (__pthread_cond_signal)
>  extern int __pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex);
> +libc_hidden_proto (__pthread_cond_wait)
>  
>  #if __TIMESIZE == 64
>  # define __pthread_clockjoin_np64 __pthread_clockjoin_np

Ok.

> @@ -487,12 +490,12 @@ libpthread_hidden_proto (__pthread_timedjoin_np64)
>  extern int __pthread_cond_timedwait64 (pthread_cond_t *cond,
>                                         pthread_mutex_t *mutex,
>                                         const struct __timespec64 *abstime);
> -libpthread_hidden_proto (__pthread_cond_timedwait64)
> +libc_hidden_proto (__pthread_cond_timedwait64)
>  extern int __pthread_cond_clockwait64 (pthread_cond_t *cond,
>                                         pthread_mutex_t *mutex,
>                                         clockid_t clockid,
>                                         const struct __timespec64 *abstime);
> -libpthread_hidden_proto (__pthread_cond_clockwait64)
> +libc_hidden_proto (__pthread_cond_clockwait64)
>  extern int __pthread_rwlock_clockrdlock64 (pthread_rwlock_t *rwlock,
>                                             clockid_t clockid,
>                                             const struct __timespec64 *abstime);

Ok.

> @@ -519,11 +522,13 @@ libpthread_hidden_proto (__pthread_mutex_timedlock64)
>  extern int __pthread_cond_timedwait (pthread_cond_t *cond,
>  				     pthread_mutex_t *mutex,
>  				     const struct timespec *abstime);
> +libc_hidden_proto (__pthread_cond_timedwait)
>  extern int __pthread_cond_clockwait (pthread_cond_t *cond,
>  				     pthread_mutex_t *mutex,
>  				     clockid_t clockid,
>  				     const struct timespec *abstime)
>    __nonnull ((1, 2, 4));
> +libc_hidden_proto (__pthread_cond_clockwait)
>  extern int __pthread_condattr_destroy (pthread_condattr_t *attr);
>  extern int __pthread_condattr_init (pthread_condattr_t *attr);
>  extern int __pthread_key_create (pthread_key_t *key, void (*destr) (void *));

Ok.

> diff --git a/nptl/pthread_cond_broadcast.c b/nptl/pthread_cond_broadcast.c
> index e64e124b5b..00326ad435 100644
> --- a/nptl/pthread_cond_broadcast.c
> +++ b/nptl/pthread_cond_broadcast.c
> @@ -36,7 +36,7 @@
>     G1.  We don't need to do all these steps if there are no waiters in G1
>     and/or G2.  See __pthread_cond_signal for further details.  */
>  int
> -__pthread_cond_broadcast (pthread_cond_t *cond)
> +__pthread_cond_broadcast_1 (pthread_cond_t *cond)
>  {
>    LIBC_PROBE (cond_broadcast, 1, cond);
>  
> @@ -87,6 +87,9 @@ __pthread_cond_broadcast (pthread_cond_t *cond)
>  
>    return 0;
>  }
> -
> -versioned_symbol (libpthread, __pthread_cond_broadcast, pthread_cond_broadcast,
> -		  GLIBC_2_3_2);
> +versioned_symbol (libpthread, __pthread_cond_broadcast_1,
> +		  pthread_cond_broadcast, GLIBC_2_3_2);
> +libc_hidden_ver (__pthread_cond_broadcast_1, __pthread_cond_broadcast)
> +strong_alias (__pthread_cond_broadcast_1, __pthread_cond_broadcast_2)
> +versioned_symbol (libpthread, __pthread_cond_broadcast_2,
> +		  __pthread_cond_broadcast, GLIBC_PRIVATE);

Ok. Maybe we can add the same compat_symbol support for multiple references
to versioned_symbol as well?

> diff --git a/nptl/pthread_cond_signal.c b/nptl/pthread_cond_signal.c
> index 77073342b2..88ce3811d2 100644
> --- a/nptl/pthread_cond_signal.c
> +++ b/nptl/pthread_cond_signal.c
> @@ -32,7 +32,7 @@
>  
>  /* See __pthread_cond_wait for a high-level description of the algorithm.  */
>  int
> -__pthread_cond_signal (pthread_cond_t *cond)
> +__pthread_cond_signal_1 (pthread_cond_t *cond)
>  {
>    LIBC_PROBE (cond_signal, 1, cond);
>  
> @@ -95,6 +95,9 @@ __pthread_cond_signal (pthread_cond_t *cond)
>  
>    return 0;
>  }
> -
> -versioned_symbol (libpthread, __pthread_cond_signal, pthread_cond_signal,
> +versioned_symbol (libpthread, __pthread_cond_signal_1, pthread_cond_signal,
>  		  GLIBC_2_3_2);
> +libc_hidden_ver (__pthread_cond_signal_1, __pthread_cond_signal)
> +strong_alias (__pthread_cond_signal_1, __pthread_cond_signal_2)
> +versioned_symbol (libpthread, __pthread_cond_signal_2,
> +		  __pthread_cond_signal, GLIBC_PRIVATE);

Ok.

> diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c
> index a481bb55fc..2eb6c85f4e 100644
> --- a/nptl/pthread_cond_wait.c
> +++ b/nptl/pthread_cond_wait.c
> @@ -613,16 +613,23 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
>  
>  /* See __pthread_cond_wait_common.  */
>  int
> -__pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex)
> +__pthread_cond_wait_1 (pthread_cond_t *cond, pthread_mutex_t *mutex)
>  {
>    /* clockid is unused when abstime is NULL. */
>    return __pthread_cond_wait_common (cond, mutex, 0, NULL);
>  }
>  
> +versioned_symbol (libpthread, __pthread_cond_wait_1, pthread_cond_wait,
> +		  GLIBC_2_3_2);
> +libc_hidden_ver (__pthread_cond_wait_1, __pthread_cond_wait)
> +strong_alias (__pthread_cond_wait_1, __pthread_cond_wait_2)
> +versioned_symbol (libpthread, __pthread_cond_wait_2, __pthread_cond_wait,
> +		  GLIBC_PRIVATE);
> +
>  /* See __pthread_cond_wait_common.  */
>  int
> -__pthread_cond_timedwait64 (pthread_cond_t *cond, pthread_mutex_t *mutex,
> -                            const struct __timespec64 *abstime)
> +__pthread_cond_timedwait64_1 (pthread_cond_t *cond, pthread_mutex_t *mutex,
> +			      const struct __timespec64 *abstime)
>  {
>    /* Check parameter validity.  This should also tell the compiler that
>       it can assume that abstime is not NULL.  */

Ok.

> @@ -637,29 +644,34 @@ __pthread_cond_timedwait64 (pthread_cond_t *cond, pthread_mutex_t *mutex,
>    return __pthread_cond_wait_common (cond, mutex, clockid, abstime);
>  }
>  
> -#if __TIMESIZE != 64
> -libpthread_hidden_def (__pthread_cond_timedwait64)
> +#if __TIMESIZE == 64
> +strong_alias (__pthread_cond_timedwait64_1, __pthread_cond_timedwait_1)
> +#else
> +versioned_symbol (libc, __pthread_cond_timedwait64_1,
> +		  __pthread_cond_timedwait64, GLIBC_PRIVATE);
> +libc_hidden_ver (__pthread_cond_timedwait64_1, __pthread_cond_timedwait64)
>  
>  int
> -__pthread_cond_timedwait (pthread_cond_t *cond, pthread_mutex_t *mutex,
> -                          const struct timespec *abstime)
> +__pthread_cond_timedwait_1 (pthread_cond_t *cond, pthread_mutex_t *mutex,
> +			    const struct timespec *abstime)
>  {
>    struct __timespec64 ts64 = valid_timespec_to_timespec64 (*abstime);
>  
>    return __pthread_cond_timedwait64 (cond, mutex, &ts64);
>  }
> -#endif
> -
> -versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
> -		  GLIBC_2_3_2);
> -versioned_symbol (libpthread, __pthread_cond_timedwait, pthread_cond_timedwait,
> -		  GLIBC_2_3_2);
> +#endif /* __TIMESIZE == 64 */
> +versioned_symbol (libpthread, __pthread_cond_timedwait_1,
> +		  pthread_cond_timedwait, GLIBC_2_3_2);
> +libc_hidden_ver (__pthread_cond_timedwait_1, __pthread_cond_timedwait)
> +strong_alias (__pthread_cond_timedwait_1, __pthread_cond_timedwait_2)
> +versioned_symbol (libpthread, __pthread_cond_timedwait_2,
> +		  __pthread_cond_timedwait, GLIBC_PRIVATE);
>  
>  /* See __pthread_cond_wait_common.  */
>  int
> -__pthread_cond_clockwait64 (pthread_cond_t *cond, pthread_mutex_t *mutex,
> -                            clockid_t clockid,
> -                            const struct __timespec64 *abstime)
> +__pthread_cond_clockwait64_1 (pthread_cond_t *cond, pthread_mutex_t *mutex,
> +			      clockid_t clockid,
> +			      const struct __timespec64 *abstime)
>  {
>    /* Check parameter validity.  This should also tell the compiler that
>       it can assume that abstime is not NULL.  */

Ok.

> @@ -672,11 +684,15 @@ __pthread_cond_clockwait64 (pthread_cond_t *cond, pthread_mutex_t *mutex,
>    return __pthread_cond_wait_common (cond, mutex, clockid, abstime);
>  }
>  
> -#if __TIMESIZE != 64
> -libpthread_hidden_def (__pthread_cond_clockwait64)
> +#if __TIMESIZE == 64
> +strong_alias (__pthread_cond_clockwait64_1, __pthread_cond_clockwait_1)
> +#else
> +versioned_symbol (libc, __pthread_cond_clockwait64_1,
> +		  __pthread_cond_clockwait64, GLIBC_PRIVATE);
> +libc_hidden_ver (__pthread_cond_clockwait64_1, __pthread_cond_clockwait64)
>  
>  int
> -__pthread_cond_clockwait (pthread_cond_t *cond, pthread_mutex_t *mutex,
> +__pthread_cond_clockwait_1 (pthread_cond_t *cond, pthread_mutex_t *mutex,
>                            clockid_t clockid,
>                            const struct timespec *abstime)
>  {

Ok.

> @@ -684,5 +700,15 @@ __pthread_cond_clockwait (pthread_cond_t *cond, pthread_mutex_t *mutex,
>  
>    return __pthread_cond_clockwait64 (cond, mutex, clockid, &ts64);
>  }
> +#endif /* __TIMESIZE == 64 */
> +versioned_symbol (libc, __pthread_cond_clockwait_1,
> +		  __pthread_cond_clockwait, GLIBC_PRIVATE);
> +libc_hidden_ver (__pthread_cond_clockwait_1, __pthread_cond_clockwait)
> +strong_alias (__pthread_cond_clockwait_1, __pthread_cond_clockwait_2)
> +versioned_symbol (libc, __pthread_cond_clockwait_2,
> +		  pthread_cond_clockwait, GLIBC_2_34);
> +#if SHLIB_COMPAT (libc, GLIBC_2_30, GLIBC_2_34)
> +strong_alias (__pthread_cond_clockwait_1, __pthread_cond_clockwait_3)
> +compat_symbol (libc, __pthread_cond_clockwait_3,
> +	       pthread_cond_clockwait, GLIBC_2_30);
>  #endif

There is no need to add strong_alias anymore.

> -weak_alias (__pthread_cond_clockwait, pthread_cond_clockwait);
> diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
> index dab5a2831e..56c746a01c 100644
> --- a/sysdeps/nptl/pthread-functions.h
> +++ b/sysdeps/nptl/pthread-functions.h
> @@ -30,17 +30,6 @@ struct xid_command;
>     the thread functions.  */
>  struct pthread_functions
>  {
> -  int (*ptr___pthread_cond_broadcast) (pthread_cond_t *);
> -  int (*ptr___pthread_cond_signal) (pthread_cond_t *);
> -  int (*ptr___pthread_cond_wait) (pthread_cond_t *, pthread_mutex_t *);
> -  int (*ptr___pthread_cond_timedwait) (pthread_cond_t *, pthread_mutex_t *,
> -				       const struct timespec *);
> -  int (*ptr___pthread_cond_broadcast_2_0) (pthread_cond_2_0_t *);
> -  int (*ptr___pthread_cond_signal_2_0) (pthread_cond_2_0_t *);
> -  int (*ptr___pthread_cond_wait_2_0) (pthread_cond_2_0_t *, pthread_mutex_t *);
> -  int (*ptr___pthread_cond_timedwait_2_0) (pthread_cond_2_0_t *,
> -					   pthread_mutex_t *,
> -					   const struct timespec *);
>    int (*ptr__nptl_setxid) (struct xid_command *);
>  };
>  

Ok.

> diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> index 381947232e..918e8ad5ce 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> @@ -2174,6 +2174,7 @@ GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
>  GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.32 __libc_single_threaded D 0x1
> @@ -2212,6 +2213,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> index 29a98fc2f4..421b093c4c 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> @@ -64,10 +64,6 @@ GLIBC_2.17 pthread_barrierattr_getpshared F
>  GLIBC_2.17 pthread_barrierattr_init F
>  GLIBC_2.17 pthread_barrierattr_setpshared F
>  GLIBC_2.17 pthread_cancel F
> -GLIBC_2.17 pthread_cond_broadcast F
> -GLIBC_2.17 pthread_cond_signal F
> -GLIBC_2.17 pthread_cond_timedwait F
> -GLIBC_2.17 pthread_cond_wait F
>  GLIBC_2.17 pthread_condattr_getclock F
>  GLIBC_2.17 pthread_condattr_getpshared F
>  GLIBC_2.17 pthread_condattr_setclock F
> @@ -174,7 +170,6 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
> index 7e314dd68b..b197b40425 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
> @@ -2255,6 +2255,7 @@ GLIBC_2.30 __nldbl_warn F
>  GLIBC_2.30 __nldbl_warnx F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.32 __libc_single_threaded D 0x1
> @@ -2293,6 +2294,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> index 29cb6259a5..69809f7794 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> @@ -30,10 +30,6 @@ GLIBC_2.0 open F
>  GLIBC_2.0 pause F
>  GLIBC_2.0 pthread_atfork F
>  GLIBC_2.0 pthread_cancel F
> -GLIBC_2.0 pthread_cond_broadcast F
> -GLIBC_2.0 pthread_cond_signal F
> -GLIBC_2.0 pthread_cond_timedwait F
> -GLIBC_2.0 pthread_cond_wait F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
>  GLIBC_2.0 pthread_join F
> @@ -165,10 +161,7 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_signal F
> -GLIBC_2.3.2 pthread_cond_timedwait F
> -GLIBC_2.3.2 pthread_cond_wait F
> +GLIBC_2.3.2 __libpthread_version_placeholder F
>  GLIBC_2.3.3 __pthread_register_cancel F
>  GLIBC_2.3.3 __pthread_register_cancel_defer F
>  GLIBC_2.3.3 __pthread_unregister_cancel F
> @@ -185,7 +178,6 @@ GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 pthread_setschedprio F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
> index 014b30c7bd..fccb579d59 100644
> --- a/sysdeps/unix/sysv/linux/arc/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
> @@ -1374,6 +1374,7 @@ GLIBC_2.32 pthread_attr_setschedpolicy F
>  GLIBC_2.32 pthread_attr_setscope F
>  GLIBC_2.32 pthread_attr_setsigmask_np F
>  GLIBC_2.32 pthread_cond_broadcast F
> +GLIBC_2.32 pthread_cond_clockwait F
>  GLIBC_2.32 pthread_cond_destroy F
>  GLIBC_2.32 pthread_cond_init F
>  GLIBC_2.32 pthread_cond_signal F
> @@ -1972,6 +1973,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist
> index b926ef9dba..9e16734b8c 100644
> --- a/sysdeps/unix/sysv/linux/arc/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist
> @@ -76,11 +76,6 @@ GLIBC_2.32 pthread_barrierattr_init F
>  GLIBC_2.32 pthread_barrierattr_setpshared F
>  GLIBC_2.32 pthread_cancel F
>  GLIBC_2.32 pthread_clockjoin_np F
> -GLIBC_2.32 pthread_cond_broadcast F
> -GLIBC_2.32 pthread_cond_clockwait F
> -GLIBC_2.32 pthread_cond_signal F
> -GLIBC_2.32 pthread_cond_timedwait F
> -GLIBC_2.32 pthread_cond_wait F
>  GLIBC_2.32 pthread_condattr_getclock F
>  GLIBC_2.32 pthread_condattr_getpshared F
>  GLIBC_2.32 pthread_condattr_setclock F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> index 412eb541fc..0e3cb8f22b 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> @@ -129,6 +129,7 @@ GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
>  GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.31 msgctl F
> @@ -170,6 +171,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> index 8dd2c3f7a6..bd870717f2 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> @@ -26,7 +26,6 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> @@ -98,10 +97,6 @@ GLIBC_2.4 pthread_barrierattr_getpshared F
>  GLIBC_2.4 pthread_barrierattr_init F
>  GLIBC_2.4 pthread_barrierattr_setpshared F
>  GLIBC_2.4 pthread_cancel F
> -GLIBC_2.4 pthread_cond_broadcast F
> -GLIBC_2.4 pthread_cond_signal F
> -GLIBC_2.4 pthread_cond_timedwait F
> -GLIBC_2.4 pthread_cond_wait F
>  GLIBC_2.4 pthread_condattr_getclock F
>  GLIBC_2.4 pthread_condattr_getpshared F
>  GLIBC_2.4 pthread_condattr_setclock F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> index 588f1d6b42..10b35e83ab 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> @@ -129,6 +129,7 @@ GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
>  GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.32 __libc_single_threaded D 0x1
> @@ -167,6 +168,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> index 8dd2c3f7a6..bd870717f2 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> @@ -26,7 +26,6 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> @@ -98,10 +97,6 @@ GLIBC_2.4 pthread_barrierattr_getpshared F
>  GLIBC_2.4 pthread_barrierattr_init F
>  GLIBC_2.4 pthread_barrierattr_setpshared F
>  GLIBC_2.4 pthread_cancel F
> -GLIBC_2.4 pthread_cond_broadcast F
> -GLIBC_2.4 pthread_cond_signal F
> -GLIBC_2.4 pthread_cond_timedwait F
> -GLIBC_2.4 pthread_cond_wait F
>  GLIBC_2.4 pthread_condattr_getclock F
>  GLIBC_2.4 pthread_condattr_getpshared F
>  GLIBC_2.4 pthread_condattr_setclock F
> diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist
> index 76fb31f895..dbbf62eba3 100644
> --- a/sysdeps/unix/sysv/linux/csky/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libc.abilist
> @@ -2118,6 +2118,7 @@ GLIBC_2.29 xprt_register F
>  GLIBC_2.29 xprt_unregister F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.32 __libc_single_threaded D 0x1
> @@ -2156,6 +2157,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> index 2c4d219569..e4d8c8fcb0 100644
> --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> @@ -75,10 +75,6 @@ GLIBC_2.29 pthread_barrierattr_getpshared F
>  GLIBC_2.29 pthread_barrierattr_init F
>  GLIBC_2.29 pthread_barrierattr_setpshared F
>  GLIBC_2.29 pthread_cancel F
> -GLIBC_2.29 pthread_cond_broadcast F
> -GLIBC_2.29 pthread_cond_signal F
> -GLIBC_2.29 pthread_cond_timedwait F
> -GLIBC_2.29 pthread_cond_wait F
>  GLIBC_2.29 pthread_condattr_getclock F
>  GLIBC_2.29 pthread_condattr_getpshared F
>  GLIBC_2.29 pthread_condattr_setclock F
> @@ -171,7 +167,6 @@ GLIBC_2.29 tss_delete F
>  GLIBC_2.29 tss_get F
>  GLIBC_2.29 tss_set F
>  GLIBC_2.29 write F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
> index e99899dee5..8b3960aff8 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
> @@ -2076,6 +2076,7 @@ GLIBC_2.3.4 xdr_quad_t F
>  GLIBC_2.3.4 xdr_u_quad_t F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.32 __libc_single_threaded D 0x1
> @@ -2114,6 +2115,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> index 9e15deaad8..3eb40a91f7 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> @@ -66,10 +66,6 @@ GLIBC_2.2 pthread_barrierattr_destroy F
>  GLIBC_2.2 pthread_barrierattr_init F
>  GLIBC_2.2 pthread_barrierattr_setpshared F
>  GLIBC_2.2 pthread_cancel F
> -GLIBC_2.2 pthread_cond_broadcast F
> -GLIBC_2.2 pthread_cond_signal F
> -GLIBC_2.2 pthread_cond_timedwait F
> -GLIBC_2.2 pthread_cond_wait F
>  GLIBC_2.2 pthread_condattr_getpshared F
>  GLIBC_2.2 pthread_condattr_setpshared F
>  GLIBC_2.2 pthread_create F
> @@ -157,10 +153,7 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_signal F
> -GLIBC_2.3.2 pthread_cond_timedwait F
> -GLIBC_2.3.2 pthread_cond_wait F
> +GLIBC_2.3.2 __libpthread_version_placeholder F
>  GLIBC_2.3.3 __pthread_register_cancel F
>  GLIBC_2.3.3 __pthread_register_cancel_defer F
>  GLIBC_2.3.3 __pthread_unregister_cancel F
> @@ -175,7 +168,6 @@ GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 pthread_setschedprio F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
> index 29b8e0c1eb..bbc1d42e71 100644
> --- a/sysdeps/unix/sysv/linux/i386/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
> @@ -2242,6 +2242,7 @@ GLIBC_2.3.4 xdr_quad_t F
>  GLIBC_2.3.4 xdr_u_quad_t F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.32 __libc_single_threaded D 0x1
> @@ -2281,6 +2282,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> index 4065a88a3b..3d9efa60e0 100644
> --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> @@ -30,10 +30,6 @@ GLIBC_2.0 open F
>  GLIBC_2.0 pause F
>  GLIBC_2.0 pthread_atfork F
>  GLIBC_2.0 pthread_cancel F
> -GLIBC_2.0 pthread_cond_broadcast F
> -GLIBC_2.0 pthread_cond_signal F
> -GLIBC_2.0 pthread_cond_timedwait F
> -GLIBC_2.0 pthread_cond_wait F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
>  GLIBC_2.0 pthread_join F
> @@ -165,10 +161,7 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_signal F
> -GLIBC_2.3.2 pthread_cond_timedwait F
> -GLIBC_2.3.2 pthread_cond_wait F
> +GLIBC_2.3.2 __libpthread_version_placeholder F
>  GLIBC_2.3.3 __pthread_register_cancel F
>  GLIBC_2.3.3 __pthread_register_cancel_defer F
>  GLIBC_2.3.3 __pthread_unregister_cancel F
> @@ -183,7 +176,6 @@ GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 pthread_setschedprio F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
> index fb8a36ce20..4cf13e29a8 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
> @@ -2108,6 +2108,7 @@ GLIBC_2.3.4 xdr_quad_t F
>  GLIBC_2.3.4 xdr_u_quad_t F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.32 __libc_single_threaded D 0x1
> @@ -2146,6 +2147,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> index 684bf559e5..974fa09b43 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> @@ -66,10 +66,6 @@ GLIBC_2.2 pthread_barrierattr_destroy F
>  GLIBC_2.2 pthread_barrierattr_init F
>  GLIBC_2.2 pthread_barrierattr_setpshared F
>  GLIBC_2.2 pthread_cancel F
> -GLIBC_2.2 pthread_cond_broadcast F
> -GLIBC_2.2 pthread_cond_signal F
> -GLIBC_2.2 pthread_cond_timedwait F
> -GLIBC_2.2 pthread_cond_wait F
>  GLIBC_2.2 pthread_condattr_getpshared F
>  GLIBC_2.2 pthread_condattr_setpshared F
>  GLIBC_2.2 pthread_create F
> @@ -157,10 +153,7 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_signal F
> -GLIBC_2.3.2 pthread_cond_timedwait F
> -GLIBC_2.3.2 pthread_cond_wait F
> +GLIBC_2.3.2 __libpthread_version_placeholder F
>  GLIBC_2.3.3 __pthread_register_cancel F
>  GLIBC_2.3.3 __pthread_register_cancel_defer F
>  GLIBC_2.3.3 __pthread_unregister_cancel F
> @@ -177,7 +170,6 @@ GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 pthread_setschedprio F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> index 03e80e6a12..75e546da5d 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> @@ -130,6 +130,7 @@ GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
>  GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.31 msgctl F
> @@ -171,6 +172,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> index 8dd2c3f7a6..bd870717f2 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> @@ -26,7 +26,6 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> @@ -98,10 +97,6 @@ GLIBC_2.4 pthread_barrierattr_getpshared F
>  GLIBC_2.4 pthread_barrierattr_init F
>  GLIBC_2.4 pthread_barrierattr_setpshared F
>  GLIBC_2.4 pthread_cancel F
> -GLIBC_2.4 pthread_cond_broadcast F
> -GLIBC_2.4 pthread_cond_signal F
> -GLIBC_2.4 pthread_cond_timedwait F
> -GLIBC_2.4 pthread_cond_wait F
>  GLIBC_2.4 pthread_condattr_getclock F
>  GLIBC_2.4 pthread_condattr_getpshared F
>  GLIBC_2.4 pthread_condattr_setclock F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> index 2a5bee30d1..7a24d3ce17 100644
> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> @@ -2185,6 +2185,7 @@ GLIBC_2.3.4 xdr_quad_t F
>  GLIBC_2.3.4 xdr_u_quad_t F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.31 msgctl F
> @@ -2226,6 +2227,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> index 4065a88a3b..3d9efa60e0 100644
> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> @@ -30,10 +30,6 @@ GLIBC_2.0 open F
>  GLIBC_2.0 pause F
>  GLIBC_2.0 pthread_atfork F
>  GLIBC_2.0 pthread_cancel F
> -GLIBC_2.0 pthread_cond_broadcast F
> -GLIBC_2.0 pthread_cond_signal F
> -GLIBC_2.0 pthread_cond_timedwait F
> -GLIBC_2.0 pthread_cond_wait F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
>  GLIBC_2.0 pthread_join F
> @@ -165,10 +161,7 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_signal F
> -GLIBC_2.3.2 pthread_cond_timedwait F
> -GLIBC_2.3.2 pthread_cond_wait F
> +GLIBC_2.3.2 __libpthread_version_placeholder F
>  GLIBC_2.3.3 __pthread_register_cancel F
>  GLIBC_2.3.3 __pthread_register_cancel_defer F
>  GLIBC_2.3.3 __pthread_unregister_cancel F
> @@ -183,7 +176,6 @@ GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 pthread_setschedprio F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> index b46567880e..4d0fef0d93 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> @@ -2166,6 +2166,7 @@ GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
>  GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.31 msgctl F
> @@ -2207,6 +2208,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> index d8a9642f66..3ad8bce93a 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> @@ -64,10 +64,6 @@ GLIBC_2.18 pthread_barrierattr_getpshared F
>  GLIBC_2.18 pthread_barrierattr_init F
>  GLIBC_2.18 pthread_barrierattr_setpshared F
>  GLIBC_2.18 pthread_cancel F
> -GLIBC_2.18 pthread_cond_broadcast F
> -GLIBC_2.18 pthread_cond_signal F
> -GLIBC_2.18 pthread_cond_timedwait F
> -GLIBC_2.18 pthread_cond_wait F
>  GLIBC_2.18 pthread_condattr_getclock F
>  GLIBC_2.18 pthread_condattr_getpshared F
>  GLIBC_2.18 pthread_condattr_setclock F
> @@ -174,7 +170,6 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> index 7796c5313a..2a06c0ed64 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> @@ -2166,6 +2166,7 @@ GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
>  GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.32 __libc_single_threaded D 0x1
> @@ -2204,6 +2205,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> index d8a9642f66..3ad8bce93a 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> @@ -64,10 +64,6 @@ GLIBC_2.18 pthread_barrierattr_getpshared F
>  GLIBC_2.18 pthread_barrierattr_init F
>  GLIBC_2.18 pthread_barrierattr_setpshared F
>  GLIBC_2.18 pthread_cancel F
> -GLIBC_2.18 pthread_cond_broadcast F
> -GLIBC_2.18 pthread_cond_signal F
> -GLIBC_2.18 pthread_cond_timedwait F
> -GLIBC_2.18 pthread_cond_wait F
>  GLIBC_2.18 pthread_condattr_getclock F
>  GLIBC_2.18 pthread_condattr_getpshared F
>  GLIBC_2.18 pthread_condattr_setclock F
> @@ -174,7 +170,6 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> index c3e658dbc1..99bb618f1f 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> @@ -2159,6 +2159,7 @@ GLIBC_2.3.4 xdr_quad_t F
>  GLIBC_2.3.4 xdr_u_quad_t F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.32 __libc_single_threaded D 0x1
> @@ -2197,6 +2198,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> index 4bd5de2dd7..2ab8395a4a 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> @@ -30,10 +30,6 @@ GLIBC_2.0 open F
>  GLIBC_2.0 pause F
>  GLIBC_2.0 pthread_atfork F
>  GLIBC_2.0 pthread_cancel F
> -GLIBC_2.0 pthread_cond_broadcast F
> -GLIBC_2.0 pthread_cond_signal F
> -GLIBC_2.0 pthread_cond_timedwait F
> -GLIBC_2.0 pthread_cond_wait F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
>  GLIBC_2.0 pthread_join F
> @@ -164,10 +160,7 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_signal F
> -GLIBC_2.3.2 pthread_cond_timedwait F
> -GLIBC_2.3.2 pthread_cond_wait F
> +GLIBC_2.3.2 __libpthread_version_placeholder F
>  GLIBC_2.3.3 __pthread_register_cancel F
>  GLIBC_2.3.3 __pthread_register_cancel_defer F
>  GLIBC_2.3.3 __pthread_unregister_cancel F
> @@ -184,7 +177,6 @@ GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 pthread_setschedprio F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> index bae73ebb39..7d66f78876 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> @@ -2157,6 +2157,7 @@ GLIBC_2.3.4 xdr_quad_t F
>  GLIBC_2.3.4 xdr_u_quad_t F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.32 __libc_single_threaded D 0x1
> @@ -2195,6 +2196,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> index 4bd5de2dd7..2ab8395a4a 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> @@ -30,10 +30,6 @@ GLIBC_2.0 open F
>  GLIBC_2.0 pause F
>  GLIBC_2.0 pthread_atfork F
>  GLIBC_2.0 pthread_cancel F
> -GLIBC_2.0 pthread_cond_broadcast F
> -GLIBC_2.0 pthread_cond_signal F
> -GLIBC_2.0 pthread_cond_timedwait F
> -GLIBC_2.0 pthread_cond_wait F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
>  GLIBC_2.0 pthread_join F
> @@ -164,10 +160,7 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_signal F
> -GLIBC_2.3.2 pthread_cond_timedwait F
> -GLIBC_2.3.2 pthread_cond_wait F
> +GLIBC_2.3.2 __libpthread_version_placeholder F
>  GLIBC_2.3.3 __pthread_register_cancel F
>  GLIBC_2.3.3 __pthread_register_cancel_defer F
>  GLIBC_2.3.3 __pthread_unregister_cancel F
> @@ -184,7 +177,6 @@ GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 pthread_setschedprio F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> index 74fb3b997e..55cc5e99bf 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> @@ -2165,6 +2165,7 @@ GLIBC_2.3.4 xdr_quad_t F
>  GLIBC_2.3.4 xdr_u_quad_t F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.32 __libc_single_threaded D 0x1
> @@ -2203,6 +2204,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> index 3083e3d821..208a801c9d 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> @@ -2159,6 +2159,7 @@ GLIBC_2.3.4 xdr_quad_t F
>  GLIBC_2.3.4 xdr_u_quad_t F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.32 __libc_single_threaded D 0x1
> @@ -2197,6 +2198,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
> index f79ca91eb7..7525da4a92 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
> @@ -2207,6 +2207,7 @@ GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
>  GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.32 __libc_single_threaded D 0x1
> @@ -2245,6 +2246,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> index c469853b65..263808a2b8 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> @@ -64,10 +64,6 @@ GLIBC_2.21 pthread_barrierattr_getpshared F
>  GLIBC_2.21 pthread_barrierattr_init F
>  GLIBC_2.21 pthread_barrierattr_setpshared F
>  GLIBC_2.21 pthread_cancel F
> -GLIBC_2.21 pthread_cond_broadcast F
> -GLIBC_2.21 pthread_cond_signal F
> -GLIBC_2.21 pthread_cond_timedwait F
> -GLIBC_2.21 pthread_cond_wait F
>  GLIBC_2.21 pthread_condattr_getclock F
>  GLIBC_2.21 pthread_condattr_getpshared F
>  GLIBC_2.21 pthread_condattr_setclock F
> @@ -174,7 +170,6 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> index f5408e6078..7c85534f61 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> @@ -2215,6 +2215,7 @@ GLIBC_2.30 __nldbl_warn F
>  GLIBC_2.30 __nldbl_warnx F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.32 __libc_single_threaded D 0x1
> @@ -2253,6 +2254,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> index 44fb3a6743..7d696c9be7 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> @@ -30,10 +30,6 @@ GLIBC_2.0 open F
>  GLIBC_2.0 pause F
>  GLIBC_2.0 pthread_atfork F
>  GLIBC_2.0 pthread_cancel F
> -GLIBC_2.0 pthread_cond_broadcast F
> -GLIBC_2.0 pthread_cond_signal F
> -GLIBC_2.0 pthread_cond_timedwait F
> -GLIBC_2.0 pthread_cond_wait F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
>  GLIBC_2.0 pthread_join F
> @@ -165,10 +161,7 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_signal F
> -GLIBC_2.3.2 pthread_cond_timedwait F
> -GLIBC_2.3.2 pthread_cond_wait F
> +GLIBC_2.3.2 __libpthread_version_placeholder F
>  GLIBC_2.3.3 __pthread_register_cancel F
>  GLIBC_2.3.3 __pthread_register_cancel_defer F
>  GLIBC_2.3.3 __pthread_unregister_cancel F
> @@ -183,7 +176,6 @@ GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 pthread_setschedprio F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> index a7587dcc45..1e4059c7f6 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> @@ -2248,6 +2248,7 @@ GLIBC_2.30 __nldbl_warn F
>  GLIBC_2.30 __nldbl_warnx F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.32 __libc_single_threaded D 0x1
> @@ -2286,6 +2287,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> index 7ea6dc6574..e72f329cf9 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> @@ -2078,6 +2078,7 @@ GLIBC_2.30 __nldbl_warn F
>  GLIBC_2.30 __nldbl_warnx F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.32 __libc_single_threaded D 0x1
> @@ -2116,6 +2117,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> index 2e77dc2fb3..342642ee59 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> @@ -86,10 +86,6 @@ GLIBC_2.3 pthread_barrierattr_destroy F
>  GLIBC_2.3 pthread_barrierattr_init F
>  GLIBC_2.3 pthread_barrierattr_setpshared F
>  GLIBC_2.3 pthread_cancel F
> -GLIBC_2.3 pthread_cond_broadcast F
> -GLIBC_2.3 pthread_cond_signal F
> -GLIBC_2.3 pthread_cond_timedwait F
> -GLIBC_2.3 pthread_cond_wait F
>  GLIBC_2.3 pthread_condattr_getpshared F
>  GLIBC_2.3 pthread_condattr_setpshared F
>  GLIBC_2.3 pthread_create F
> @@ -154,10 +150,7 @@ GLIBC_2.3 sigwait F
>  GLIBC_2.3 system F
>  GLIBC_2.3 tcdrain F
>  GLIBC_2.3 write F
> -GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_signal F
> -GLIBC_2.3.2 pthread_cond_timedwait F
> -GLIBC_2.3.2 pthread_cond_wait F
> +GLIBC_2.3.2 __libpthread_version_placeholder F
>  GLIBC_2.3.3 __pthread_register_cancel F
>  GLIBC_2.3.3 __pthread_register_cancel_defer F
>  GLIBC_2.3.3 __pthread_unregister_cancel F
> @@ -172,7 +165,6 @@ GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 pthread_setschedprio F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> index f994892fd9..36dd35b01a 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> @@ -2276,6 +2276,7 @@ GLIBC_2.30 __nldbl_warn F
>  GLIBC_2.30 __nldbl_warnx F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.32 __argp_errorieee128 F
> @@ -2407,6 +2408,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> index 29a98fc2f4..421b093c4c 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> @@ -64,10 +64,6 @@ GLIBC_2.17 pthread_barrierattr_getpshared F
>  GLIBC_2.17 pthread_barrierattr_init F
>  GLIBC_2.17 pthread_barrierattr_setpshared F
>  GLIBC_2.17 pthread_cancel F
> -GLIBC_2.17 pthread_cond_broadcast F
> -GLIBC_2.17 pthread_cond_signal F
> -GLIBC_2.17 pthread_cond_timedwait F
> -GLIBC_2.17 pthread_cond_wait F
>  GLIBC_2.17 pthread_condattr_getclock F
>  GLIBC_2.17 pthread_condattr_getpshared F
>  GLIBC_2.17 pthread_condattr_setclock F
> @@ -174,7 +170,6 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> index 70b873f9fb..955b5df1f3 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> @@ -1376,6 +1376,7 @@ GLIBC_2.33 pthread_attr_setschedpolicy F
>  GLIBC_2.33 pthread_attr_setscope F
>  GLIBC_2.33 pthread_attr_setsigmask_np F
>  GLIBC_2.33 pthread_cond_broadcast F
> +GLIBC_2.33 pthread_cond_clockwait F
>  GLIBC_2.33 pthread_cond_destroy F
>  GLIBC_2.33 pthread_cond_init F
>  GLIBC_2.33 pthread_cond_signal F
> @@ -1974,6 +1975,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
> index 911969f7eb..23b5630a69 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
> @@ -76,11 +76,6 @@ GLIBC_2.33 pthread_barrierattr_init F
>  GLIBC_2.33 pthread_barrierattr_setpshared F
>  GLIBC_2.33 pthread_cancel F
>  GLIBC_2.33 pthread_clockjoin_np F
> -GLIBC_2.33 pthread_cond_broadcast F
> -GLIBC_2.33 pthread_cond_clockwait F
> -GLIBC_2.33 pthread_cond_signal F
> -GLIBC_2.33 pthread_cond_timedwait F
> -GLIBC_2.33 pthread_cond_wait F
>  GLIBC_2.33 pthread_condattr_getclock F
>  GLIBC_2.33 pthread_condattr_getpshared F
>  GLIBC_2.33 pthread_condattr_setclock F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> index ddfac62fd0..74bf464fa9 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> @@ -2136,6 +2136,7 @@ GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
>  GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.32 __libc_single_threaded D 0x1
> @@ -2174,6 +2175,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> index 21f462137a..58402c8360 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> @@ -64,10 +64,6 @@ GLIBC_2.27 pthread_barrierattr_getpshared F
>  GLIBC_2.27 pthread_barrierattr_init F
>  GLIBC_2.27 pthread_barrierattr_setpshared F
>  GLIBC_2.27 pthread_cancel F
> -GLIBC_2.27 pthread_cond_broadcast F
> -GLIBC_2.27 pthread_cond_signal F
> -GLIBC_2.27 pthread_cond_timedwait F
> -GLIBC_2.27 pthread_cond_wait F
>  GLIBC_2.27 pthread_condattr_getclock F
>  GLIBC_2.27 pthread_condattr_getpshared F
>  GLIBC_2.27 pthread_condattr_setclock F
> @@ -173,7 +169,6 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> index 078237adb2..ad26a36c0b 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> @@ -2210,6 +2210,7 @@ GLIBC_2.30 __nldbl_warn F
>  GLIBC_2.30 __nldbl_warnx F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.31 msgctl F
> @@ -2251,6 +2252,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> index 7b2edb7f57..0f527c3335 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> @@ -30,10 +30,6 @@ GLIBC_2.0 open F
>  GLIBC_2.0 pause F
>  GLIBC_2.0 pthread_atfork F
>  GLIBC_2.0 pthread_cancel F
> -GLIBC_2.0 pthread_cond_broadcast F
> -GLIBC_2.0 pthread_cond_signal F
> -GLIBC_2.0 pthread_cond_timedwait F
> -GLIBC_2.0 pthread_cond_wait F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
>  GLIBC_2.0 pthread_join F
> @@ -166,10 +162,7 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_signal F
> -GLIBC_2.3.2 pthread_cond_timedwait F
> -GLIBC_2.3.2 pthread_cond_wait F
> +GLIBC_2.3.2 __libpthread_version_placeholder F
>  GLIBC_2.3.3 __pthread_register_cancel F
>  GLIBC_2.3.3 __pthread_register_cancel_defer F
>  GLIBC_2.3.3 __pthread_unregister_cancel F
> @@ -184,7 +177,6 @@ GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 pthread_setschedprio F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> index a2700aba32..b75431f830 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> @@ -2114,6 +2114,7 @@ GLIBC_2.30 __nldbl_warn F
>  GLIBC_2.30 __nldbl_warnx F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.32 __libc_single_threaded D 0x1
> @@ -2152,6 +2153,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> index 8b4729fb7a..5af8b32f0b 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> @@ -67,10 +67,6 @@ GLIBC_2.2 pthread_barrierattr_destroy F
>  GLIBC_2.2 pthread_barrierattr_init F
>  GLIBC_2.2 pthread_barrierattr_setpshared F
>  GLIBC_2.2 pthread_cancel F
> -GLIBC_2.2 pthread_cond_broadcast F
> -GLIBC_2.2 pthread_cond_signal F
> -GLIBC_2.2 pthread_cond_timedwait F
> -GLIBC_2.2 pthread_cond_wait F
>  GLIBC_2.2 pthread_condattr_getpshared F
>  GLIBC_2.2 pthread_condattr_setpshared F
>  GLIBC_2.2 pthread_create F
> @@ -158,10 +154,7 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_signal F
> -GLIBC_2.3.2 pthread_cond_timedwait F
> -GLIBC_2.3.2 pthread_cond_wait F
> +GLIBC_2.3.2 __libpthread_version_placeholder F
>  GLIBC_2.3.3 __pthread_register_cancel F
>  GLIBC_2.3.3 __pthread_register_cancel_defer F
>  GLIBC_2.3.3 __pthread_unregister_cancel F
> @@ -176,7 +169,6 @@ GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 pthread_setschedprio F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> index 4fce4b408e..fc6dfece0a 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> @@ -2080,6 +2080,7 @@ GLIBC_2.3.4 xdr_quad_t F
>  GLIBC_2.3.4 xdr_u_quad_t F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.31 msgctl F
> @@ -2121,6 +2122,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> index 9e15deaad8..3eb40a91f7 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> @@ -66,10 +66,6 @@ GLIBC_2.2 pthread_barrierattr_destroy F
>  GLIBC_2.2 pthread_barrierattr_init F
>  GLIBC_2.2 pthread_barrierattr_setpshared F
>  GLIBC_2.2 pthread_cancel F
> -GLIBC_2.2 pthread_cond_broadcast F
> -GLIBC_2.2 pthread_cond_signal F
> -GLIBC_2.2 pthread_cond_timedwait F
> -GLIBC_2.2 pthread_cond_wait F
>  GLIBC_2.2 pthread_condattr_getpshared F
>  GLIBC_2.2 pthread_condattr_setpshared F
>  GLIBC_2.2 pthread_create F
> @@ -157,10 +153,7 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_signal F
> -GLIBC_2.3.2 pthread_cond_timedwait F
> -GLIBC_2.3.2 pthread_cond_wait F
> +GLIBC_2.3.2 __libpthread_version_placeholder F
>  GLIBC_2.3.3 __pthread_register_cancel F
>  GLIBC_2.3.3 __pthread_register_cancel_defer F
>  GLIBC_2.3.3 __pthread_unregister_cancel F
> @@ -175,7 +168,6 @@ GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 pthread_setschedprio F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> index 5dba0f5d0c..15e858df71 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> @@ -2080,6 +2080,7 @@ GLIBC_2.3.4 xdr_quad_t F
>  GLIBC_2.3.4 xdr_u_quad_t F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.32 __libc_single_threaded D 0x1
> @@ -2118,6 +2119,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> index 9e15deaad8..3eb40a91f7 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> @@ -66,10 +66,6 @@ GLIBC_2.2 pthread_barrierattr_destroy F
>  GLIBC_2.2 pthread_barrierattr_init F
>  GLIBC_2.2 pthread_barrierattr_setpshared F
>  GLIBC_2.2 pthread_cancel F
> -GLIBC_2.2 pthread_cond_broadcast F
> -GLIBC_2.2 pthread_cond_signal F
> -GLIBC_2.2 pthread_cond_timedwait F
> -GLIBC_2.2 pthread_cond_wait F
>  GLIBC_2.2 pthread_condattr_getpshared F
>  GLIBC_2.2 pthread_condattr_setpshared F
>  GLIBC_2.2 pthread_create F
> @@ -157,10 +153,7 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_signal F
> -GLIBC_2.3.2 pthread_cond_timedwait F
> -GLIBC_2.3.2 pthread_cond_wait F
> +GLIBC_2.3.2 __libpthread_version_placeholder F
>  GLIBC_2.3.3 __pthread_register_cancel F
>  GLIBC_2.3.3 __pthread_register_cancel_defer F
>  GLIBC_2.3.3 __pthread_unregister_cancel F
> @@ -175,7 +168,6 @@ GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 pthread_setschedprio F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> index e064e5a4dc..157da004d6 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> @@ -2204,6 +2204,7 @@ GLIBC_2.30 __nldbl_warn F
>  GLIBC_2.30 __nldbl_warnx F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.32 __libc_single_threaded D 0x1
> @@ -2242,6 +2243,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> index 29cb6259a5..69809f7794 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> @@ -30,10 +30,6 @@ GLIBC_2.0 open F
>  GLIBC_2.0 pause F
>  GLIBC_2.0 pthread_atfork F
>  GLIBC_2.0 pthread_cancel F
> -GLIBC_2.0 pthread_cond_broadcast F
> -GLIBC_2.0 pthread_cond_signal F
> -GLIBC_2.0 pthread_cond_timedwait F
> -GLIBC_2.0 pthread_cond_wait F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
>  GLIBC_2.0 pthread_join F
> @@ -165,10 +161,7 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_signal F
> -GLIBC_2.3.2 pthread_cond_timedwait F
> -GLIBC_2.3.2 pthread_cond_wait F
> +GLIBC_2.3.2 __libpthread_version_placeholder F
>  GLIBC_2.3.3 __pthread_register_cancel F
>  GLIBC_2.3.3 __pthread_register_cancel_defer F
>  GLIBC_2.3.3 __pthread_unregister_cancel F
> @@ -185,7 +178,6 @@ GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 pthread_setschedprio F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> index 36fed3cf99..b13a3b4036 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> @@ -2131,6 +2131,7 @@ GLIBC_2.3.4 xdr_quad_t F
>  GLIBC_2.3.4 xdr_u_quad_t F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.32 __libc_single_threaded D 0x1
> @@ -2169,6 +2170,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> index 684bf559e5..974fa09b43 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> @@ -66,10 +66,6 @@ GLIBC_2.2 pthread_barrierattr_destroy F
>  GLIBC_2.2 pthread_barrierattr_init F
>  GLIBC_2.2 pthread_barrierattr_setpshared F
>  GLIBC_2.2 pthread_cancel F
> -GLIBC_2.2 pthread_cond_broadcast F
> -GLIBC_2.2 pthread_cond_signal F
> -GLIBC_2.2 pthread_cond_timedwait F
> -GLIBC_2.2 pthread_cond_wait F
>  GLIBC_2.2 pthread_condattr_getpshared F
>  GLIBC_2.2 pthread_condattr_setpshared F
>  GLIBC_2.2 pthread_create F
> @@ -157,10 +153,7 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_signal F
> -GLIBC_2.3.2 pthread_cond_timedwait F
> -GLIBC_2.3.2 pthread_cond_wait F
> +GLIBC_2.3.2 __libpthread_version_placeholder F
>  GLIBC_2.3.3 __pthread_register_cancel F
>  GLIBC_2.3.3 __pthread_register_cancel_defer F
>  GLIBC_2.3.3 __pthread_unregister_cancel F
> @@ -177,7 +170,6 @@ GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 pthread_setschedprio F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> index 6858c1328f..ae1b8c21f4 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> @@ -2089,6 +2089,7 @@ GLIBC_2.3.4 xdr_quad_t F
>  GLIBC_2.3.4 xdr_u_quad_t F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.32 __libc_single_threaded D 0x1
> @@ -2128,6 +2129,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> index 54ad81fdd6..ddd052cc92 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> @@ -66,10 +66,6 @@ GLIBC_2.2.5 pthread_barrierattr_destroy F
>  GLIBC_2.2.5 pthread_barrierattr_init F
>  GLIBC_2.2.5 pthread_barrierattr_setpshared F
>  GLIBC_2.2.5 pthread_cancel F
> -GLIBC_2.2.5 pthread_cond_broadcast F
> -GLIBC_2.2.5 pthread_cond_signal F
> -GLIBC_2.2.5 pthread_cond_timedwait F
> -GLIBC_2.2.5 pthread_cond_wait F
>  GLIBC_2.2.5 pthread_condattr_getpshared F
>  GLIBC_2.2.5 pthread_condattr_setpshared F
>  GLIBC_2.2.5 pthread_create F
> @@ -156,10 +152,7 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.3.2 pthread_cond_broadcast F
> -GLIBC_2.3.2 pthread_cond_signal F
> -GLIBC_2.3.2 pthread_cond_timedwait F
> -GLIBC_2.3.2 pthread_cond_wait F
> +GLIBC_2.3.2 __libpthread_version_placeholder F
>  GLIBC_2.3.3 __pthread_register_cancel F
>  GLIBC_2.3.3 __pthread_register_cancel_defer F
>  GLIBC_2.3.3 __pthread_unregister_cancel F
> @@ -174,7 +167,6 @@ GLIBC_2.3.3 pthread_tryjoin_np F
>  GLIBC_2.3.4 pthread_attr_getaffinity_np F
>  GLIBC_2.3.4 pthread_setaffinity_np F
>  GLIBC_2.3.4 pthread_setschedprio F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> index 72da8cceaa..2d1abe3605 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> @@ -2187,6 +2187,7 @@ GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
>  GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
>  GLIBC_2.30 getdents64 F
>  GLIBC_2.30 gettid F
> +GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 tgkill F
>  GLIBC_2.30 twalk_r F
>  GLIBC_2.32 __libc_single_threaded D 0x1
> @@ -2226,6 +2227,7 @@ GLIBC_2.34 __pthread_rwlock_unlock F
>  GLIBC_2.34 __pthread_rwlock_wrlock F
>  GLIBC_2.34 __pthread_setspecific F
>  GLIBC_2.34 __pthread_unwind_next F
> +GLIBC_2.34 pthread_cond_clockwait F
>  GLIBC_2.34 pthread_getspecific F
>  GLIBC_2.34 pthread_key_create F
>  GLIBC_2.34 pthread_key_delete F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> index 6b095bf36a..b0c512fec3 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> @@ -64,10 +64,6 @@ GLIBC_2.16 pthread_barrierattr_getpshared F
>  GLIBC_2.16 pthread_barrierattr_init F
>  GLIBC_2.16 pthread_barrierattr_setpshared F
>  GLIBC_2.16 pthread_cancel F
> -GLIBC_2.16 pthread_cond_broadcast F
> -GLIBC_2.16 pthread_cond_signal F
> -GLIBC_2.16 pthread_cond_timedwait F
> -GLIBC_2.16 pthread_cond_wait F
>  GLIBC_2.16 pthread_condattr_getclock F
>  GLIBC_2.16 pthread_condattr_getpshared F
>  GLIBC_2.16 pthread_condattr_setclock F
> @@ -174,7 +170,6 @@ GLIBC_2.28 tss_create F
>  GLIBC_2.28 tss_delete F
>  GLIBC_2.28 tss_get F
>  GLIBC_2.28 tss_set F
> -GLIBC_2.30 pthread_cond_clockwait F
>  GLIBC_2.30 pthread_mutex_clocklock F
>  GLIBC_2.30 pthread_rwlock_clockrdlock F
>  GLIBC_2.30 pthread_rwlock_clockwrlock F
> 

Ok
diff mbox series

Patch

diff --git a/nptl/Makefile b/nptl/Makefile
index e0ba8bea13..1cf72fd5df 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -47,8 +47,12 @@  routines = \
   lowlevellock \
   nptl_deallocate_tsd \
   nptl_nthreads \
+  old_pthread_cond_broadcast \
   old_pthread_cond_destroy \
   old_pthread_cond_init \
+  old_pthread_cond_signal \
+  old_pthread_cond_timedwait \
+  old_pthread_cond_wait \
   pthread_atfork \
   pthread_attr_copy \
   pthread_attr_destroy \
@@ -69,8 +73,11 @@  routines = \
   pthread_attr_setsigmask \
   pthread_attr_setsigmask_internal \
   pthread_cleanup_upto \
+  pthread_cond_broadcast \
   pthread_cond_destroy \
   pthread_cond_init \
+  pthread_cond_signal \
+  pthread_cond_wait \
   pthread_condattr_destroy \
   pthread_condattr_init \
   pthread_equal \
@@ -82,6 +89,7 @@  routines = \
   pthread_key_create \
   pthread_key_delete \
   pthread_keys \
+  pthread_mutex_cond_lock \
   pthread_mutex_conf \
   pthread_mutex_consistent \
   pthread_mutex_destroy \
@@ -130,10 +138,6 @@  libpthread-routines = \
   nptl-init \
   nptlfreeres \
   old_pthread_atfork \
-  old_pthread_cond_broadcast \
-  old_pthread_cond_signal \
-  old_pthread_cond_timedwait \
-  old_pthread_cond_wait \
   pt-allocrtsig \
   pt-fcntl \
   pt-interp \
@@ -157,9 +161,6 @@  libpthread-routines = \
   pthread_barrierattr_setpshared \
   pthread_cancel \
   pthread_clockjoin \
-  pthread_cond_broadcast \
-  pthread_cond_signal \
-  pthread_cond_wait \
   pthread_condattr_getclock \
   pthread_condattr_getpshared \
   pthread_condattr_setclock \
@@ -174,7 +175,6 @@  libpthread-routines = \
   pthread_join_common \
   pthread_kill \
   pthread_kill_other_threads \
-  pthread_mutex_cond_lock \
   pthread_mutex_getprioceiling \
   pthread_mutex_setprioceiling \
   pthread_mutex_timedlock \
diff --git a/nptl/Versions b/nptl/Versions
index 2352b74c7e..a6c8746449 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -95,6 +95,9 @@  libc {
     thrd_sleep;
     thrd_yield;
   }
+  GLIBC_2.30 {
+    pthread_cond_clockwait;
+  }
   GLIBC_2.32 {
     pthread_attr_getsigmask_np;
     pthread_attr_setaffinity_np;
@@ -116,6 +119,7 @@  libc {
     __pthread_rwlock_unlock;
     __pthread_rwlock_wrlock;
     __pthread_setspecific;
+    pthread_cond_clockwait;
     pthread_getspecific;
     pthread_key_create;
     pthread_key_delete;
@@ -155,8 +159,12 @@  libc {
     __pthread_cleanup_pop;
     __pthread_cleanup_push;
     __pthread_cleanup_upto;
+    __pthread_cond_broadcast; # Used by the C11 threads.
     __pthread_cond_destroy; # Used by the C11 threads.
     __pthread_cond_init; # Used by the C11 threads.
+    __pthread_cond_signal; # Used by the C11 threads.
+    __pthread_cond_timedwait; # Used by the C11 threads.
+    __pthread_cond_wait; # Used by the C11 threads.
     __pthread_current_priority;
     __pthread_exit;
     __pthread_force_elision;
@@ -209,10 +217,6 @@  libpthread {
     pause;
     pthread_atfork;
     pthread_cancel;
-    pthread_cond_broadcast;
-    pthread_cond_signal;
-    pthread_cond_timedwait;
-    pthread_cond_wait;
     pthread_create;
     pthread_detach;
     pthread_join;
@@ -338,11 +342,7 @@  libpthread {
   }
 
   GLIBC_2.3.2 {
-    pthread_cond_broadcast;
-    pthread_cond_init;
-    pthread_cond_signal;
-    pthread_cond_timedwait;
-    pthread_cond_wait;
+    __libpthread_version_placeholder;
   }
 
   GLIBC_2.3.3 {
@@ -419,7 +419,6 @@  libpthread {
   }
 
   GLIBC_2.30 {
-    pthread_cond_clockwait;
     pthread_mutex_clocklock;
     pthread_rwlock_clockrdlock;
     pthread_rwlock_clockwrlock;
diff --git a/nptl/forward.c b/nptl/forward.c
index c914baec4f..c819ab6f2a 100644
--- a/nptl/forward.c
+++ b/nptl/forward.c
@@ -29,64 +29,3 @@ 
 /* Pointers to the libc functions.  */
 struct pthread_functions __libc_pthread_functions attribute_hidden;
 int __libc_pthread_functions_init attribute_hidden;
-
-
-#define FORWARD2(name, rettype, decl, params, defaction) \
-rettype									      \
-name decl								      \
-{									      \
-  if (!__libc_pthread_functions_init)					      \
-    defaction;								      \
-									      \
-  return PTHFCT_CALL (ptr_##name, params);				      \
-}
-
-#define FORWARD(name, decl, params, defretval) \
-  FORWARD2 (name, int, decl, params, return defretval)
-
-
-#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
-FORWARD2 (__pthread_cond_broadcast_2_0, int attribute_compat_text_section,
-	  (pthread_cond_2_0_t *cond), (cond), return 0)
-compat_symbol (libc, __pthread_cond_broadcast_2_0, pthread_cond_broadcast,
-	       GLIBC_2_0);
-#endif
-FORWARD (__pthread_cond_broadcast, (pthread_cond_t *cond), (cond), 0)
-versioned_symbol (libc, __pthread_cond_broadcast, pthread_cond_broadcast,
-		  GLIBC_2_3_2);
-
-#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
-FORWARD2 (__pthread_cond_signal_2_0, int attribute_compat_text_section,
-	  (pthread_cond_2_0_t *cond), (cond), return 0)
-compat_symbol (libc, __pthread_cond_signal_2_0, pthread_cond_signal,
-	       GLIBC_2_0);
-#endif
-FORWARD (__pthread_cond_signal, (pthread_cond_t *cond), (cond), 0)
-versioned_symbol (libc, __pthread_cond_signal, pthread_cond_signal,
-		  GLIBC_2_3_2);
-
-#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
-FORWARD2 (__pthread_cond_wait_2_0, int attribute_compat_text_section,
-	  (pthread_cond_2_0_t *cond, pthread_mutex_t *mutex), (cond, mutex),
-	  return 0)
-compat_symbol (libc, __pthread_cond_wait_2_0, pthread_cond_wait,
-	       GLIBC_2_0);
-#endif
-FORWARD (__pthread_cond_wait, (pthread_cond_t *cond, pthread_mutex_t *mutex),
-	 (cond, mutex), 0)
-versioned_symbol (libc, __pthread_cond_wait, pthread_cond_wait,
-		  GLIBC_2_3_2);
-
-#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
-FORWARD2 (__pthread_cond_timedwait_2_0, int attribute_compat_text_section,
-	  (pthread_cond_2_0_t *cond, pthread_mutex_t *mutex,
-	   const struct timespec *abstime), (cond, mutex, abstime),
-	  return 0)
-compat_symbol (libc, __pthread_cond_timedwait_2_0, pthread_cond_timedwait,
-	       GLIBC_2_0);
-#endif
-FORWARD (__pthread_cond_timedwait,
-	 (pthread_cond_t *cond, pthread_mutex_t *mutex,
-	  const struct timespec *abstime), (cond, mutex, abstime), 0)
-versioned_symbol (libc, __pthread_cond_timedwait, pthread_cond_timedwait,
-		  GLIBC_2_3_2);
diff --git a/nptl/libpthread-compat.c b/nptl/libpthread-compat.c
index 820dcd6a8f..ee6ba66644 100644
--- a/nptl/libpthread-compat.c
+++ b/nptl/libpthread-compat.c
@@ -50,3 +50,8 @@  compat_symbol_unique (libpthread,
 compat_symbol_unique (libpthread,
 		      __libpthread_version_placeholder, GLIBC_2_2_6);
 #endif
+
+#if (SHLIB_COMPAT (libpthread, GLIBC_2_3_2, GLIBC_2_3_4))
+compat_symbol_unique (libpthread,
+		      __libpthread_version_placeholder, GLIBC_2_3_2);
+#endif
diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
index cbc9430ecb..50bc19c4e3 100644
--- a/nptl/nptl-init.c
+++ b/nptl/nptl-init.c
@@ -53,16 +53,6 @@  static const char nptl_version[] __attribute_used__ = VERSION;
 #ifdef SHARED
 static const struct pthread_functions pthread_functions =
   {
-    .ptr___pthread_cond_broadcast = __pthread_cond_broadcast,
-    .ptr___pthread_cond_signal = __pthread_cond_signal,
-    .ptr___pthread_cond_wait = __pthread_cond_wait,
-    .ptr___pthread_cond_timedwait = __pthread_cond_timedwait,
-# if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
-    .ptr___pthread_cond_broadcast_2_0 = __pthread_cond_broadcast_2_0,
-    .ptr___pthread_cond_signal_2_0 = __pthread_cond_signal_2_0,
-    .ptr___pthread_cond_wait_2_0 = __pthread_cond_wait_2_0,
-    .ptr___pthread_cond_timedwait_2_0 = __pthread_cond_timedwait_2_0,
-# endif
     .ptr__nptl_setxid = __nptl_setxid,
   };
 # define ptr_pthread_functions &pthread_functions
diff --git a/nptl/old_pthread_cond_broadcast.c b/nptl/old_pthread_cond_broadcast.c
index 4224ad9cf3..52dbc58ae4 100644
--- a/nptl/old_pthread_cond_broadcast.c
+++ b/nptl/old_pthread_cond_broadcast.c
@@ -23,7 +23,7 @@ 
 #include <shlib-compat.h>
 
 
-#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
+#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
 int
 __pthread_cond_broadcast_2_0 (pthread_cond_2_0_t *cond)
 {
@@ -42,6 +42,6 @@  __pthread_cond_broadcast_2_0 (pthread_cond_2_0_t *cond)
 
   return __pthread_cond_broadcast (cond->cond);
 }
-compat_symbol (libpthread, __pthread_cond_broadcast_2_0,
+compat_symbol (libc, __pthread_cond_broadcast_2_0,
 	       pthread_cond_broadcast, GLIBC_2_0);
 #endif
diff --git a/nptl/old_pthread_cond_signal.c b/nptl/old_pthread_cond_signal.c
index bab12fd57f..38dd48ccaa 100644
--- a/nptl/old_pthread_cond_signal.c
+++ b/nptl/old_pthread_cond_signal.c
@@ -23,7 +23,7 @@ 
 #include <shlib-compat.h>
 
 
-#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
+#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
 int
 __pthread_cond_signal_2_0 (pthread_cond_2_0_t *cond)
 {
@@ -42,6 +42,6 @@  __pthread_cond_signal_2_0 (pthread_cond_2_0_t *cond)
 
   return __pthread_cond_signal (cond->cond);
 }
-compat_symbol (libpthread, __pthread_cond_signal_2_0, pthread_cond_signal,
+compat_symbol (libc, __pthread_cond_signal_2_0, pthread_cond_signal,
 	       GLIBC_2_0);
 #endif
diff --git a/nptl/old_pthread_cond_timedwait.c b/nptl/old_pthread_cond_timedwait.c
index fdddf3072f..14ef5e7efa 100644
--- a/nptl/old_pthread_cond_timedwait.c
+++ b/nptl/old_pthread_cond_timedwait.c
@@ -23,7 +23,7 @@ 
 #include <shlib-compat.h>
 
 
-#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
+#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
 int
 __pthread_cond_timedwait_2_0 (pthread_cond_2_0_t *cond, pthread_mutex_t *mutex,
 			      const struct timespec *abstime)
@@ -43,6 +43,6 @@  __pthread_cond_timedwait_2_0 (pthread_cond_2_0_t *cond, pthread_mutex_t *mutex,
 
   return __pthread_cond_timedwait (cond->cond, mutex, abstime);
 }
-compat_symbol (libpthread, __pthread_cond_timedwait_2_0,
+compat_symbol (libc, __pthread_cond_timedwait_2_0,
 	       pthread_cond_timedwait, GLIBC_2_0);
 #endif
diff --git a/nptl/old_pthread_cond_wait.c b/nptl/old_pthread_cond_wait.c
index 156493d6be..a45bbd89e7 100644
--- a/nptl/old_pthread_cond_wait.c
+++ b/nptl/old_pthread_cond_wait.c
@@ -23,7 +23,7 @@ 
 #include <shlib-compat.h>
 
 
-#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
+#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
 int
 __pthread_cond_wait_2_0 (pthread_cond_2_0_t *cond, pthread_mutex_t *mutex)
 {
@@ -42,6 +42,6 @@  __pthread_cond_wait_2_0 (pthread_cond_2_0_t *cond, pthread_mutex_t *mutex)
 
   return __pthread_cond_wait (cond->cond, mutex);
 }
-compat_symbol (libpthread, __pthread_cond_wait_2_0, pthread_cond_wait,
+compat_symbol (libc, __pthread_cond_wait_2_0, pthread_cond_wait,
 	       GLIBC_2_0);
 #endif
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index 4feebdf09e..786c566e81 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -457,13 +457,16 @@  libc_hidden_proto (__pthread_rwlock_wrlock)
 extern int __pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock);
 extern int __pthread_rwlock_unlock (pthread_rwlock_t *__rwlock);
 extern int __pthread_cond_broadcast (pthread_cond_t *cond);
+libc_hidden_proto (__pthread_cond_broadcast)
 extern int __pthread_cond_destroy (pthread_cond_t *cond);
 libc_hidden_proto (__pthread_cond_destroy)
 extern int __pthread_cond_init (pthread_cond_t *cond,
 				const pthread_condattr_t *cond_attr);
 libc_hidden_proto (__pthread_cond_init)
 extern int __pthread_cond_signal (pthread_cond_t *cond);
+libc_hidden_proto (__pthread_cond_signal)
 extern int __pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex);
+libc_hidden_proto (__pthread_cond_wait)
 
 #if __TIMESIZE == 64
 # define __pthread_clockjoin_np64 __pthread_clockjoin_np
@@ -487,12 +490,12 @@  libpthread_hidden_proto (__pthread_timedjoin_np64)
 extern int __pthread_cond_timedwait64 (pthread_cond_t *cond,
                                        pthread_mutex_t *mutex,
                                        const struct __timespec64 *abstime);
-libpthread_hidden_proto (__pthread_cond_timedwait64)
+libc_hidden_proto (__pthread_cond_timedwait64)
 extern int __pthread_cond_clockwait64 (pthread_cond_t *cond,
                                        pthread_mutex_t *mutex,
                                        clockid_t clockid,
                                        const struct __timespec64 *abstime);
-libpthread_hidden_proto (__pthread_cond_clockwait64)
+libc_hidden_proto (__pthread_cond_clockwait64)
 extern int __pthread_rwlock_clockrdlock64 (pthread_rwlock_t *rwlock,
                                            clockid_t clockid,
                                            const struct __timespec64 *abstime);
@@ -519,11 +522,13 @@  libpthread_hidden_proto (__pthread_mutex_timedlock64)
 extern int __pthread_cond_timedwait (pthread_cond_t *cond,
 				     pthread_mutex_t *mutex,
 				     const struct timespec *abstime);
+libc_hidden_proto (__pthread_cond_timedwait)
 extern int __pthread_cond_clockwait (pthread_cond_t *cond,
 				     pthread_mutex_t *mutex,
 				     clockid_t clockid,
 				     const struct timespec *abstime)
   __nonnull ((1, 2, 4));
+libc_hidden_proto (__pthread_cond_clockwait)
 extern int __pthread_condattr_destroy (pthread_condattr_t *attr);
 extern int __pthread_condattr_init (pthread_condattr_t *attr);
 extern int __pthread_key_create (pthread_key_t *key, void (*destr) (void *));
diff --git a/nptl/pthread_cond_broadcast.c b/nptl/pthread_cond_broadcast.c
index e64e124b5b..00326ad435 100644
--- a/nptl/pthread_cond_broadcast.c
+++ b/nptl/pthread_cond_broadcast.c
@@ -36,7 +36,7 @@ 
    G1.  We don't need to do all these steps if there are no waiters in G1
    and/or G2.  See __pthread_cond_signal for further details.  */
 int
-__pthread_cond_broadcast (pthread_cond_t *cond)
+__pthread_cond_broadcast_1 (pthread_cond_t *cond)
 {
   LIBC_PROBE (cond_broadcast, 1, cond);
 
@@ -87,6 +87,9 @@  __pthread_cond_broadcast (pthread_cond_t *cond)
 
   return 0;
 }
-
-versioned_symbol (libpthread, __pthread_cond_broadcast, pthread_cond_broadcast,
-		  GLIBC_2_3_2);
+versioned_symbol (libpthread, __pthread_cond_broadcast_1,
+		  pthread_cond_broadcast, GLIBC_2_3_2);
+libc_hidden_ver (__pthread_cond_broadcast_1, __pthread_cond_broadcast)
+strong_alias (__pthread_cond_broadcast_1, __pthread_cond_broadcast_2)
+versioned_symbol (libpthread, __pthread_cond_broadcast_2,
+		  __pthread_cond_broadcast, GLIBC_PRIVATE);
diff --git a/nptl/pthread_cond_signal.c b/nptl/pthread_cond_signal.c
index 77073342b2..88ce3811d2 100644
--- a/nptl/pthread_cond_signal.c
+++ b/nptl/pthread_cond_signal.c
@@ -32,7 +32,7 @@ 
 
 /* See __pthread_cond_wait for a high-level description of the algorithm.  */
 int
-__pthread_cond_signal (pthread_cond_t *cond)
+__pthread_cond_signal_1 (pthread_cond_t *cond)
 {
   LIBC_PROBE (cond_signal, 1, cond);
 
@@ -95,6 +95,9 @@  __pthread_cond_signal (pthread_cond_t *cond)
 
   return 0;
 }
-
-versioned_symbol (libpthread, __pthread_cond_signal, pthread_cond_signal,
+versioned_symbol (libpthread, __pthread_cond_signal_1, pthread_cond_signal,
 		  GLIBC_2_3_2);
+libc_hidden_ver (__pthread_cond_signal_1, __pthread_cond_signal)
+strong_alias (__pthread_cond_signal_1, __pthread_cond_signal_2)
+versioned_symbol (libpthread, __pthread_cond_signal_2,
+		  __pthread_cond_signal, GLIBC_PRIVATE);
diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c
index a481bb55fc..2eb6c85f4e 100644
--- a/nptl/pthread_cond_wait.c
+++ b/nptl/pthread_cond_wait.c
@@ -613,16 +613,23 @@  __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
 
 /* See __pthread_cond_wait_common.  */
 int
-__pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex)
+__pthread_cond_wait_1 (pthread_cond_t *cond, pthread_mutex_t *mutex)
 {
   /* clockid is unused when abstime is NULL. */
   return __pthread_cond_wait_common (cond, mutex, 0, NULL);
 }
 
+versioned_symbol (libpthread, __pthread_cond_wait_1, pthread_cond_wait,
+		  GLIBC_2_3_2);
+libc_hidden_ver (__pthread_cond_wait_1, __pthread_cond_wait)
+strong_alias (__pthread_cond_wait_1, __pthread_cond_wait_2)
+versioned_symbol (libpthread, __pthread_cond_wait_2, __pthread_cond_wait,
+		  GLIBC_PRIVATE);
+
 /* See __pthread_cond_wait_common.  */
 int
-__pthread_cond_timedwait64 (pthread_cond_t *cond, pthread_mutex_t *mutex,
-                            const struct __timespec64 *abstime)
+__pthread_cond_timedwait64_1 (pthread_cond_t *cond, pthread_mutex_t *mutex,
+			      const struct __timespec64 *abstime)
 {
   /* Check parameter validity.  This should also tell the compiler that
      it can assume that abstime is not NULL.  */
@@ -637,29 +644,34 @@  __pthread_cond_timedwait64 (pthread_cond_t *cond, pthread_mutex_t *mutex,
   return __pthread_cond_wait_common (cond, mutex, clockid, abstime);
 }
 
-#if __TIMESIZE != 64
-libpthread_hidden_def (__pthread_cond_timedwait64)
+#if __TIMESIZE == 64
+strong_alias (__pthread_cond_timedwait64_1, __pthread_cond_timedwait_1)
+#else
+versioned_symbol (libc, __pthread_cond_timedwait64_1,
+		  __pthread_cond_timedwait64, GLIBC_PRIVATE);
+libc_hidden_ver (__pthread_cond_timedwait64_1, __pthread_cond_timedwait64)
 
 int
-__pthread_cond_timedwait (pthread_cond_t *cond, pthread_mutex_t *mutex,
-                          const struct timespec *abstime)
+__pthread_cond_timedwait_1 (pthread_cond_t *cond, pthread_mutex_t *mutex,
+			    const struct timespec *abstime)
 {
   struct __timespec64 ts64 = valid_timespec_to_timespec64 (*abstime);
 
   return __pthread_cond_timedwait64 (cond, mutex, &ts64);
 }
-#endif
-
-versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
-		  GLIBC_2_3_2);
-versioned_symbol (libpthread, __pthread_cond_timedwait, pthread_cond_timedwait,
-		  GLIBC_2_3_2);
+#endif /* __TIMESIZE == 64 */
+versioned_symbol (libpthread, __pthread_cond_timedwait_1,
+		  pthread_cond_timedwait, GLIBC_2_3_2);
+libc_hidden_ver (__pthread_cond_timedwait_1, __pthread_cond_timedwait)
+strong_alias (__pthread_cond_timedwait_1, __pthread_cond_timedwait_2)
+versioned_symbol (libpthread, __pthread_cond_timedwait_2,
+		  __pthread_cond_timedwait, GLIBC_PRIVATE);
 
 /* See __pthread_cond_wait_common.  */
 int
-__pthread_cond_clockwait64 (pthread_cond_t *cond, pthread_mutex_t *mutex,
-                            clockid_t clockid,
-                            const struct __timespec64 *abstime)
+__pthread_cond_clockwait64_1 (pthread_cond_t *cond, pthread_mutex_t *mutex,
+			      clockid_t clockid,
+			      const struct __timespec64 *abstime)
 {
   /* Check parameter validity.  This should also tell the compiler that
      it can assume that abstime is not NULL.  */
@@ -672,11 +684,15 @@  __pthread_cond_clockwait64 (pthread_cond_t *cond, pthread_mutex_t *mutex,
   return __pthread_cond_wait_common (cond, mutex, clockid, abstime);
 }
 
-#if __TIMESIZE != 64
-libpthread_hidden_def (__pthread_cond_clockwait64)
+#if __TIMESIZE == 64
+strong_alias (__pthread_cond_clockwait64_1, __pthread_cond_clockwait_1)
+#else
+versioned_symbol (libc, __pthread_cond_clockwait64_1,
+		  __pthread_cond_clockwait64, GLIBC_PRIVATE);
+libc_hidden_ver (__pthread_cond_clockwait64_1, __pthread_cond_clockwait64)
 
 int
-__pthread_cond_clockwait (pthread_cond_t *cond, pthread_mutex_t *mutex,
+__pthread_cond_clockwait_1 (pthread_cond_t *cond, pthread_mutex_t *mutex,
                           clockid_t clockid,
                           const struct timespec *abstime)
 {
@@ -684,5 +700,15 @@  __pthread_cond_clockwait (pthread_cond_t *cond, pthread_mutex_t *mutex,
 
   return __pthread_cond_clockwait64 (cond, mutex, clockid, &ts64);
 }
+#endif /* __TIMESIZE == 64 */
+versioned_symbol (libc, __pthread_cond_clockwait_1,
+		  __pthread_cond_clockwait, GLIBC_PRIVATE);
+libc_hidden_ver (__pthread_cond_clockwait_1, __pthread_cond_clockwait)
+strong_alias (__pthread_cond_clockwait_1, __pthread_cond_clockwait_2)
+versioned_symbol (libc, __pthread_cond_clockwait_2,
+		  pthread_cond_clockwait, GLIBC_2_34);
+#if SHLIB_COMPAT (libc, GLIBC_2_30, GLIBC_2_34)
+strong_alias (__pthread_cond_clockwait_1, __pthread_cond_clockwait_3)
+compat_symbol (libc, __pthread_cond_clockwait_3,
+	       pthread_cond_clockwait, GLIBC_2_30);
 #endif
-weak_alias (__pthread_cond_clockwait, pthread_cond_clockwait);
diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
index dab5a2831e..56c746a01c 100644
--- a/sysdeps/nptl/pthread-functions.h
+++ b/sysdeps/nptl/pthread-functions.h
@@ -30,17 +30,6 @@  struct xid_command;
    the thread functions.  */
 struct pthread_functions
 {
-  int (*ptr___pthread_cond_broadcast) (pthread_cond_t *);
-  int (*ptr___pthread_cond_signal) (pthread_cond_t *);
-  int (*ptr___pthread_cond_wait) (pthread_cond_t *, pthread_mutex_t *);
-  int (*ptr___pthread_cond_timedwait) (pthread_cond_t *, pthread_mutex_t *,
-				       const struct timespec *);
-  int (*ptr___pthread_cond_broadcast_2_0) (pthread_cond_2_0_t *);
-  int (*ptr___pthread_cond_signal_2_0) (pthread_cond_2_0_t *);
-  int (*ptr___pthread_cond_wait_2_0) (pthread_cond_2_0_t *, pthread_mutex_t *);
-  int (*ptr___pthread_cond_timedwait_2_0) (pthread_cond_2_0_t *,
-					   pthread_mutex_t *,
-					   const struct timespec *);
   int (*ptr__nptl_setxid) (struct xid_command *);
 };
 
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index 381947232e..918e8ad5ce 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -2174,6 +2174,7 @@  GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
 GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.32 __libc_single_threaded D 0x1
@@ -2212,6 +2213,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
index 29a98fc2f4..421b093c4c 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
@@ -64,10 +64,6 @@  GLIBC_2.17 pthread_barrierattr_getpshared F
 GLIBC_2.17 pthread_barrierattr_init F
 GLIBC_2.17 pthread_barrierattr_setpshared F
 GLIBC_2.17 pthread_cancel F
-GLIBC_2.17 pthread_cond_broadcast F
-GLIBC_2.17 pthread_cond_signal F
-GLIBC_2.17 pthread_cond_timedwait F
-GLIBC_2.17 pthread_cond_wait F
 GLIBC_2.17 pthread_condattr_getclock F
 GLIBC_2.17 pthread_condattr_getpshared F
 GLIBC_2.17 pthread_condattr_setclock F
@@ -174,7 +170,6 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index 7e314dd68b..b197b40425 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -2255,6 +2255,7 @@  GLIBC_2.30 __nldbl_warn F
 GLIBC_2.30 __nldbl_warnx F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.32 __libc_single_threaded D 0x1
@@ -2293,6 +2294,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
index 29cb6259a5..69809f7794 100644
--- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
@@ -30,10 +30,6 @@  GLIBC_2.0 open F
 GLIBC_2.0 pause F
 GLIBC_2.0 pthread_atfork F
 GLIBC_2.0 pthread_cancel F
-GLIBC_2.0 pthread_cond_broadcast F
-GLIBC_2.0 pthread_cond_signal F
-GLIBC_2.0 pthread_cond_timedwait F
-GLIBC_2.0 pthread_cond_wait F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_join F
@@ -165,10 +161,7 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_signal F
-GLIBC_2.3.2 pthread_cond_timedwait F
-GLIBC_2.3.2 pthread_cond_wait F
+GLIBC_2.3.2 __libpthread_version_placeholder F
 GLIBC_2.3.3 __pthread_register_cancel F
 GLIBC_2.3.3 __pthread_register_cancel_defer F
 GLIBC_2.3.3 __pthread_unregister_cancel F
@@ -185,7 +178,6 @@  GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 pthread_setschedprio F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
index 014b30c7bd..fccb579d59 100644
--- a/sysdeps/unix/sysv/linux/arc/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
@@ -1374,6 +1374,7 @@  GLIBC_2.32 pthread_attr_setschedpolicy F
 GLIBC_2.32 pthread_attr_setscope F
 GLIBC_2.32 pthread_attr_setsigmask_np F
 GLIBC_2.32 pthread_cond_broadcast F
+GLIBC_2.32 pthread_cond_clockwait F
 GLIBC_2.32 pthread_cond_destroy F
 GLIBC_2.32 pthread_cond_init F
 GLIBC_2.32 pthread_cond_signal F
@@ -1972,6 +1973,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist
index b926ef9dba..9e16734b8c 100644
--- a/sysdeps/unix/sysv/linux/arc/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist
@@ -76,11 +76,6 @@  GLIBC_2.32 pthread_barrierattr_init F
 GLIBC_2.32 pthread_barrierattr_setpshared F
 GLIBC_2.32 pthread_cancel F
 GLIBC_2.32 pthread_clockjoin_np F
-GLIBC_2.32 pthread_cond_broadcast F
-GLIBC_2.32 pthread_cond_clockwait F
-GLIBC_2.32 pthread_cond_signal F
-GLIBC_2.32 pthread_cond_timedwait F
-GLIBC_2.32 pthread_cond_wait F
 GLIBC_2.32 pthread_condattr_getclock F
 GLIBC_2.32 pthread_condattr_getpshared F
 GLIBC_2.32 pthread_condattr_setclock F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
index 412eb541fc..0e3cb8f22b 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
@@ -129,6 +129,7 @@  GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
 GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.31 msgctl F
@@ -170,6 +171,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
index 8dd2c3f7a6..bd870717f2 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
@@ -26,7 +26,6 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
@@ -98,10 +97,6 @@  GLIBC_2.4 pthread_barrierattr_getpshared F
 GLIBC_2.4 pthread_barrierattr_init F
 GLIBC_2.4 pthread_barrierattr_setpshared F
 GLIBC_2.4 pthread_cancel F
-GLIBC_2.4 pthread_cond_broadcast F
-GLIBC_2.4 pthread_cond_signal F
-GLIBC_2.4 pthread_cond_timedwait F
-GLIBC_2.4 pthread_cond_wait F
 GLIBC_2.4 pthread_condattr_getclock F
 GLIBC_2.4 pthread_condattr_getpshared F
 GLIBC_2.4 pthread_condattr_setclock F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
index 588f1d6b42..10b35e83ab 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
@@ -129,6 +129,7 @@  GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
 GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.32 __libc_single_threaded D 0x1
@@ -167,6 +168,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
index 8dd2c3f7a6..bd870717f2 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
@@ -26,7 +26,6 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
@@ -98,10 +97,6 @@  GLIBC_2.4 pthread_barrierattr_getpshared F
 GLIBC_2.4 pthread_barrierattr_init F
 GLIBC_2.4 pthread_barrierattr_setpshared F
 GLIBC_2.4 pthread_cancel F
-GLIBC_2.4 pthread_cond_broadcast F
-GLIBC_2.4 pthread_cond_signal F
-GLIBC_2.4 pthread_cond_timedwait F
-GLIBC_2.4 pthread_cond_wait F
 GLIBC_2.4 pthread_condattr_getclock F
 GLIBC_2.4 pthread_condattr_getpshared F
 GLIBC_2.4 pthread_condattr_setclock F
diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist
index 76fb31f895..dbbf62eba3 100644
--- a/sysdeps/unix/sysv/linux/csky/libc.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libc.abilist
@@ -2118,6 +2118,7 @@  GLIBC_2.29 xprt_register F
 GLIBC_2.29 xprt_unregister F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.32 __libc_single_threaded D 0x1
@@ -2156,6 +2157,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
index 2c4d219569..e4d8c8fcb0 100644
--- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
@@ -75,10 +75,6 @@  GLIBC_2.29 pthread_barrierattr_getpshared F
 GLIBC_2.29 pthread_barrierattr_init F
 GLIBC_2.29 pthread_barrierattr_setpshared F
 GLIBC_2.29 pthread_cancel F
-GLIBC_2.29 pthread_cond_broadcast F
-GLIBC_2.29 pthread_cond_signal F
-GLIBC_2.29 pthread_cond_timedwait F
-GLIBC_2.29 pthread_cond_wait F
 GLIBC_2.29 pthread_condattr_getclock F
 GLIBC_2.29 pthread_condattr_getpshared F
 GLIBC_2.29 pthread_condattr_setclock F
@@ -171,7 +167,6 @@  GLIBC_2.29 tss_delete F
 GLIBC_2.29 tss_get F
 GLIBC_2.29 tss_set F
 GLIBC_2.29 write F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
index e99899dee5..8b3960aff8 100644
--- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
@@ -2076,6 +2076,7 @@  GLIBC_2.3.4 xdr_quad_t F
 GLIBC_2.3.4 xdr_u_quad_t F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.32 __libc_single_threaded D 0x1
@@ -2114,6 +2115,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
index 9e15deaad8..3eb40a91f7 100644
--- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
@@ -66,10 +66,6 @@  GLIBC_2.2 pthread_barrierattr_destroy F
 GLIBC_2.2 pthread_barrierattr_init F
 GLIBC_2.2 pthread_barrierattr_setpshared F
 GLIBC_2.2 pthread_cancel F
-GLIBC_2.2 pthread_cond_broadcast F
-GLIBC_2.2 pthread_cond_signal F
-GLIBC_2.2 pthread_cond_timedwait F
-GLIBC_2.2 pthread_cond_wait F
 GLIBC_2.2 pthread_condattr_getpshared F
 GLIBC_2.2 pthread_condattr_setpshared F
 GLIBC_2.2 pthread_create F
@@ -157,10 +153,7 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_signal F
-GLIBC_2.3.2 pthread_cond_timedwait F
-GLIBC_2.3.2 pthread_cond_wait F
+GLIBC_2.3.2 __libpthread_version_placeholder F
 GLIBC_2.3.3 __pthread_register_cancel F
 GLIBC_2.3.3 __pthread_register_cancel_defer F
 GLIBC_2.3.3 __pthread_unregister_cancel F
@@ -175,7 +168,6 @@  GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 pthread_setschedprio F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
index 29b8e0c1eb..bbc1d42e71 100644
--- a/sysdeps/unix/sysv/linux/i386/libc.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
@@ -2242,6 +2242,7 @@  GLIBC_2.3.4 xdr_quad_t F
 GLIBC_2.3.4 xdr_u_quad_t F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.32 __libc_single_threaded D 0x1
@@ -2281,6 +2282,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
index 4065a88a3b..3d9efa60e0 100644
--- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
@@ -30,10 +30,6 @@  GLIBC_2.0 open F
 GLIBC_2.0 pause F
 GLIBC_2.0 pthread_atfork F
 GLIBC_2.0 pthread_cancel F
-GLIBC_2.0 pthread_cond_broadcast F
-GLIBC_2.0 pthread_cond_signal F
-GLIBC_2.0 pthread_cond_timedwait F
-GLIBC_2.0 pthread_cond_wait F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_join F
@@ -165,10 +161,7 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_signal F
-GLIBC_2.3.2 pthread_cond_timedwait F
-GLIBC_2.3.2 pthread_cond_wait F
+GLIBC_2.3.2 __libpthread_version_placeholder F
 GLIBC_2.3.3 __pthread_register_cancel F
 GLIBC_2.3.3 __pthread_register_cancel_defer F
 GLIBC_2.3.3 __pthread_unregister_cancel F
@@ -183,7 +176,6 @@  GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 pthread_setschedprio F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
index fb8a36ce20..4cf13e29a8 100644
--- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
@@ -2108,6 +2108,7 @@  GLIBC_2.3.4 xdr_quad_t F
 GLIBC_2.3.4 xdr_u_quad_t F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.32 __libc_single_threaded D 0x1
@@ -2146,6 +2147,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
index 684bf559e5..974fa09b43 100644
--- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
@@ -66,10 +66,6 @@  GLIBC_2.2 pthread_barrierattr_destroy F
 GLIBC_2.2 pthread_barrierattr_init F
 GLIBC_2.2 pthread_barrierattr_setpshared F
 GLIBC_2.2 pthread_cancel F
-GLIBC_2.2 pthread_cond_broadcast F
-GLIBC_2.2 pthread_cond_signal F
-GLIBC_2.2 pthread_cond_timedwait F
-GLIBC_2.2 pthread_cond_wait F
 GLIBC_2.2 pthread_condattr_getpshared F
 GLIBC_2.2 pthread_condattr_setpshared F
 GLIBC_2.2 pthread_create F
@@ -157,10 +153,7 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_signal F
-GLIBC_2.3.2 pthread_cond_timedwait F
-GLIBC_2.3.2 pthread_cond_wait F
+GLIBC_2.3.2 __libpthread_version_placeholder F
 GLIBC_2.3.3 __pthread_register_cancel F
 GLIBC_2.3.3 __pthread_register_cancel_defer F
 GLIBC_2.3.3 __pthread_unregister_cancel F
@@ -177,7 +170,6 @@  GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 pthread_setschedprio F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
index 03e80e6a12..75e546da5d 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
@@ -130,6 +130,7 @@  GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
 GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.31 msgctl F
@@ -171,6 +172,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
index 8dd2c3f7a6..bd870717f2 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
@@ -26,7 +26,6 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
@@ -98,10 +97,6 @@  GLIBC_2.4 pthread_barrierattr_getpshared F
 GLIBC_2.4 pthread_barrierattr_init F
 GLIBC_2.4 pthread_barrierattr_setpshared F
 GLIBC_2.4 pthread_cancel F
-GLIBC_2.4 pthread_cond_broadcast F
-GLIBC_2.4 pthread_cond_signal F
-GLIBC_2.4 pthread_cond_timedwait F
-GLIBC_2.4 pthread_cond_wait F
 GLIBC_2.4 pthread_condattr_getclock F
 GLIBC_2.4 pthread_condattr_getpshared F
 GLIBC_2.4 pthread_condattr_setclock F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
index 2a5bee30d1..7a24d3ce17 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
@@ -2185,6 +2185,7 @@  GLIBC_2.3.4 xdr_quad_t F
 GLIBC_2.3.4 xdr_u_quad_t F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.31 msgctl F
@@ -2226,6 +2227,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
index 4065a88a3b..3d9efa60e0 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
@@ -30,10 +30,6 @@  GLIBC_2.0 open F
 GLIBC_2.0 pause F
 GLIBC_2.0 pthread_atfork F
 GLIBC_2.0 pthread_cancel F
-GLIBC_2.0 pthread_cond_broadcast F
-GLIBC_2.0 pthread_cond_signal F
-GLIBC_2.0 pthread_cond_timedwait F
-GLIBC_2.0 pthread_cond_wait F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_join F
@@ -165,10 +161,7 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_signal F
-GLIBC_2.3.2 pthread_cond_timedwait F
-GLIBC_2.3.2 pthread_cond_wait F
+GLIBC_2.3.2 __libpthread_version_placeholder F
 GLIBC_2.3.3 __pthread_register_cancel F
 GLIBC_2.3.3 __pthread_register_cancel_defer F
 GLIBC_2.3.3 __pthread_unregister_cancel F
@@ -183,7 +176,6 @@  GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 pthread_setschedprio F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
index b46567880e..4d0fef0d93 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
@@ -2166,6 +2166,7 @@  GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
 GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.31 msgctl F
@@ -2207,6 +2208,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
index d8a9642f66..3ad8bce93a 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
@@ -64,10 +64,6 @@  GLIBC_2.18 pthread_barrierattr_getpshared F
 GLIBC_2.18 pthread_barrierattr_init F
 GLIBC_2.18 pthread_barrierattr_setpshared F
 GLIBC_2.18 pthread_cancel F
-GLIBC_2.18 pthread_cond_broadcast F
-GLIBC_2.18 pthread_cond_signal F
-GLIBC_2.18 pthread_cond_timedwait F
-GLIBC_2.18 pthread_cond_wait F
 GLIBC_2.18 pthread_condattr_getclock F
 GLIBC_2.18 pthread_condattr_getpshared F
 GLIBC_2.18 pthread_condattr_setclock F
@@ -174,7 +170,6 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
index 7796c5313a..2a06c0ed64 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
@@ -2166,6 +2166,7 @@  GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
 GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.32 __libc_single_threaded D 0x1
@@ -2204,6 +2205,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
index d8a9642f66..3ad8bce93a 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
@@ -64,10 +64,6 @@  GLIBC_2.18 pthread_barrierattr_getpshared F
 GLIBC_2.18 pthread_barrierattr_init F
 GLIBC_2.18 pthread_barrierattr_setpshared F
 GLIBC_2.18 pthread_cancel F
-GLIBC_2.18 pthread_cond_broadcast F
-GLIBC_2.18 pthread_cond_signal F
-GLIBC_2.18 pthread_cond_timedwait F
-GLIBC_2.18 pthread_cond_wait F
 GLIBC_2.18 pthread_condattr_getclock F
 GLIBC_2.18 pthread_condattr_getpshared F
 GLIBC_2.18 pthread_condattr_setclock F
@@ -174,7 +170,6 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
index c3e658dbc1..99bb618f1f 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
@@ -2159,6 +2159,7 @@  GLIBC_2.3.4 xdr_quad_t F
 GLIBC_2.3.4 xdr_u_quad_t F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.32 __libc_single_threaded D 0x1
@@ -2197,6 +2198,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
index 4bd5de2dd7..2ab8395a4a 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
@@ -30,10 +30,6 @@  GLIBC_2.0 open F
 GLIBC_2.0 pause F
 GLIBC_2.0 pthread_atfork F
 GLIBC_2.0 pthread_cancel F
-GLIBC_2.0 pthread_cond_broadcast F
-GLIBC_2.0 pthread_cond_signal F
-GLIBC_2.0 pthread_cond_timedwait F
-GLIBC_2.0 pthread_cond_wait F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_join F
@@ -164,10 +160,7 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_signal F
-GLIBC_2.3.2 pthread_cond_timedwait F
-GLIBC_2.3.2 pthread_cond_wait F
+GLIBC_2.3.2 __libpthread_version_placeholder F
 GLIBC_2.3.3 __pthread_register_cancel F
 GLIBC_2.3.3 __pthread_register_cancel_defer F
 GLIBC_2.3.3 __pthread_unregister_cancel F
@@ -184,7 +177,6 @@  GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 pthread_setschedprio F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
index bae73ebb39..7d66f78876 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
@@ -2157,6 +2157,7 @@  GLIBC_2.3.4 xdr_quad_t F
 GLIBC_2.3.4 xdr_u_quad_t F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.32 __libc_single_threaded D 0x1
@@ -2195,6 +2196,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
index 4bd5de2dd7..2ab8395a4a 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
@@ -30,10 +30,6 @@  GLIBC_2.0 open F
 GLIBC_2.0 pause F
 GLIBC_2.0 pthread_atfork F
 GLIBC_2.0 pthread_cancel F
-GLIBC_2.0 pthread_cond_broadcast F
-GLIBC_2.0 pthread_cond_signal F
-GLIBC_2.0 pthread_cond_timedwait F
-GLIBC_2.0 pthread_cond_wait F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_join F
@@ -164,10 +160,7 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_signal F
-GLIBC_2.3.2 pthread_cond_timedwait F
-GLIBC_2.3.2 pthread_cond_wait F
+GLIBC_2.3.2 __libpthread_version_placeholder F
 GLIBC_2.3.3 __pthread_register_cancel F
 GLIBC_2.3.3 __pthread_register_cancel_defer F
 GLIBC_2.3.3 __pthread_unregister_cancel F
@@ -184,7 +177,6 @@  GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 pthread_setschedprio F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
index 74fb3b997e..55cc5e99bf 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
@@ -2165,6 +2165,7 @@  GLIBC_2.3.4 xdr_quad_t F
 GLIBC_2.3.4 xdr_u_quad_t F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.32 __libc_single_threaded D 0x1
@@ -2203,6 +2204,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
index 3083e3d821..208a801c9d 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
@@ -2159,6 +2159,7 @@  GLIBC_2.3.4 xdr_quad_t F
 GLIBC_2.3.4 xdr_u_quad_t F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.32 __libc_single_threaded D 0x1
@@ -2197,6 +2198,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
index f79ca91eb7..7525da4a92 100644
--- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
@@ -2207,6 +2207,7 @@  GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
 GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.32 __libc_single_threaded D 0x1
@@ -2245,6 +2246,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
index c469853b65..263808a2b8 100644
--- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
@@ -64,10 +64,6 @@  GLIBC_2.21 pthread_barrierattr_getpshared F
 GLIBC_2.21 pthread_barrierattr_init F
 GLIBC_2.21 pthread_barrierattr_setpshared F
 GLIBC_2.21 pthread_cancel F
-GLIBC_2.21 pthread_cond_broadcast F
-GLIBC_2.21 pthread_cond_signal F
-GLIBC_2.21 pthread_cond_timedwait F
-GLIBC_2.21 pthread_cond_wait F
 GLIBC_2.21 pthread_condattr_getclock F
 GLIBC_2.21 pthread_condattr_getpshared F
 GLIBC_2.21 pthread_condattr_setclock F
@@ -174,7 +170,6 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
index f5408e6078..7c85534f61 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
@@ -2215,6 +2215,7 @@  GLIBC_2.30 __nldbl_warn F
 GLIBC_2.30 __nldbl_warnx F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.32 __libc_single_threaded D 0x1
@@ -2253,6 +2254,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
index 44fb3a6743..7d696c9be7 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
@@ -30,10 +30,6 @@  GLIBC_2.0 open F
 GLIBC_2.0 pause F
 GLIBC_2.0 pthread_atfork F
 GLIBC_2.0 pthread_cancel F
-GLIBC_2.0 pthread_cond_broadcast F
-GLIBC_2.0 pthread_cond_signal F
-GLIBC_2.0 pthread_cond_timedwait F
-GLIBC_2.0 pthread_cond_wait F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_join F
@@ -165,10 +161,7 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_signal F
-GLIBC_2.3.2 pthread_cond_timedwait F
-GLIBC_2.3.2 pthread_cond_wait F
+GLIBC_2.3.2 __libpthread_version_placeholder F
 GLIBC_2.3.3 __pthread_register_cancel F
 GLIBC_2.3.3 __pthread_register_cancel_defer F
 GLIBC_2.3.3 __pthread_unregister_cancel F
@@ -183,7 +176,6 @@  GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 pthread_setschedprio F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
index a7587dcc45..1e4059c7f6 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
@@ -2248,6 +2248,7 @@  GLIBC_2.30 __nldbl_warn F
 GLIBC_2.30 __nldbl_warnx F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.32 __libc_single_threaded D 0x1
@@ -2286,6 +2287,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
index 7ea6dc6574..e72f329cf9 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
@@ -2078,6 +2078,7 @@  GLIBC_2.30 __nldbl_warn F
 GLIBC_2.30 __nldbl_warnx F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.32 __libc_single_threaded D 0x1
@@ -2116,6 +2117,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
index 2e77dc2fb3..342642ee59 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
@@ -86,10 +86,6 @@  GLIBC_2.3 pthread_barrierattr_destroy F
 GLIBC_2.3 pthread_barrierattr_init F
 GLIBC_2.3 pthread_barrierattr_setpshared F
 GLIBC_2.3 pthread_cancel F
-GLIBC_2.3 pthread_cond_broadcast F
-GLIBC_2.3 pthread_cond_signal F
-GLIBC_2.3 pthread_cond_timedwait F
-GLIBC_2.3 pthread_cond_wait F
 GLIBC_2.3 pthread_condattr_getpshared F
 GLIBC_2.3 pthread_condattr_setpshared F
 GLIBC_2.3 pthread_create F
@@ -154,10 +150,7 @@  GLIBC_2.3 sigwait F
 GLIBC_2.3 system F
 GLIBC_2.3 tcdrain F
 GLIBC_2.3 write F
-GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_signal F
-GLIBC_2.3.2 pthread_cond_timedwait F
-GLIBC_2.3.2 pthread_cond_wait F
+GLIBC_2.3.2 __libpthread_version_placeholder F
 GLIBC_2.3.3 __pthread_register_cancel F
 GLIBC_2.3.3 __pthread_register_cancel_defer F
 GLIBC_2.3.3 __pthread_unregister_cancel F
@@ -172,7 +165,6 @@  GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 pthread_setschedprio F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
index f994892fd9..36dd35b01a 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
@@ -2276,6 +2276,7 @@  GLIBC_2.30 __nldbl_warn F
 GLIBC_2.30 __nldbl_warnx F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.32 __argp_errorieee128 F
@@ -2407,6 +2408,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
index 29a98fc2f4..421b093c4c 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
@@ -64,10 +64,6 @@  GLIBC_2.17 pthread_barrierattr_getpshared F
 GLIBC_2.17 pthread_barrierattr_init F
 GLIBC_2.17 pthread_barrierattr_setpshared F
 GLIBC_2.17 pthread_cancel F
-GLIBC_2.17 pthread_cond_broadcast F
-GLIBC_2.17 pthread_cond_signal F
-GLIBC_2.17 pthread_cond_timedwait F
-GLIBC_2.17 pthread_cond_wait F
 GLIBC_2.17 pthread_condattr_getclock F
 GLIBC_2.17 pthread_condattr_getpshared F
 GLIBC_2.17 pthread_condattr_setclock F
@@ -174,7 +170,6 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
index 70b873f9fb..955b5df1f3 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
@@ -1376,6 +1376,7 @@  GLIBC_2.33 pthread_attr_setschedpolicy F
 GLIBC_2.33 pthread_attr_setscope F
 GLIBC_2.33 pthread_attr_setsigmask_np F
 GLIBC_2.33 pthread_cond_broadcast F
+GLIBC_2.33 pthread_cond_clockwait F
 GLIBC_2.33 pthread_cond_destroy F
 GLIBC_2.33 pthread_cond_init F
 GLIBC_2.33 pthread_cond_signal F
@@ -1974,6 +1975,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
index 911969f7eb..23b5630a69 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
@@ -76,11 +76,6 @@  GLIBC_2.33 pthread_barrierattr_init F
 GLIBC_2.33 pthread_barrierattr_setpshared F
 GLIBC_2.33 pthread_cancel F
 GLIBC_2.33 pthread_clockjoin_np F
-GLIBC_2.33 pthread_cond_broadcast F
-GLIBC_2.33 pthread_cond_clockwait F
-GLIBC_2.33 pthread_cond_signal F
-GLIBC_2.33 pthread_cond_timedwait F
-GLIBC_2.33 pthread_cond_wait F
 GLIBC_2.33 pthread_condattr_getclock F
 GLIBC_2.33 pthread_condattr_getpshared F
 GLIBC_2.33 pthread_condattr_setclock F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
index ddfac62fd0..74bf464fa9 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
@@ -2136,6 +2136,7 @@  GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
 GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.32 __libc_single_threaded D 0x1
@@ -2174,6 +2175,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
index 21f462137a..58402c8360 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
@@ -64,10 +64,6 @@  GLIBC_2.27 pthread_barrierattr_getpshared F
 GLIBC_2.27 pthread_barrierattr_init F
 GLIBC_2.27 pthread_barrierattr_setpshared F
 GLIBC_2.27 pthread_cancel F
-GLIBC_2.27 pthread_cond_broadcast F
-GLIBC_2.27 pthread_cond_signal F
-GLIBC_2.27 pthread_cond_timedwait F
-GLIBC_2.27 pthread_cond_wait F
 GLIBC_2.27 pthread_condattr_getclock F
 GLIBC_2.27 pthread_condattr_getpshared F
 GLIBC_2.27 pthread_condattr_setclock F
@@ -173,7 +169,6 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
index 078237adb2..ad26a36c0b 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
@@ -2210,6 +2210,7 @@  GLIBC_2.30 __nldbl_warn F
 GLIBC_2.30 __nldbl_warnx F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.31 msgctl F
@@ -2251,6 +2252,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
index 7b2edb7f57..0f527c3335 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
@@ -30,10 +30,6 @@  GLIBC_2.0 open F
 GLIBC_2.0 pause F
 GLIBC_2.0 pthread_atfork F
 GLIBC_2.0 pthread_cancel F
-GLIBC_2.0 pthread_cond_broadcast F
-GLIBC_2.0 pthread_cond_signal F
-GLIBC_2.0 pthread_cond_timedwait F
-GLIBC_2.0 pthread_cond_wait F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_join F
@@ -166,10 +162,7 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_signal F
-GLIBC_2.3.2 pthread_cond_timedwait F
-GLIBC_2.3.2 pthread_cond_wait F
+GLIBC_2.3.2 __libpthread_version_placeholder F
 GLIBC_2.3.3 __pthread_register_cancel F
 GLIBC_2.3.3 __pthread_register_cancel_defer F
 GLIBC_2.3.3 __pthread_unregister_cancel F
@@ -184,7 +177,6 @@  GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 pthread_setschedprio F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
index a2700aba32..b75431f830 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
@@ -2114,6 +2114,7 @@  GLIBC_2.30 __nldbl_warn F
 GLIBC_2.30 __nldbl_warnx F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.32 __libc_single_threaded D 0x1
@@ -2152,6 +2153,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
index 8b4729fb7a..5af8b32f0b 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
@@ -67,10 +67,6 @@  GLIBC_2.2 pthread_barrierattr_destroy F
 GLIBC_2.2 pthread_barrierattr_init F
 GLIBC_2.2 pthread_barrierattr_setpshared F
 GLIBC_2.2 pthread_cancel F
-GLIBC_2.2 pthread_cond_broadcast F
-GLIBC_2.2 pthread_cond_signal F
-GLIBC_2.2 pthread_cond_timedwait F
-GLIBC_2.2 pthread_cond_wait F
 GLIBC_2.2 pthread_condattr_getpshared F
 GLIBC_2.2 pthread_condattr_setpshared F
 GLIBC_2.2 pthread_create F
@@ -158,10 +154,7 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_signal F
-GLIBC_2.3.2 pthread_cond_timedwait F
-GLIBC_2.3.2 pthread_cond_wait F
+GLIBC_2.3.2 __libpthread_version_placeholder F
 GLIBC_2.3.3 __pthread_register_cancel F
 GLIBC_2.3.3 __pthread_register_cancel_defer F
 GLIBC_2.3.3 __pthread_unregister_cancel F
@@ -176,7 +169,6 @@  GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 pthread_setschedprio F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
index 4fce4b408e..fc6dfece0a 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
@@ -2080,6 +2080,7 @@  GLIBC_2.3.4 xdr_quad_t F
 GLIBC_2.3.4 xdr_u_quad_t F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.31 msgctl F
@@ -2121,6 +2122,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
index 9e15deaad8..3eb40a91f7 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
@@ -66,10 +66,6 @@  GLIBC_2.2 pthread_barrierattr_destroy F
 GLIBC_2.2 pthread_barrierattr_init F
 GLIBC_2.2 pthread_barrierattr_setpshared F
 GLIBC_2.2 pthread_cancel F
-GLIBC_2.2 pthread_cond_broadcast F
-GLIBC_2.2 pthread_cond_signal F
-GLIBC_2.2 pthread_cond_timedwait F
-GLIBC_2.2 pthread_cond_wait F
 GLIBC_2.2 pthread_condattr_getpshared F
 GLIBC_2.2 pthread_condattr_setpshared F
 GLIBC_2.2 pthread_create F
@@ -157,10 +153,7 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_signal F
-GLIBC_2.3.2 pthread_cond_timedwait F
-GLIBC_2.3.2 pthread_cond_wait F
+GLIBC_2.3.2 __libpthread_version_placeholder F
 GLIBC_2.3.3 __pthread_register_cancel F
 GLIBC_2.3.3 __pthread_register_cancel_defer F
 GLIBC_2.3.3 __pthread_unregister_cancel F
@@ -175,7 +168,6 @@  GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 pthread_setschedprio F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
index 5dba0f5d0c..15e858df71 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
@@ -2080,6 +2080,7 @@  GLIBC_2.3.4 xdr_quad_t F
 GLIBC_2.3.4 xdr_u_quad_t F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.32 __libc_single_threaded D 0x1
@@ -2118,6 +2119,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
index 9e15deaad8..3eb40a91f7 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
@@ -66,10 +66,6 @@  GLIBC_2.2 pthread_barrierattr_destroy F
 GLIBC_2.2 pthread_barrierattr_init F
 GLIBC_2.2 pthread_barrierattr_setpshared F
 GLIBC_2.2 pthread_cancel F
-GLIBC_2.2 pthread_cond_broadcast F
-GLIBC_2.2 pthread_cond_signal F
-GLIBC_2.2 pthread_cond_timedwait F
-GLIBC_2.2 pthread_cond_wait F
 GLIBC_2.2 pthread_condattr_getpshared F
 GLIBC_2.2 pthread_condattr_setpshared F
 GLIBC_2.2 pthread_create F
@@ -157,10 +153,7 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_signal F
-GLIBC_2.3.2 pthread_cond_timedwait F
-GLIBC_2.3.2 pthread_cond_wait F
+GLIBC_2.3.2 __libpthread_version_placeholder F
 GLIBC_2.3.3 __pthread_register_cancel F
 GLIBC_2.3.3 __pthread_register_cancel_defer F
 GLIBC_2.3.3 __pthread_unregister_cancel F
@@ -175,7 +168,6 @@  GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 pthread_setschedprio F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
index e064e5a4dc..157da004d6 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
@@ -2204,6 +2204,7 @@  GLIBC_2.30 __nldbl_warn F
 GLIBC_2.30 __nldbl_warnx F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.32 __libc_single_threaded D 0x1
@@ -2242,6 +2243,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
index 29cb6259a5..69809f7794 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
@@ -30,10 +30,6 @@  GLIBC_2.0 open F
 GLIBC_2.0 pause F
 GLIBC_2.0 pthread_atfork F
 GLIBC_2.0 pthread_cancel F
-GLIBC_2.0 pthread_cond_broadcast F
-GLIBC_2.0 pthread_cond_signal F
-GLIBC_2.0 pthread_cond_timedwait F
-GLIBC_2.0 pthread_cond_wait F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_join F
@@ -165,10 +161,7 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_signal F
-GLIBC_2.3.2 pthread_cond_timedwait F
-GLIBC_2.3.2 pthread_cond_wait F
+GLIBC_2.3.2 __libpthread_version_placeholder F
 GLIBC_2.3.3 __pthread_register_cancel F
 GLIBC_2.3.3 __pthread_register_cancel_defer F
 GLIBC_2.3.3 __pthread_unregister_cancel F
@@ -185,7 +178,6 @@  GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 pthread_setschedprio F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
index 36fed3cf99..b13a3b4036 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
@@ -2131,6 +2131,7 @@  GLIBC_2.3.4 xdr_quad_t F
 GLIBC_2.3.4 xdr_u_quad_t F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.32 __libc_single_threaded D 0x1
@@ -2169,6 +2170,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
index 684bf559e5..974fa09b43 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
@@ -66,10 +66,6 @@  GLIBC_2.2 pthread_barrierattr_destroy F
 GLIBC_2.2 pthread_barrierattr_init F
 GLIBC_2.2 pthread_barrierattr_setpshared F
 GLIBC_2.2 pthread_cancel F
-GLIBC_2.2 pthread_cond_broadcast F
-GLIBC_2.2 pthread_cond_signal F
-GLIBC_2.2 pthread_cond_timedwait F
-GLIBC_2.2 pthread_cond_wait F
 GLIBC_2.2 pthread_condattr_getpshared F
 GLIBC_2.2 pthread_condattr_setpshared F
 GLIBC_2.2 pthread_create F
@@ -157,10 +153,7 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_signal F
-GLIBC_2.3.2 pthread_cond_timedwait F
-GLIBC_2.3.2 pthread_cond_wait F
+GLIBC_2.3.2 __libpthread_version_placeholder F
 GLIBC_2.3.3 __pthread_register_cancel F
 GLIBC_2.3.3 __pthread_register_cancel_defer F
 GLIBC_2.3.3 __pthread_unregister_cancel F
@@ -177,7 +170,6 @@  GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 pthread_setschedprio F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
index 6858c1328f..ae1b8c21f4 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
@@ -2089,6 +2089,7 @@  GLIBC_2.3.4 xdr_quad_t F
 GLIBC_2.3.4 xdr_u_quad_t F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.32 __libc_single_threaded D 0x1
@@ -2128,6 +2129,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
index 54ad81fdd6..ddd052cc92 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
@@ -66,10 +66,6 @@  GLIBC_2.2.5 pthread_barrierattr_destroy F
 GLIBC_2.2.5 pthread_barrierattr_init F
 GLIBC_2.2.5 pthread_barrierattr_setpshared F
 GLIBC_2.2.5 pthread_cancel F
-GLIBC_2.2.5 pthread_cond_broadcast F
-GLIBC_2.2.5 pthread_cond_signal F
-GLIBC_2.2.5 pthread_cond_timedwait F
-GLIBC_2.2.5 pthread_cond_wait F
 GLIBC_2.2.5 pthread_condattr_getpshared F
 GLIBC_2.2.5 pthread_condattr_setpshared F
 GLIBC_2.2.5 pthread_create F
@@ -156,10 +152,7 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.3.2 pthread_cond_broadcast F
-GLIBC_2.3.2 pthread_cond_signal F
-GLIBC_2.3.2 pthread_cond_timedwait F
-GLIBC_2.3.2 pthread_cond_wait F
+GLIBC_2.3.2 __libpthread_version_placeholder F
 GLIBC_2.3.3 __pthread_register_cancel F
 GLIBC_2.3.3 __pthread_register_cancel_defer F
 GLIBC_2.3.3 __pthread_unregister_cancel F
@@ -174,7 +167,6 @@  GLIBC_2.3.3 pthread_tryjoin_np F
 GLIBC_2.3.4 pthread_attr_getaffinity_np F
 GLIBC_2.3.4 pthread_setaffinity_np F
 GLIBC_2.3.4 pthread_setschedprio F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
index 72da8cceaa..2d1abe3605 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
@@ -2187,6 +2187,7 @@  GLIBC_2.29 posix_spawn_file_actions_addchdir_np F
 GLIBC_2.29 posix_spawn_file_actions_addfchdir_np F
 GLIBC_2.30 getdents64 F
 GLIBC_2.30 gettid F
+GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 tgkill F
 GLIBC_2.30 twalk_r F
 GLIBC_2.32 __libc_single_threaded D 0x1
@@ -2226,6 +2227,7 @@  GLIBC_2.34 __pthread_rwlock_unlock F
 GLIBC_2.34 __pthread_rwlock_wrlock F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
+GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
index 6b095bf36a..b0c512fec3 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
@@ -64,10 +64,6 @@  GLIBC_2.16 pthread_barrierattr_getpshared F
 GLIBC_2.16 pthread_barrierattr_init F
 GLIBC_2.16 pthread_barrierattr_setpshared F
 GLIBC_2.16 pthread_cancel F
-GLIBC_2.16 pthread_cond_broadcast F
-GLIBC_2.16 pthread_cond_signal F
-GLIBC_2.16 pthread_cond_timedwait F
-GLIBC_2.16 pthread_cond_wait F
 GLIBC_2.16 pthread_condattr_getclock F
 GLIBC_2.16 pthread_condattr_getpshared F
 GLIBC_2.16 pthread_condattr_setclock F
@@ -174,7 +170,6 @@  GLIBC_2.28 tss_create F
 GLIBC_2.28 tss_delete F
 GLIBC_2.28 tss_get F
 GLIBC_2.28 tss_set F
-GLIBC_2.30 pthread_cond_clockwait F
 GLIBC_2.30 pthread_mutex_clocklock F
 GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F