diff mbox series

[11/11] nptl: Move sem_trywait, sem_wait into libc

Message ID	a2d3a4f45734832d931cdbfd5c1cdb4e83200eb0.1620049438.git.fweimer@redhat.com
State	Committed
Commit	5633541d3b9a78fc5283af3a2f3e824126ef785a
Delegated to:	Adhemerval Zanella Netto
Headers	DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 8F93F3951C36 To: libc-alpha@sourceware.org Subject: [PATCH 11/11] nptl: Move sem_trywait, sem_wait into libc In-Reply-To: <cover.1620049437.git.fweimer@redhat.com> References: <cover.1620049437.git.fweimer@redhat.com> Message-Id: <a2d3a4f45734832d931cdbfd5c1cdb4e83200eb0.1620049438.git.fweimer@redhat.com> Date: Mon, 03 May 2021 15:52:41 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Precedence: list From: Florian Weimer via Libc-alpha <libc-alpha@sourceware.org> Reply-To: Florian Weimer <fweimer@redhat.com> Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" <libc-alpha-bounces@sourceware.org>
Series	nptl: Move semaphore functions into libc \| [00/11] nptl: Move semaphore functions into libc [01/11] nptl: Move pthread_testcancel into libc [02/11] nptl: Consolidate aysnc cancel enable/disable implementation in libc [03/11] nptl: Move sem_clockwait into libc [04/11] nptl: Move sem_close, sem_open into libc [05/11] nptl: Move sem_destroy into libc [06/11] nptl: Move sem_getvalue into libc [07/11] nptl: Move sem_init into libc [08/11] nptl: Move sem_post into libc [09/11] nptl: Move sem_timedwait into libc [10/11] nptl: Move sem_unlink into libc [11/11] nptl: Move sem_trywait, sem_wait into libc

Commit Message

Florian Weimer May 3, 2021, 1:52 p.m. UTC

  The symbols were moved using scripts/move-symbol-to-libc.py.
---
 nptl/Makefile                                   |  2 +-
 nptl/Versions                                   | 10 ++++++----
 nptl/sem_wait.c                                 | 17 +++++++++++++----
 sysdeps/unix/sysv/linux/aarch64/libc.abilist    |  4 ++++
 .../unix/sysv/linux/aarch64/libpthread.abilist  |  2 --
 sysdeps/unix/sysv/linux/alpha/libc.abilist      |  6 ++++++
 .../unix/sysv/linux/alpha/libpthread.abilist    |  4 ----
 sysdeps/unix/sysv/linux/arc/libc.abilist        |  4 ++++
 sysdeps/unix/sysv/linux/arc/libpthread.abilist  |  2 --
 sysdeps/unix/sysv/linux/arm/be/libc.abilist     |  4 ++++
 .../unix/sysv/linux/arm/be/libpthread.abilist   |  2 --
 sysdeps/unix/sysv/linux/arm/le/libc.abilist     |  4 ++++
 .../unix/sysv/linux/arm/le/libpthread.abilist   |  2 --
 sysdeps/unix/sysv/linux/csky/libc.abilist       |  4 ++++
 sysdeps/unix/sysv/linux/csky/libpthread.abilist |  2 --
 sysdeps/unix/sysv/linux/hppa/libc.abilist       |  4 ++++
 sysdeps/unix/sysv/linux/hppa/libpthread.abilist |  2 --
 sysdeps/unix/sysv/linux/i386/libc.abilist       |  6 ++++++
 sysdeps/unix/sysv/linux/i386/libpthread.abilist |  4 ----
 sysdeps/unix/sysv/linux/ia64/libc.abilist       |  4 ++++
 sysdeps/unix/sysv/linux/ia64/libpthread.abilist |  2 --
 .../unix/sysv/linux/m68k/coldfire/libc.abilist  |  4 ++++
 .../sysv/linux/m68k/coldfire/libpthread.abilist |  2 --
 .../unix/sysv/linux/m68k/m680x0/libc.abilist    |  6 ++++++
 .../sysv/linux/m68k/m680x0/libpthread.abilist   |  4 ----
 .../unix/sysv/linux/microblaze/be/libc.abilist  |  4 ++++
 .../sysv/linux/microblaze/be/libpthread.abilist |  2 --
 .../unix/sysv/linux/microblaze/le/libc.abilist  |  4 ++++
 .../sysv/linux/microblaze/le/libpthread.abilist |  2 --
 .../sysv/linux/mips/mips32/fpu/libc.abilist     |  6 ++++++
 .../sysv/linux/mips/mips32/libpthread.abilist   |  4 ----
 .../sysv/linux/mips/mips32/nofpu/libc.abilist   |  6 ++++++
 .../sysv/linux/mips/mips64/libpthread.abilist   |  4 ----
 .../sysv/linux/mips/mips64/n32/libc.abilist     |  6 ++++++
 .../sysv/linux/mips/mips64/n64/libc.abilist     |  6 ++++++
 sysdeps/unix/sysv/linux/nios2/libc.abilist      |  4 ++++
 .../unix/sysv/linux/nios2/libpthread.abilist    |  2 --
 .../linux/powerpc/powerpc32/fpu/libc.abilist    |  6 ++++++
 .../linux/powerpc/powerpc32/libpthread.abilist  |  4 ----
 .../linux/powerpc/powerpc32/nofpu/libc.abilist  |  6 ++++++
 .../linux/powerpc/powerpc64/be/libc.abilist     |  4 ++++
 .../powerpc/powerpc64/be/libpthread.abilist     |  2 --
 .../linux/powerpc/powerpc64/le/libc.abilist     |  4 ++++
 .../powerpc/powerpc64/le/libpthread.abilist     |  2 --
 sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist |  4 ++++
 .../sysv/linux/riscv/rv32/libpthread.abilist    |  2 --
 sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist |  4 ++++
 .../sysv/linux/riscv/rv64/libpthread.abilist    |  2 --
 .../unix/sysv/linux/s390/s390-32/libc.abilist   |  6 ++++++
 .../sysv/linux/s390/s390-32/libpthread.abilist  |  4 ----
 .../unix/sysv/linux/s390/s390-64/libc.abilist   |  4 ++++
 .../sysv/linux/s390/s390-64/libpthread.abilist  |  2 --
 sysdeps/unix/sysv/linux/sh/be/libc.abilist      |  4 ++++
 .../unix/sysv/linux/sh/be/libpthread.abilist    |  2 --
 sysdeps/unix/sysv/linux/sh/le/libc.abilist      |  4 ++++
 .../unix/sysv/linux/sh/le/libpthread.abilist    |  2 --
 .../unix/sysv/linux/sparc/sparc32/libc.abilist  |  6 ++++++
 .../sysv/linux/sparc/sparc32/libpthread.abilist |  4 ----
 .../unix/sysv/linux/sparc/sparc64/libc.abilist  |  4 ++++
 .../sysv/linux/sparc/sparc64/libpthread.abilist |  2 --
 sysdeps/unix/sysv/linux/x86_64/64/libc.abilist  |  4 ++++
 .../sysv/linux/x86_64/64/libpthread.abilist     |  2 --
 sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist |  4 ++++
 .../sysv/linux/x86_64/x32/libpthread.abilist    |  2 --
 64 files changed, 170 insertions(+), 83 deletions(-)

Comments

Adhemerval Zanella May 5, 2021, 2:38 p.m. UTC | #1

On 03/05/2021 10:52, Florian Weimer via Libc-alpha wrote:
> The symbols were moved using scripts/move-symbol-to-libc.py.

LGTM, thanks.

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

> ---
>  nptl/Makefile                                   |  2 +-
>  nptl/Versions                                   | 10 ++++++----
>  nptl/sem_wait.c                                 | 17 +++++++++++++----
>  sysdeps/unix/sysv/linux/aarch64/libc.abilist    |  4 ++++
>  .../unix/sysv/linux/aarch64/libpthread.abilist  |  2 --
>  sysdeps/unix/sysv/linux/alpha/libc.abilist      |  6 ++++++
>  .../unix/sysv/linux/alpha/libpthread.abilist    |  4 ----
>  sysdeps/unix/sysv/linux/arc/libc.abilist        |  4 ++++
>  sysdeps/unix/sysv/linux/arc/libpthread.abilist  |  2 --
>  sysdeps/unix/sysv/linux/arm/be/libc.abilist     |  4 ++++
>  .../unix/sysv/linux/arm/be/libpthread.abilist   |  2 --
>  sysdeps/unix/sysv/linux/arm/le/libc.abilist     |  4 ++++
>  .../unix/sysv/linux/arm/le/libpthread.abilist   |  2 --
>  sysdeps/unix/sysv/linux/csky/libc.abilist       |  4 ++++
>  sysdeps/unix/sysv/linux/csky/libpthread.abilist |  2 --
>  sysdeps/unix/sysv/linux/hppa/libc.abilist       |  4 ++++
>  sysdeps/unix/sysv/linux/hppa/libpthread.abilist |  2 --
>  sysdeps/unix/sysv/linux/i386/libc.abilist       |  6 ++++++
>  sysdeps/unix/sysv/linux/i386/libpthread.abilist |  4 ----
>  sysdeps/unix/sysv/linux/ia64/libc.abilist       |  4 ++++
>  sysdeps/unix/sysv/linux/ia64/libpthread.abilist |  2 --
>  .../unix/sysv/linux/m68k/coldfire/libc.abilist  |  4 ++++
>  .../sysv/linux/m68k/coldfire/libpthread.abilist |  2 --
>  .../unix/sysv/linux/m68k/m680x0/libc.abilist    |  6 ++++++
>  .../sysv/linux/m68k/m680x0/libpthread.abilist   |  4 ----
>  .../unix/sysv/linux/microblaze/be/libc.abilist  |  4 ++++
>  .../sysv/linux/microblaze/be/libpthread.abilist |  2 --
>  .../unix/sysv/linux/microblaze/le/libc.abilist  |  4 ++++
>  .../sysv/linux/microblaze/le/libpthread.abilist |  2 --
>  .../sysv/linux/mips/mips32/fpu/libc.abilist     |  6 ++++++
>  .../sysv/linux/mips/mips32/libpthread.abilist   |  4 ----
>  .../sysv/linux/mips/mips32/nofpu/libc.abilist   |  6 ++++++
>  .../sysv/linux/mips/mips64/libpthread.abilist   |  4 ----
>  .../sysv/linux/mips/mips64/n32/libc.abilist     |  6 ++++++
>  .../sysv/linux/mips/mips64/n64/libc.abilist     |  6 ++++++
>  sysdeps/unix/sysv/linux/nios2/libc.abilist      |  4 ++++
>  .../unix/sysv/linux/nios2/libpthread.abilist    |  2 --
>  .../linux/powerpc/powerpc32/fpu/libc.abilist    |  6 ++++++
>  .../linux/powerpc/powerpc32/libpthread.abilist  |  4 ----
>  .../linux/powerpc/powerpc32/nofpu/libc.abilist  |  6 ++++++
>  .../linux/powerpc/powerpc64/be/libc.abilist     |  4 ++++
>  .../powerpc/powerpc64/be/libpthread.abilist     |  2 --
>  .../linux/powerpc/powerpc64/le/libc.abilist     |  4 ++++
>  .../powerpc/powerpc64/le/libpthread.abilist     |  2 --
>  sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist |  4 ++++
>  .../sysv/linux/riscv/rv32/libpthread.abilist    |  2 --
>  sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist |  4 ++++
>  .../sysv/linux/riscv/rv64/libpthread.abilist    |  2 --
>  .../unix/sysv/linux/s390/s390-32/libc.abilist   |  6 ++++++
>  .../sysv/linux/s390/s390-32/libpthread.abilist  |  4 ----
>  .../unix/sysv/linux/s390/s390-64/libc.abilist   |  4 ++++
>  .../sysv/linux/s390/s390-64/libpthread.abilist  |  2 --
>  sysdeps/unix/sysv/linux/sh/be/libc.abilist      |  4 ++++
>  .../unix/sysv/linux/sh/be/libpthread.abilist    |  2 --
>  sysdeps/unix/sysv/linux/sh/le/libc.abilist      |  4 ++++
>  .../unix/sysv/linux/sh/le/libpthread.abilist    |  2 --
>  .../unix/sysv/linux/sparc/sparc32/libc.abilist  |  6 ++++++
>  .../sysv/linux/sparc/sparc32/libpthread.abilist |  4 ----
>  .../unix/sysv/linux/sparc/sparc64/libc.abilist  |  4 ++++
>  .../sysv/linux/sparc/sparc64/libpthread.abilist |  2 --
>  sysdeps/unix/sysv/linux/x86_64/64/libc.abilist  |  4 ++++
>  .../sysv/linux/x86_64/64/libpthread.abilist     |  2 --
>  sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist |  4 ++++
>  .../sysv/linux/x86_64/x32/libpthread.abilist    |  2 --
>  64 files changed, 170 insertions(+), 83 deletions(-)
> 
> diff --git a/nptl/Makefile b/nptl/Makefile
> index 665cd1f3d1..7fb387a17a 100644
> --- a/nptl/Makefile
> +++ b/nptl/Makefile
> @@ -160,6 +160,7 @@ routines = \
>    sem_routines \
>    sem_timedwait \
>    sem_unlink \
> +  sem_wait \
>    tpp \
>    unwind \
>  
> @@ -211,7 +212,6 @@ libpthread-routines = \
>    pthread_sigqueue \
>    pthread_timedjoin \
>    pthread_tryjoin \
> -  sem_wait \
>    vars \
>    version \
>  
> diff --git a/nptl/Versions b/nptl/Versions
> index 20997aa706..b243e380e3 100644
> --- a/nptl/Versions
> +++ b/nptl/Versions
> @@ -66,6 +66,8 @@ libc {
>      sem_getvalue;
>      sem_init;
>      sem_post;
> +    sem_trywait;
> +    sem_wait;
>    }
>    GLIBC_2.1 {
>      pthread_attr_init;
> @@ -88,6 +90,8 @@ libc {
>      sem_getvalue;
>      sem_init;
>      sem_post;
> +    sem_trywait;
> +    sem_wait;
>    }
>    GLIBC_2.1.1 {
>      sem_close;
> @@ -270,7 +274,9 @@ libc {
>      sem_open;
>      sem_post;
>      sem_timedwait;
> +    sem_trywait;
>      sem_unlink;
> +    sem_wait;
>      thrd_exit;
>      tss_create;
>      tss_delete;
> @@ -336,8 +342,6 @@ libpthread {
>      pthread_detach;
>      pthread_join;
>      pthread_sigmask;
> -    sem_trywait;
> -    sem_wait;
>    }
>  
>    GLIBC_2.1 {
> @@ -350,8 +354,6 @@ libpthread {
>      pthread_create;
>      pthread_getconcurrency;
>      pthread_setconcurrency;
> -    sem_trywait;
> -    sem_wait;
>    }
>  
>    GLIBC_2.1.1 {
> diff --git a/nptl/sem_wait.c b/nptl/sem_wait.c
> index 02bee9f98c..8576add41c 100644
> --- a/nptl/sem_wait.c
> +++ b/nptl/sem_wait.c
> @@ -43,9 +43,13 @@ __new_sem_wait (sem_t *sem)
>      return __new_sem_wait_slow64 ((struct new_sem *) sem,
>  				  CLOCK_REALTIME, NULL);
>  }
> -versioned_symbol (libpthread, __new_sem_wait, sem_wait, GLIBC_2_1);
> +versioned_symbol (libc, __new_sem_wait, sem_wait, GLIBC_2_34);
>  
> -#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1)
> +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34)
> +compat_symbol (libpthread, __new_sem_wait, sem_wait, GLIBC_2_1);
> +#endif
> +
> +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1)
>  int
>  attribute_compat_text_section
>  __old_sem_wait (sem_t *sem)
> @@ -80,8 +84,13 @@ __new_sem_trywait (sem_t *sem)
>    __set_errno (EAGAIN);
>    return -1;
>  }
> -versioned_symbol (libpthread, __new_sem_trywait, sem_trywait, GLIBC_2_1);
> -#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1)
> +versioned_symbol (libc, __new_sem_trywait, sem_trywait, GLIBC_2_34);
> +
> +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34)
> +compat_symbol (libpthread, __new_sem_trywait, sem_trywait, GLIBC_2_1);
> +#endif
> +
> +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1)
>  int
>  __old_sem_trywait (sem_t *sem)
>  {
> diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> index 75cacc3038..000d484949 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> @@ -1667,7 +1667,9 @@ GLIBC_2.17 sem_init F
>  GLIBC_2.17 sem_open F
>  GLIBC_2.17 sem_post F
>  GLIBC_2.17 sem_timedwait F
> +GLIBC_2.17 sem_trywait F
>  GLIBC_2.17 sem_unlink F
> +GLIBC_2.17 sem_wait F
>  GLIBC_2.17 semctl F
>  GLIBC_2.17 semget F
>  GLIBC_2.17 semop F
> @@ -2362,7 +2364,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_delete F
> diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> index 590f08ba58..cbf1879440 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> @@ -39,8 +39,6 @@ GLIBC_2.17 pthread_setschedprio F
>  GLIBC_2.17 pthread_sigqueue F
>  GLIBC_2.17 pthread_timedjoin_np F
>  GLIBC_2.17 pthread_tryjoin_np F
> -GLIBC_2.17 sem_trywait F
> -GLIBC_2.17 sem_wait F
>  GLIBC_2.18 pthread_getattr_default_np F
>  GLIBC_2.18 pthread_setattr_default_np F
>  GLIBC_2.28 thrd_create F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
> index a1c7de11ee..381101f10e 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
> @@ -1015,6 +1015,8 @@ GLIBC_2.0 sem_destroy F
>  GLIBC_2.0 sem_getvalue F
>  GLIBC_2.0 sem_init F
>  GLIBC_2.0 sem_post F
> +GLIBC_2.0 sem_trywait F
> +GLIBC_2.0 sem_wait F
>  GLIBC_2.0 semctl F
>  GLIBC_2.0 semget F
>  GLIBC_2.0 semop F
> @@ -1642,6 +1644,8 @@ GLIBC_2.1 sem_destroy F
>  GLIBC_2.1 sem_getvalue F
>  GLIBC_2.1 sem_init F
>  GLIBC_2.1 sem_post F
> +GLIBC_2.1 sem_trywait F
> +GLIBC_2.1 sem_wait F
>  GLIBC_2.1 sendfile F
>  GLIBC_2.1 setitimer F
>  GLIBC_2.1 setrlimit64 F
> @@ -2447,7 +2451,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_delete F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> index 6540830d09..4adb3dec7c 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> @@ -9,8 +9,6 @@ GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
>  GLIBC_2.0 pthread_join F
> -GLIBC_2.0 sem_trywait F
> -GLIBC_2.0 sem_wait F
>  GLIBC_2.1 pthread_attr_getguardsize F
>  GLIBC_2.1 pthread_attr_getstackaddr F
>  GLIBC_2.1 pthread_attr_getstacksize F
> @@ -20,8 +18,6 @@ GLIBC_2.1 pthread_attr_setstacksize F
>  GLIBC_2.1 pthread_create F
>  GLIBC_2.1 pthread_getconcurrency F
>  GLIBC_2.1 pthread_setconcurrency F
> -GLIBC_2.1 sem_trywait F
> -GLIBC_2.1 sem_wait F
>  GLIBC_2.1.1 __libpthread_version_placeholder F
>  GLIBC_2.1.2 __libpthread_version_placeholder F
>  GLIBC_2.11 pthread_sigqueue F
> diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
> index 13f0192e61..cd05bc6393 100644
> --- a/sysdeps/unix/sysv/linux/arc/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
> @@ -1609,7 +1609,9 @@ GLIBC_2.32 sem_init F
>  GLIBC_2.32 sem_open F
>  GLIBC_2.32 sem_post F
>  GLIBC_2.32 sem_timedwait F
> +GLIBC_2.32 sem_trywait F
>  GLIBC_2.32 sem_unlink F
> +GLIBC_2.32 sem_wait F
>  GLIBC_2.32 semctl F
>  GLIBC_2.32 semget F
>  GLIBC_2.32 semop F
> @@ -2121,7 +2123,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_delete F
> diff --git a/sysdeps/unix/sysv/linux/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist
> index 7aa79d0d68..219ac17ca8 100644
> --- a/sysdeps/unix/sysv/linux/arc/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist
> @@ -42,8 +42,6 @@ GLIBC_2.32 pthread_setschedprio F
>  GLIBC_2.32 pthread_sigqueue F
>  GLIBC_2.32 pthread_timedjoin_np F
>  GLIBC_2.32 pthread_tryjoin_np F
> -GLIBC_2.32 sem_trywait F
> -GLIBC_2.32 sem_wait F
>  GLIBC_2.32 thrd_create F
>  GLIBC_2.32 thrd_detach F
>  GLIBC_2.32 thrd_join F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> index 04715a2155..ca79da3636 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> @@ -260,7 +260,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_delete F
> @@ -1853,7 +1855,9 @@ GLIBC_2.4 sem_init F
>  GLIBC_2.4 sem_open F
>  GLIBC_2.4 sem_post F
>  GLIBC_2.4 sem_timedwait F
> +GLIBC_2.4 sem_trywait F
>  GLIBC_2.4 sem_unlink F
> +GLIBC_2.4 sem_wait F
>  GLIBC_2.4 semctl F
>  GLIBC_2.4 semget F
>  GLIBC_2.4 semop F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> index 1e819c1173..3aba51fbd0 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> @@ -47,5 +47,3 @@ GLIBC_2.4 pthread_setconcurrency F
>  GLIBC_2.4 pthread_setschedprio F
>  GLIBC_2.4 pthread_timedjoin_np F
>  GLIBC_2.4 pthread_tryjoin_np F
> -GLIBC_2.4 sem_trywait F
> -GLIBC_2.4 sem_wait F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> index 671b211af6..619a2dc40a 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> @@ -257,7 +257,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_delete F
> @@ -1850,7 +1852,9 @@ GLIBC_2.4 sem_init F
>  GLIBC_2.4 sem_open F
>  GLIBC_2.4 sem_post F
>  GLIBC_2.4 sem_timedwait F
> +GLIBC_2.4 sem_trywait F
>  GLIBC_2.4 sem_unlink F
> +GLIBC_2.4 sem_wait F
>  GLIBC_2.4 semctl F
>  GLIBC_2.4 semget F
>  GLIBC_2.4 semop F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> index 1e819c1173..3aba51fbd0 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> @@ -47,5 +47,3 @@ GLIBC_2.4 pthread_setconcurrency F
>  GLIBC_2.4 pthread_setschedprio F
>  GLIBC_2.4 pthread_timedjoin_np F
>  GLIBC_2.4 pthread_tryjoin_np F
> -GLIBC_2.4 sem_trywait F
> -GLIBC_2.4 sem_wait F
> diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist
> index ccb423fe97..5a2d762df0 100644
> --- a/sysdeps/unix/sysv/linux/csky/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libc.abilist
> @@ -1670,7 +1670,9 @@ GLIBC_2.29 sem_init F
>  GLIBC_2.29 sem_open F
>  GLIBC_2.29 sem_post F
>  GLIBC_2.29 sem_timedwait F
> +GLIBC_2.29 sem_trywait F
>  GLIBC_2.29 sem_unlink F
> +GLIBC_2.29 sem_wait F
>  GLIBC_2.29 semctl F
>  GLIBC_2.29 semget F
>  GLIBC_2.29 semop F
> @@ -2305,7 +2307,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_delete F
> diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> index 3579a0bfbb..819757485b 100644
> --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> @@ -41,8 +41,6 @@ GLIBC_2.29 pthread_setschedprio F
>  GLIBC_2.29 pthread_sigqueue F
>  GLIBC_2.29 pthread_timedjoin_np F
>  GLIBC_2.29 pthread_tryjoin_np F
> -GLIBC_2.29 sem_trywait F
> -GLIBC_2.29 sem_wait F
>  GLIBC_2.29 thrd_create F
>  GLIBC_2.29 thrd_detach F
>  GLIBC_2.29 thrd_join F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
> index 2d1fa9694b..5886b23300 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
> @@ -1459,7 +1459,9 @@ GLIBC_2.2 sem_init F
>  GLIBC_2.2 sem_open F
>  GLIBC_2.2 sem_post F
>  GLIBC_2.2 sem_timedwait F
> +GLIBC_2.2 sem_trywait F
>  GLIBC_2.2 sem_unlink F
> +GLIBC_2.2 sem_wait F
>  GLIBC_2.2 semctl F
>  GLIBC_2.2 semget F
>  GLIBC_2.2 semop F
> @@ -2256,7 +2258,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_delete F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> index 30f7add73e..d19abde30d 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> @@ -31,8 +31,6 @@ GLIBC_2.2 pthread_getconcurrency F
>  GLIBC_2.2 pthread_getcpuclockid F
>  GLIBC_2.2 pthread_join F
>  GLIBC_2.2 pthread_setconcurrency F
> -GLIBC_2.2 sem_trywait F
> -GLIBC_2.2 sem_wait F
>  GLIBC_2.2.3 __libpthread_version_placeholder F
>  GLIBC_2.2.6 __libpthread_version_placeholder F
>  GLIBC_2.28 thrd_create F
> diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
> index e270a9c9ab..4694ef5169 100644
> --- a/sysdeps/unix/sysv/linux/i386/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
> @@ -992,6 +992,8 @@ GLIBC_2.0 sem_destroy F
>  GLIBC_2.0 sem_getvalue F
>  GLIBC_2.0 sem_init F
>  GLIBC_2.0 sem_post F
> +GLIBC_2.0 sem_trywait F
> +GLIBC_2.0 sem_wait F
>  GLIBC_2.0 semctl F
>  GLIBC_2.0 semget F
>  GLIBC_2.0 semop F
> @@ -1612,6 +1614,8 @@ GLIBC_2.1 sem_destroy F
>  GLIBC_2.1 sem_getvalue F
>  GLIBC_2.1 sem_init F
>  GLIBC_2.1 sem_post F
> +GLIBC_2.1 sem_trywait F
> +GLIBC_2.1 sem_wait F
>  GLIBC_2.1 sendfile F
>  GLIBC_2.1 setrlimit64 F
>  GLIBC_2.1 setutxent F
> @@ -2437,7 +2441,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_delete F
> diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> index c7a1d8f0ff..7431c8546e 100644
> --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> @@ -9,8 +9,6 @@ GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
>  GLIBC_2.0 pthread_join F
> -GLIBC_2.0 sem_trywait F
> -GLIBC_2.0 sem_wait F
>  GLIBC_2.1 pthread_attr_getguardsize F
>  GLIBC_2.1 pthread_attr_getstackaddr F
>  GLIBC_2.1 pthread_attr_getstacksize F
> @@ -20,8 +18,6 @@ GLIBC_2.1 pthread_attr_setstacksize F
>  GLIBC_2.1 pthread_create F
>  GLIBC_2.1 pthread_getconcurrency F
>  GLIBC_2.1 pthread_setconcurrency F
> -GLIBC_2.1 sem_trywait F
> -GLIBC_2.1 sem_wait F
>  GLIBC_2.1.1 __libpthread_version_placeholder F
>  GLIBC_2.1.2 __libpthread_version_placeholder F
>  GLIBC_2.11 pthread_sigqueue F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
> index 76dfc3a9ff..66b154da95 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
> @@ -1480,7 +1480,9 @@ GLIBC_2.2 sem_init F
>  GLIBC_2.2 sem_open F
>  GLIBC_2.2 sem_post F
>  GLIBC_2.2 sem_timedwait F
> +GLIBC_2.2 sem_trywait F
>  GLIBC_2.2 sem_unlink F
> +GLIBC_2.2 sem_wait F
>  GLIBC_2.2 semctl F
>  GLIBC_2.2 semget F
>  GLIBC_2.2 semop F
> @@ -2290,7 +2292,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_delete F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> index 225bfd0e6a..05fae6161a 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> @@ -31,8 +31,6 @@ GLIBC_2.2 pthread_getconcurrency F
>  GLIBC_2.2 pthread_getcpuclockid F
>  GLIBC_2.2 pthread_join F
>  GLIBC_2.2 pthread_setconcurrency F
> -GLIBC_2.2 sem_trywait F
> -GLIBC_2.2 sem_wait F
>  GLIBC_2.2.3 __libpthread_version_placeholder F
>  GLIBC_2.2.6 __libpthread_version_placeholder F
>  GLIBC_2.28 thrd_create F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> index 50b6beebdb..dfcce32e4d 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> @@ -261,7 +261,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_delete F
> @@ -1833,7 +1835,9 @@ GLIBC_2.4 sem_init F
>  GLIBC_2.4 sem_open F
>  GLIBC_2.4 sem_post F
>  GLIBC_2.4 sem_timedwait F
> +GLIBC_2.4 sem_trywait F
>  GLIBC_2.4 sem_unlink F
> +GLIBC_2.4 sem_wait F
>  GLIBC_2.4 semctl F
>  GLIBC_2.4 semget F
>  GLIBC_2.4 semop F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> index 1e819c1173..3aba51fbd0 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> @@ -47,5 +47,3 @@ GLIBC_2.4 pthread_setconcurrency F
>  GLIBC_2.4 pthread_setschedprio F
>  GLIBC_2.4 pthread_timedjoin_np F
>  GLIBC_2.4 pthread_tryjoin_np F
> -GLIBC_2.4 sem_trywait F
> -GLIBC_2.4 sem_wait F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> index f42dfe0d54..a643d84325 100644
> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> @@ -991,6 +991,8 @@ GLIBC_2.0 sem_destroy F
>  GLIBC_2.0 sem_getvalue F
>  GLIBC_2.0 sem_init F
>  GLIBC_2.0 sem_post F
> +GLIBC_2.0 sem_trywait F
> +GLIBC_2.0 sem_wait F
>  GLIBC_2.0 semctl F
>  GLIBC_2.0 semget F
>  GLIBC_2.0 semop F
> @@ -1608,6 +1610,8 @@ GLIBC_2.1 sem_destroy F
>  GLIBC_2.1 sem_getvalue F
>  GLIBC_2.1 sem_init F
>  GLIBC_2.1 sem_post F
> +GLIBC_2.1 sem_trywait F
> +GLIBC_2.1 sem_wait F
>  GLIBC_2.1 sendfile F
>  GLIBC_2.1 setrlimit64 F
>  GLIBC_2.1 setutxent F
> @@ -2380,7 +2384,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_delete F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> index c7a1d8f0ff..7431c8546e 100644
> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> @@ -9,8 +9,6 @@ GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
>  GLIBC_2.0 pthread_join F
> -GLIBC_2.0 sem_trywait F
> -GLIBC_2.0 sem_wait F
>  GLIBC_2.1 pthread_attr_getguardsize F
>  GLIBC_2.1 pthread_attr_getstackaddr F
>  GLIBC_2.1 pthread_attr_getstacksize F
> @@ -20,8 +18,6 @@ GLIBC_2.1 pthread_attr_setstacksize F
>  GLIBC_2.1 pthread_create F
>  GLIBC_2.1 pthread_getconcurrency F
>  GLIBC_2.1 pthread_setconcurrency F
> -GLIBC_2.1 sem_trywait F
> -GLIBC_2.1 sem_wait F
>  GLIBC_2.1.1 __libpthread_version_placeholder F
>  GLIBC_2.1.2 __libpthread_version_placeholder F
>  GLIBC_2.11 pthread_sigqueue F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> index 563c3a0e35..91d77eb8c9 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> @@ -1669,7 +1669,9 @@ GLIBC_2.18 sem_init F
>  GLIBC_2.18 sem_open F
>  GLIBC_2.18 sem_post F
>  GLIBC_2.18 sem_timedwait F
> +GLIBC_2.18 sem_trywait F
>  GLIBC_2.18 sem_unlink F
> +GLIBC_2.18 sem_wait F
>  GLIBC_2.18 semctl F
>  GLIBC_2.18 semget F
>  GLIBC_2.18 semop F
> @@ -2356,7 +2358,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_delete F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> index d7bacba551..ac586fac3b 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> @@ -41,8 +41,6 @@ GLIBC_2.18 pthread_setschedprio F
>  GLIBC_2.18 pthread_sigqueue F
>  GLIBC_2.18 pthread_timedjoin_np F
>  GLIBC_2.18 pthread_tryjoin_np F
> -GLIBC_2.18 sem_trywait F
> -GLIBC_2.18 sem_wait F
>  GLIBC_2.28 thrd_create F
>  GLIBC_2.28 thrd_detach F
>  GLIBC_2.28 thrd_join F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> index 57a51ab39b..72dd2dea1a 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> @@ -1669,7 +1669,9 @@ GLIBC_2.18 sem_init F
>  GLIBC_2.18 sem_open F
>  GLIBC_2.18 sem_post F
>  GLIBC_2.18 sem_timedwait F
> +GLIBC_2.18 sem_trywait F
>  GLIBC_2.18 sem_unlink F
> +GLIBC_2.18 sem_wait F
>  GLIBC_2.18 semctl F
>  GLIBC_2.18 semget F
>  GLIBC_2.18 semop F
> @@ -2353,7 +2355,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_delete F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> index d7bacba551..ac586fac3b 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> @@ -41,8 +41,6 @@ GLIBC_2.18 pthread_setschedprio F
>  GLIBC_2.18 pthread_sigqueue F
>  GLIBC_2.18 pthread_timedjoin_np F
>  GLIBC_2.18 pthread_tryjoin_np F
> -GLIBC_2.18 sem_trywait F
> -GLIBC_2.18 sem_wait F
>  GLIBC_2.28 thrd_create F
>  GLIBC_2.28 thrd_detach F
>  GLIBC_2.28 thrd_join F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> index a7b828f541..2132171644 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> @@ -988,6 +988,8 @@ GLIBC_2.0 sem_destroy F
>  GLIBC_2.0 sem_getvalue F
>  GLIBC_2.0 sem_init F
>  GLIBC_2.0 sem_post F
> +GLIBC_2.0 sem_trywait F
> +GLIBC_2.0 sem_wait F
>  GLIBC_2.0 semctl F
>  GLIBC_2.0 semget F
>  GLIBC_2.0 semop F
> @@ -1899,7 +1901,9 @@ GLIBC_2.2 sem_init F
>  GLIBC_2.2 sem_open F
>  GLIBC_2.2 sem_post F
>  GLIBC_2.2 sem_timedwait F
> +GLIBC_2.2 sem_trywait F
>  GLIBC_2.2 sem_unlink F
> +GLIBC_2.2 sem_wait F
>  GLIBC_2.2 semctl F
>  GLIBC_2.2 sendfile F
>  GLIBC_2.2 setrlimit64 F
> @@ -2343,7 +2347,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_delete F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> index c7256adbdb..16eef07725 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> @@ -9,8 +9,6 @@ GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
>  GLIBC_2.0 pthread_join F
> -GLIBC_2.0 sem_trywait F
> -GLIBC_2.0 sem_wait F
>  GLIBC_2.11 pthread_sigqueue F
>  GLIBC_2.12 pthread_getname_np F
>  GLIBC_2.12 pthread_setname_np F
> @@ -34,8 +32,6 @@ GLIBC_2.2 pthread_create F
>  GLIBC_2.2 pthread_getconcurrency F
>  GLIBC_2.2 pthread_getcpuclockid F
>  GLIBC_2.2 pthread_setconcurrency F
> -GLIBC_2.2 sem_trywait F
> -GLIBC_2.2 sem_wait F
>  GLIBC_2.2.3 __libpthread_version_placeholder F
>  GLIBC_2.2.6 __libpthread_version_placeholder F
>  GLIBC_2.28 thrd_create F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> index 38e27a67b7..f59b1cd90b 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> @@ -988,6 +988,8 @@ GLIBC_2.0 sem_destroy F
>  GLIBC_2.0 sem_getvalue F
>  GLIBC_2.0 sem_init F
>  GLIBC_2.0 sem_post F
> +GLIBC_2.0 sem_trywait F
> +GLIBC_2.0 sem_wait F
>  GLIBC_2.0 semctl F
>  GLIBC_2.0 semget F
>  GLIBC_2.0 semop F
> @@ -1897,7 +1899,9 @@ GLIBC_2.2 sem_init F
>  GLIBC_2.2 sem_open F
>  GLIBC_2.2 sem_post F
>  GLIBC_2.2 sem_timedwait F
> +GLIBC_2.2 sem_trywait F
>  GLIBC_2.2 sem_unlink F
> +GLIBC_2.2 sem_wait F
>  GLIBC_2.2 semctl F
>  GLIBC_2.2 sendfile F
>  GLIBC_2.2 setrlimit64 F
> @@ -2341,7 +2345,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_delete F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> index c7256adbdb..16eef07725 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> @@ -9,8 +9,6 @@ GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
>  GLIBC_2.0 pthread_join F
> -GLIBC_2.0 sem_trywait F
> -GLIBC_2.0 sem_wait F
>  GLIBC_2.11 pthread_sigqueue F
>  GLIBC_2.12 pthread_getname_np F
>  GLIBC_2.12 pthread_setname_np F
> @@ -34,8 +32,6 @@ GLIBC_2.2 pthread_create F
>  GLIBC_2.2 pthread_getconcurrency F
>  GLIBC_2.2 pthread_getcpuclockid F
>  GLIBC_2.2 pthread_setconcurrency F
> -GLIBC_2.2 sem_trywait F
> -GLIBC_2.2 sem_wait F
>  GLIBC_2.2.3 __libpthread_version_placeholder F
>  GLIBC_2.2.6 __libpthread_version_placeholder F
>  GLIBC_2.28 thrd_create F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> index 932bbb01ed..1a8b007889 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> @@ -988,6 +988,8 @@ GLIBC_2.0 sem_destroy F
>  GLIBC_2.0 sem_getvalue F
>  GLIBC_2.0 sem_init F
>  GLIBC_2.0 sem_post F
> +GLIBC_2.0 sem_trywait F
> +GLIBC_2.0 sem_wait F
>  GLIBC_2.0 semctl F
>  GLIBC_2.0 semget F
>  GLIBC_2.0 semop F
> @@ -1897,7 +1899,9 @@ GLIBC_2.2 sem_init F
>  GLIBC_2.2 sem_open F
>  GLIBC_2.2 sem_post F
>  GLIBC_2.2 sem_timedwait F
> +GLIBC_2.2 sem_trywait F
>  GLIBC_2.2 sem_unlink F
> +GLIBC_2.2 sem_wait F
>  GLIBC_2.2 sendfile F
>  GLIBC_2.2 setrlimit64 F
>  GLIBC_2.2 setutxent F
> @@ -2349,7 +2353,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_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 d2af27e80e..c3291ffa9e 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> @@ -986,6 +986,8 @@ GLIBC_2.0 sem_destroy F
>  GLIBC_2.0 sem_getvalue F
>  GLIBC_2.0 sem_init F
>  GLIBC_2.0 sem_post F
> +GLIBC_2.0 sem_trywait F
> +GLIBC_2.0 sem_wait F
>  GLIBC_2.0 semctl F
>  GLIBC_2.0 semget F
>  GLIBC_2.0 semop F
> @@ -1893,7 +1895,9 @@ GLIBC_2.2 sem_init F
>  GLIBC_2.2 sem_open F
>  GLIBC_2.2 sem_post F
>  GLIBC_2.2 sem_timedwait F
> +GLIBC_2.2 sem_trywait F
>  GLIBC_2.2 sem_unlink F
> +GLIBC_2.2 sem_wait F
>  GLIBC_2.2 sendfile F
>  GLIBC_2.2 setrlimit64 F
>  GLIBC_2.2 setutxent F
> @@ -2343,7 +2347,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_delete F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
> index b56a86af95..f118e29a13 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
> @@ -1712,7 +1712,9 @@ GLIBC_2.21 sem_init F
>  GLIBC_2.21 sem_open F
>  GLIBC_2.21 sem_post F
>  GLIBC_2.21 sem_timedwait F
> +GLIBC_2.21 sem_trywait F
>  GLIBC_2.21 sem_unlink F
> +GLIBC_2.21 sem_wait F
>  GLIBC_2.21 semctl F
>  GLIBC_2.21 semget F
>  GLIBC_2.21 semop F
> @@ -2395,7 +2397,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_delete F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> index 8c753b83c5..4080b80d4a 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> @@ -41,8 +41,6 @@ GLIBC_2.21 pthread_setschedprio F
>  GLIBC_2.21 pthread_sigqueue F
>  GLIBC_2.21 pthread_timedjoin_np F
>  GLIBC_2.21 pthread_tryjoin_np F
> -GLIBC_2.21 sem_trywait F
> -GLIBC_2.21 sem_wait F
>  GLIBC_2.28 thrd_create F
>  GLIBC_2.28 thrd_detach F
>  GLIBC_2.28 thrd_join F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> index f66d77276d..7469a65e2e 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> @@ -999,6 +999,8 @@ GLIBC_2.0 sem_destroy F
>  GLIBC_2.0 sem_getvalue F
>  GLIBC_2.0 sem_init F
>  GLIBC_2.0 sem_post F
> +GLIBC_2.0 sem_trywait F
> +GLIBC_2.0 sem_wait F
>  GLIBC_2.0 semctl F
>  GLIBC_2.0 semget F
>  GLIBC_2.0 semop F
> @@ -1613,6 +1615,8 @@ GLIBC_2.1 sem_destroy F
>  GLIBC_2.1 sem_getvalue F
>  GLIBC_2.1 sem_init F
>  GLIBC_2.1 sem_post F
> +GLIBC_2.1 sem_trywait F
> +GLIBC_2.1 sem_wait F
>  GLIBC_2.1 sendfile F
>  GLIBC_2.1 setrlimit64 F
>  GLIBC_2.1 setutxent F
> @@ -2407,7 +2411,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_delete F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> index 83968d0c97..4bc2e431c3 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> @@ -9,8 +9,6 @@ GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
>  GLIBC_2.0 pthread_join F
> -GLIBC_2.0 sem_trywait F
> -GLIBC_2.0 sem_wait F
>  GLIBC_2.1 pthread_attr_getguardsize F
>  GLIBC_2.1 pthread_attr_getstackaddr F
>  GLIBC_2.1 pthread_attr_getstacksize F
> @@ -20,8 +18,6 @@ GLIBC_2.1 pthread_attr_setstacksize F
>  GLIBC_2.1 pthread_create F
>  GLIBC_2.1 pthread_getconcurrency F
>  GLIBC_2.1 pthread_setconcurrency F
> -GLIBC_2.1 sem_trywait F
> -GLIBC_2.1 sem_wait F
>  GLIBC_2.1.1 __libpthread_version_placeholder F
>  GLIBC_2.1.2 __libpthread_version_placeholder F
>  GLIBC_2.11 pthread_sigqueue F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> index bf1a6ba7ba..6998064cc8 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> @@ -999,6 +999,8 @@ GLIBC_2.0 sem_destroy F
>  GLIBC_2.0 sem_getvalue F
>  GLIBC_2.0 sem_init F
>  GLIBC_2.0 sem_post F
> +GLIBC_2.0 sem_trywait F
> +GLIBC_2.0 sem_wait F
>  GLIBC_2.0 semctl F
>  GLIBC_2.0 semget F
>  GLIBC_2.0 semop F
> @@ -1613,6 +1615,8 @@ GLIBC_2.1 sem_destroy F
>  GLIBC_2.1 sem_getvalue F
>  GLIBC_2.1 sem_init F
>  GLIBC_2.1 sem_post F
> +GLIBC_2.1 sem_trywait F
> +GLIBC_2.1 sem_wait F
>  GLIBC_2.1 sendfile F
>  GLIBC_2.1 setrlimit64 F
>  GLIBC_2.1 setutxent F
> @@ -2440,7 +2444,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_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 55eea26dc9..20014236c7 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> @@ -1584,7 +1584,9 @@ GLIBC_2.3 sem_init F
>  GLIBC_2.3 sem_open F
>  GLIBC_2.3 sem_post F
>  GLIBC_2.3 sem_timedwait F
> +GLIBC_2.3 sem_trywait F
>  GLIBC_2.3 sem_unlink F
> +GLIBC_2.3 sem_wait F
>  GLIBC_2.3 semctl F
>  GLIBC_2.3 semget F
>  GLIBC_2.3 semop F
> @@ -2257,7 +2259,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_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 b6a7fc4e23..e7287d88fb 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> @@ -34,8 +34,6 @@ GLIBC_2.3 pthread_getconcurrency F
>  GLIBC_2.3 pthread_getcpuclockid F
>  GLIBC_2.3 pthread_join F
>  GLIBC_2.3 pthread_setconcurrency F
> -GLIBC_2.3 sem_trywait F
> -GLIBC_2.3 sem_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
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> index b5032df9df..24a7d912cc 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> @@ -1755,7 +1755,9 @@ GLIBC_2.17 sem_init F
>  GLIBC_2.17 sem_open F
>  GLIBC_2.17 sem_post F
>  GLIBC_2.17 sem_timedwait F
> +GLIBC_2.17 sem_trywait F
>  GLIBC_2.17 sem_unlink F
> +GLIBC_2.17 sem_wait F
>  GLIBC_2.17 semctl F
>  GLIBC_2.17 semget F
>  GLIBC_2.17 semop F
> @@ -2558,7 +2560,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_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 590f08ba58..cbf1879440 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> @@ -39,8 +39,6 @@ GLIBC_2.17 pthread_setschedprio F
>  GLIBC_2.17 pthread_sigqueue F
>  GLIBC_2.17 pthread_timedjoin_np F
>  GLIBC_2.17 pthread_tryjoin_np F
> -GLIBC_2.17 sem_trywait F
> -GLIBC_2.17 sem_wait F
>  GLIBC_2.18 pthread_getattr_default_np F
>  GLIBC_2.18 pthread_setattr_default_np F
>  GLIBC_2.28 thrd_create F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> index 7b86b09a47..b739614eea 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> @@ -1611,7 +1611,9 @@ GLIBC_2.33 sem_init F
>  GLIBC_2.33 sem_open F
>  GLIBC_2.33 sem_post F
>  GLIBC_2.33 sem_timedwait F
> +GLIBC_2.33 sem_trywait F
>  GLIBC_2.33 sem_unlink F
> +GLIBC_2.33 sem_wait F
>  GLIBC_2.33 semctl F
>  GLIBC_2.33 semget F
>  GLIBC_2.33 semop F
> @@ -2123,7 +2125,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_delete F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
> index 74798905a5..0609c51490 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
> @@ -42,8 +42,6 @@ GLIBC_2.33 pthread_setschedprio F
>  GLIBC_2.33 pthread_sigqueue F
>  GLIBC_2.33 pthread_timedjoin_np F
>  GLIBC_2.33 pthread_tryjoin_np F
> -GLIBC_2.33 sem_trywait F
> -GLIBC_2.33 sem_wait F
>  GLIBC_2.33 thrd_create F
>  GLIBC_2.33 thrd_detach F
>  GLIBC_2.33 thrd_join F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> index 36e7eff6a7..b6f1325a59 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> @@ -1659,7 +1659,9 @@ GLIBC_2.27 sem_init F
>  GLIBC_2.27 sem_open F
>  GLIBC_2.27 sem_post F
>  GLIBC_2.27 sem_timedwait F
> +GLIBC_2.27 sem_trywait F
>  GLIBC_2.27 sem_unlink F
> +GLIBC_2.27 sem_wait F
>  GLIBC_2.27 semctl F
>  GLIBC_2.27 semget F
>  GLIBC_2.27 semop F
> @@ -2323,7 +2325,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_delete F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> index 8eb140f7ac..2eab03d3c5 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> @@ -41,8 +41,6 @@ GLIBC_2.27 pthread_setschedprio F
>  GLIBC_2.27 pthread_sigqueue F
>  GLIBC_2.27 pthread_timedjoin_np F
>  GLIBC_2.27 pthread_tryjoin_np F
> -GLIBC_2.27 sem_trywait F
> -GLIBC_2.27 sem_wait F
>  GLIBC_2.28 thrd_create F
>  GLIBC_2.28 thrd_detach F
>  GLIBC_2.28 thrd_join F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> index 96d23b986b..f87d2ce120 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> @@ -990,6 +990,8 @@ GLIBC_2.0 sem_destroy F
>  GLIBC_2.0 sem_getvalue F
>  GLIBC_2.0 sem_init F
>  GLIBC_2.0 sem_post F
> +GLIBC_2.0 sem_trywait F
> +GLIBC_2.0 sem_wait F
>  GLIBC_2.0 semctl F
>  GLIBC_2.0 semget F
>  GLIBC_2.0 semop F
> @@ -1605,6 +1607,8 @@ GLIBC_2.1 sem_destroy F
>  GLIBC_2.1 sem_getvalue F
>  GLIBC_2.1 sem_init F
>  GLIBC_2.1 sem_post F
> +GLIBC_2.1 sem_trywait F
> +GLIBC_2.1 sem_wait F
>  GLIBC_2.1 sendfile F
>  GLIBC_2.1 setrlimit64 F
>  GLIBC_2.1 setutxent F
> @@ -2405,7 +2409,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_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 f59ac6c20d..696d0370ff 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> @@ -9,8 +9,6 @@ GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
>  GLIBC_2.0 pthread_join F
> -GLIBC_2.0 sem_trywait F
> -GLIBC_2.0 sem_wait F
>  GLIBC_2.1 pthread_attr_getguardsize F
>  GLIBC_2.1 pthread_attr_getstackaddr F
>  GLIBC_2.1 pthread_attr_getstacksize F
> @@ -20,8 +18,6 @@ GLIBC_2.1 pthread_attr_setstacksize F
>  GLIBC_2.1 pthread_create F
>  GLIBC_2.1 pthread_getconcurrency F
>  GLIBC_2.1 pthread_setconcurrency F
> -GLIBC_2.1 sem_trywait F
> -GLIBC_2.1 sem_wait F
>  GLIBC_2.1.1 __libpthread_version_placeholder F
>  GLIBC_2.1.2 __libpthread_version_placeholder F
>  GLIBC_2.11 pthread_sigqueue F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> index 928b499c84..360d76eff1 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> @@ -1477,7 +1477,9 @@ GLIBC_2.2 sem_init F
>  GLIBC_2.2 sem_open F
>  GLIBC_2.2 sem_post F
>  GLIBC_2.2 sem_timedwait F
> +GLIBC_2.2 sem_trywait F
>  GLIBC_2.2 sem_unlink F
> +GLIBC_2.2 sem_wait F
>  GLIBC_2.2 semctl F
>  GLIBC_2.2 semget F
>  GLIBC_2.2 semop F
> @@ -2294,7 +2296,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_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 a2f0c9965f..ab1712df42 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> @@ -32,8 +32,6 @@ GLIBC_2.2 pthread_getconcurrency F
>  GLIBC_2.2 pthread_getcpuclockid F
>  GLIBC_2.2 pthread_join F
>  GLIBC_2.2 pthread_setconcurrency F
> -GLIBC_2.2 sem_trywait F
> -GLIBC_2.2 sem_wait F
>  GLIBC_2.2.3 __libpthread_version_placeholder F
>  GLIBC_2.2.6 __libpthread_version_placeholder F
>  GLIBC_2.28 thrd_create F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> index 61594abaf2..efdeab47ad 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> @@ -1463,7 +1463,9 @@ GLIBC_2.2 sem_init F
>  GLIBC_2.2 sem_open F
>  GLIBC_2.2 sem_post F
>  GLIBC_2.2 sem_timedwait F
> +GLIBC_2.2 sem_trywait F
>  GLIBC_2.2 sem_unlink F
> +GLIBC_2.2 sem_wait F
>  GLIBC_2.2 semctl F
>  GLIBC_2.2 semget F
>  GLIBC_2.2 semop F
> @@ -2263,7 +2265,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_delete F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> index 30f7add73e..d19abde30d 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> @@ -31,8 +31,6 @@ GLIBC_2.2 pthread_getconcurrency F
>  GLIBC_2.2 pthread_getcpuclockid F
>  GLIBC_2.2 pthread_join F
>  GLIBC_2.2 pthread_setconcurrency F
> -GLIBC_2.2 sem_trywait F
> -GLIBC_2.2 sem_wait F
>  GLIBC_2.2.3 __libpthread_version_placeholder F
>  GLIBC_2.2.6 __libpthread_version_placeholder F
>  GLIBC_2.28 thrd_create F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> index 17d56762a5..30c6f58df0 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> @@ -1463,7 +1463,9 @@ GLIBC_2.2 sem_init F
>  GLIBC_2.2 sem_open F
>  GLIBC_2.2 sem_post F
>  GLIBC_2.2 sem_timedwait F
> +GLIBC_2.2 sem_trywait F
>  GLIBC_2.2 sem_unlink F
> +GLIBC_2.2 sem_wait F
>  GLIBC_2.2 semctl F
>  GLIBC_2.2 semget F
>  GLIBC_2.2 semop F
> @@ -2260,7 +2262,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_delete F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> index 30f7add73e..d19abde30d 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> @@ -31,8 +31,6 @@ GLIBC_2.2 pthread_getconcurrency F
>  GLIBC_2.2 pthread_getcpuclockid F
>  GLIBC_2.2 pthread_join F
>  GLIBC_2.2 pthread_setconcurrency F
> -GLIBC_2.2 sem_trywait F
> -GLIBC_2.2 sem_wait F
>  GLIBC_2.2.3 __libpthread_version_placeholder F
>  GLIBC_2.2.6 __libpthread_version_placeholder F
>  GLIBC_2.28 thrd_create F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> index f34f9851ee..72031725c9 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> @@ -993,6 +993,8 @@ GLIBC_2.0 sem_destroy F
>  GLIBC_2.0 sem_getvalue F
>  GLIBC_2.0 sem_init F
>  GLIBC_2.0 sem_post F
> +GLIBC_2.0 sem_trywait F
> +GLIBC_2.0 sem_wait F
>  GLIBC_2.0 semctl F
>  GLIBC_2.0 semget F
>  GLIBC_2.0 semop F
> @@ -1606,6 +1608,8 @@ GLIBC_2.1 sem_destroy F
>  GLIBC_2.1 sem_getvalue F
>  GLIBC_2.1 sem_init F
>  GLIBC_2.1 sem_post F
> +GLIBC_2.1 sem_trywait F
> +GLIBC_2.1 sem_wait F
>  GLIBC_2.1 sendfile F
>  GLIBC_2.1 setrlimit64 F
>  GLIBC_2.1 setutxent F
> @@ -2396,7 +2400,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_delete F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> index 6540830d09..4adb3dec7c 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> @@ -9,8 +9,6 @@ GLIBC_2.0 pthread_cancel F
>  GLIBC_2.0 pthread_create F
>  GLIBC_2.0 pthread_detach F
>  GLIBC_2.0 pthread_join F
> -GLIBC_2.0 sem_trywait F
> -GLIBC_2.0 sem_wait F
>  GLIBC_2.1 pthread_attr_getguardsize F
>  GLIBC_2.1 pthread_attr_getstackaddr F
>  GLIBC_2.1 pthread_attr_getstacksize F
> @@ -20,8 +18,6 @@ GLIBC_2.1 pthread_attr_setstacksize F
>  GLIBC_2.1 pthread_create F
>  GLIBC_2.1 pthread_getconcurrency F
>  GLIBC_2.1 pthread_setconcurrency F
> -GLIBC_2.1 sem_trywait F
> -GLIBC_2.1 sem_wait F
>  GLIBC_2.1.1 __libpthread_version_placeholder F
>  GLIBC_2.1.2 __libpthread_version_placeholder F
>  GLIBC_2.11 pthread_sigqueue F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> index 17d1320652..1747388f2f 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> @@ -1506,7 +1506,9 @@ GLIBC_2.2 sem_init F
>  GLIBC_2.2 sem_open F
>  GLIBC_2.2 sem_post F
>  GLIBC_2.2 sem_timedwait F
> +GLIBC_2.2 sem_trywait F
>  GLIBC_2.2 sem_unlink F
> +GLIBC_2.2 sem_wait F
>  GLIBC_2.2 semctl F
>  GLIBC_2.2 semget F
>  GLIBC_2.2 semop F
> @@ -2311,7 +2313,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_delete F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> index 225bfd0e6a..05fae6161a 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> @@ -31,8 +31,6 @@ GLIBC_2.2 pthread_getconcurrency F
>  GLIBC_2.2 pthread_getcpuclockid F
>  GLIBC_2.2 pthread_join F
>  GLIBC_2.2 pthread_setconcurrency F
> -GLIBC_2.2 sem_trywait F
> -GLIBC_2.2 sem_wait F
>  GLIBC_2.2.3 __libpthread_version_placeholder F
>  GLIBC_2.2.6 __libpthread_version_placeholder F
>  GLIBC_2.28 thrd_create F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> index f59fc63658..f1c5e63435 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> @@ -1474,7 +1474,9 @@ GLIBC_2.2.5 sem_init F
>  GLIBC_2.2.5 sem_open F
>  GLIBC_2.2.5 sem_post F
>  GLIBC_2.2.5 sem_timedwait F
> +GLIBC_2.2.5 sem_trywait F
>  GLIBC_2.2.5 sem_unlink F
> +GLIBC_2.2.5 sem_wait F
>  GLIBC_2.2.5 semctl F
>  GLIBC_2.2.5 semget F
>  GLIBC_2.2.5 semop F
> @@ -2272,7 +2274,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_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 6fc3699f2c..b5faceae7b 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> @@ -31,8 +31,6 @@ GLIBC_2.2.5 pthread_getconcurrency F
>  GLIBC_2.2.5 pthread_getcpuclockid F
>  GLIBC_2.2.5 pthread_join F
>  GLIBC_2.2.5 pthread_setconcurrency F
> -GLIBC_2.2.5 sem_trywait F
> -GLIBC_2.2.5 sem_wait F
>  GLIBC_2.2.6 __libpthread_version_placeholder F
>  GLIBC_2.28 thrd_create F
>  GLIBC_2.28 thrd_detach F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> index d6e06954b6..3ca0ecde5c 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> @@ -1673,7 +1673,9 @@ GLIBC_2.16 sem_init F
>  GLIBC_2.16 sem_open F
>  GLIBC_2.16 sem_post F
>  GLIBC_2.16 sem_timedwait F
> +GLIBC_2.16 sem_trywait F
>  GLIBC_2.16 sem_unlink F
> +GLIBC_2.16 sem_wait F
>  GLIBC_2.16 semctl F
>  GLIBC_2.16 semget F
>  GLIBC_2.16 semop F
> @@ -2377,7 +2379,9 @@ GLIBC_2.34 sem_init F
>  GLIBC_2.34 sem_open F
>  GLIBC_2.34 sem_post F
>  GLIBC_2.34 sem_timedwait F
> +GLIBC_2.34 sem_trywait F
>  GLIBC_2.34 sem_unlink F
> +GLIBC_2.34 sem_wait F
>  GLIBC_2.34 thrd_exit F
>  GLIBC_2.34 tss_create F
>  GLIBC_2.34 tss_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 ab481ebe8a..f4b4241951 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> @@ -39,8 +39,6 @@ GLIBC_2.16 pthread_setschedprio F
>  GLIBC_2.16 pthread_sigqueue F
>  GLIBC_2.16 pthread_timedjoin_np F
>  GLIBC_2.16 pthread_tryjoin_np F
> -GLIBC_2.16 sem_trywait F
> -GLIBC_2.16 sem_wait F
>  GLIBC_2.18 pthread_getattr_default_np F
>  GLIBC_2.18 pthread_setattr_default_np F
>  GLIBC_2.28 thrd_create F
>

diff mbox series

Patch

diff --git a/nptl/Makefile b/nptl/Makefile
index 665cd1f3d1..7fb387a17a 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -160,6 +160,7 @@  routines = \
   sem_routines \
   sem_timedwait \
   sem_unlink \
+  sem_wait \
   tpp \
   unwind \
 
@@ -211,7 +212,6 @@  libpthread-routines = \
   pthread_sigqueue \
   pthread_timedjoin \
   pthread_tryjoin \
-  sem_wait \
   vars \
   version \
 
diff --git a/nptl/Versions b/nptl/Versions
index 20997aa706..b243e380e3 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -66,6 +66,8 @@  libc {
     sem_getvalue;
     sem_init;
     sem_post;
+    sem_trywait;
+    sem_wait;
   }
   GLIBC_2.1 {
     pthread_attr_init;
@@ -88,6 +90,8 @@  libc {
     sem_getvalue;
     sem_init;
     sem_post;
+    sem_trywait;
+    sem_wait;
   }
   GLIBC_2.1.1 {
     sem_close;
@@ -270,7 +274,9 @@  libc {
     sem_open;
     sem_post;
     sem_timedwait;
+    sem_trywait;
     sem_unlink;
+    sem_wait;
     thrd_exit;
     tss_create;
     tss_delete;
@@ -336,8 +342,6 @@  libpthread {
     pthread_detach;
     pthread_join;
     pthread_sigmask;
-    sem_trywait;
-    sem_wait;
   }
 
   GLIBC_2.1 {
@@ -350,8 +354,6 @@  libpthread {
     pthread_create;
     pthread_getconcurrency;
     pthread_setconcurrency;
-    sem_trywait;
-    sem_wait;
   }
 
   GLIBC_2.1.1 {
diff --git a/nptl/sem_wait.c b/nptl/sem_wait.c
index 02bee9f98c..8576add41c 100644
--- a/nptl/sem_wait.c
+++ b/nptl/sem_wait.c
@@ -43,9 +43,13 @@  __new_sem_wait (sem_t *sem)
     return __new_sem_wait_slow64 ((struct new_sem *) sem,
 				  CLOCK_REALTIME, NULL);
 }
-versioned_symbol (libpthread, __new_sem_wait, sem_wait, GLIBC_2_1);
+versioned_symbol (libc, __new_sem_wait, sem_wait, GLIBC_2_34);
 
-#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1)
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34)
+compat_symbol (libpthread, __new_sem_wait, sem_wait, GLIBC_2_1);
+#endif
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1)
 int
 attribute_compat_text_section
 __old_sem_wait (sem_t *sem)
@@ -80,8 +84,13 @@  __new_sem_trywait (sem_t *sem)
   __set_errno (EAGAIN);
   return -1;
 }
-versioned_symbol (libpthread, __new_sem_trywait, sem_trywait, GLIBC_2_1);
-#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1)
+versioned_symbol (libc, __new_sem_trywait, sem_trywait, GLIBC_2_34);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34)
+compat_symbol (libpthread, __new_sem_trywait, sem_trywait, GLIBC_2_1);
+#endif
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1)
 int
 __old_sem_trywait (sem_t *sem)
 {
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index 75cacc3038..000d484949 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -1667,7 +1667,9 @@  GLIBC_2.17 sem_init F
 GLIBC_2.17 sem_open F
 GLIBC_2.17 sem_post F
 GLIBC_2.17 sem_timedwait F
+GLIBC_2.17 sem_trywait F
 GLIBC_2.17 sem_unlink F
+GLIBC_2.17 sem_wait F
 GLIBC_2.17 semctl F
 GLIBC_2.17 semget F
 GLIBC_2.17 semop F
@@ -2362,7 +2364,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_delete F
diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
index 590f08ba58..cbf1879440 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
@@ -39,8 +39,6 @@  GLIBC_2.17 pthread_setschedprio F
 GLIBC_2.17 pthread_sigqueue F
 GLIBC_2.17 pthread_timedjoin_np F
 GLIBC_2.17 pthread_tryjoin_np F
-GLIBC_2.17 sem_trywait F
-GLIBC_2.17 sem_wait F
 GLIBC_2.18 pthread_getattr_default_np F
 GLIBC_2.18 pthread_setattr_default_np F
 GLIBC_2.28 thrd_create F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index a1c7de11ee..381101f10e 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -1015,6 +1015,8 @@  GLIBC_2.0 sem_destroy F
 GLIBC_2.0 sem_getvalue F
 GLIBC_2.0 sem_init F
 GLIBC_2.0 sem_post F
+GLIBC_2.0 sem_trywait F
+GLIBC_2.0 sem_wait F
 GLIBC_2.0 semctl F
 GLIBC_2.0 semget F
 GLIBC_2.0 semop F
@@ -1642,6 +1644,8 @@  GLIBC_2.1 sem_destroy F
 GLIBC_2.1 sem_getvalue F
 GLIBC_2.1 sem_init F
 GLIBC_2.1 sem_post F
+GLIBC_2.1 sem_trywait F
+GLIBC_2.1 sem_wait F
 GLIBC_2.1 sendfile F
 GLIBC_2.1 setitimer F
 GLIBC_2.1 setrlimit64 F
@@ -2447,7 +2451,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_delete F
diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
index 6540830d09..4adb3dec7c 100644
--- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
@@ -9,8 +9,6 @@  GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_join F
-GLIBC_2.0 sem_trywait F
-GLIBC_2.0 sem_wait F
 GLIBC_2.1 pthread_attr_getguardsize F
 GLIBC_2.1 pthread_attr_getstackaddr F
 GLIBC_2.1 pthread_attr_getstacksize F
@@ -20,8 +18,6 @@  GLIBC_2.1 pthread_attr_setstacksize F
 GLIBC_2.1 pthread_create F
 GLIBC_2.1 pthread_getconcurrency F
 GLIBC_2.1 pthread_setconcurrency F
-GLIBC_2.1 sem_trywait F
-GLIBC_2.1 sem_wait F
 GLIBC_2.1.1 __libpthread_version_placeholder F
 GLIBC_2.1.2 __libpthread_version_placeholder F
 GLIBC_2.11 pthread_sigqueue F
diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
index 13f0192e61..cd05bc6393 100644
--- a/sysdeps/unix/sysv/linux/arc/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
@@ -1609,7 +1609,9 @@  GLIBC_2.32 sem_init F
 GLIBC_2.32 sem_open F
 GLIBC_2.32 sem_post F
 GLIBC_2.32 sem_timedwait F
+GLIBC_2.32 sem_trywait F
 GLIBC_2.32 sem_unlink F
+GLIBC_2.32 sem_wait F
 GLIBC_2.32 semctl F
 GLIBC_2.32 semget F
 GLIBC_2.32 semop F
@@ -2121,7 +2123,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_delete F
diff --git a/sysdeps/unix/sysv/linux/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist
index 7aa79d0d68..219ac17ca8 100644
--- a/sysdeps/unix/sysv/linux/arc/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist
@@ -42,8 +42,6 @@  GLIBC_2.32 pthread_setschedprio F
 GLIBC_2.32 pthread_sigqueue F
 GLIBC_2.32 pthread_timedjoin_np F
 GLIBC_2.32 pthread_tryjoin_np F
-GLIBC_2.32 sem_trywait F
-GLIBC_2.32 sem_wait F
 GLIBC_2.32 thrd_create F
 GLIBC_2.32 thrd_detach F
 GLIBC_2.32 thrd_join F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
index 04715a2155..ca79da3636 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
@@ -260,7 +260,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_delete F
@@ -1853,7 +1855,9 @@  GLIBC_2.4 sem_init F
 GLIBC_2.4 sem_open F
 GLIBC_2.4 sem_post F
 GLIBC_2.4 sem_timedwait F
+GLIBC_2.4 sem_trywait F
 GLIBC_2.4 sem_unlink F
+GLIBC_2.4 sem_wait F
 GLIBC_2.4 semctl F
 GLIBC_2.4 semget F
 GLIBC_2.4 semop F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
index 1e819c1173..3aba51fbd0 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
@@ -47,5 +47,3 @@  GLIBC_2.4 pthread_setconcurrency F
 GLIBC_2.4 pthread_setschedprio F
 GLIBC_2.4 pthread_timedjoin_np F
 GLIBC_2.4 pthread_tryjoin_np F
-GLIBC_2.4 sem_trywait F
-GLIBC_2.4 sem_wait F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
index 671b211af6..619a2dc40a 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
@@ -257,7 +257,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_delete F
@@ -1850,7 +1852,9 @@  GLIBC_2.4 sem_init F
 GLIBC_2.4 sem_open F
 GLIBC_2.4 sem_post F
 GLIBC_2.4 sem_timedwait F
+GLIBC_2.4 sem_trywait F
 GLIBC_2.4 sem_unlink F
+GLIBC_2.4 sem_wait F
 GLIBC_2.4 semctl F
 GLIBC_2.4 semget F
 GLIBC_2.4 semop F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
index 1e819c1173..3aba51fbd0 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
@@ -47,5 +47,3 @@  GLIBC_2.4 pthread_setconcurrency F
 GLIBC_2.4 pthread_setschedprio F
 GLIBC_2.4 pthread_timedjoin_np F
 GLIBC_2.4 pthread_tryjoin_np F
-GLIBC_2.4 sem_trywait F
-GLIBC_2.4 sem_wait F
diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist
index ccb423fe97..5a2d762df0 100644
--- a/sysdeps/unix/sysv/linux/csky/libc.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libc.abilist
@@ -1670,7 +1670,9 @@  GLIBC_2.29 sem_init F
 GLIBC_2.29 sem_open F
 GLIBC_2.29 sem_post F
 GLIBC_2.29 sem_timedwait F
+GLIBC_2.29 sem_trywait F
 GLIBC_2.29 sem_unlink F
+GLIBC_2.29 sem_wait F
 GLIBC_2.29 semctl F
 GLIBC_2.29 semget F
 GLIBC_2.29 semop F
@@ -2305,7 +2307,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_delete F
diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
index 3579a0bfbb..819757485b 100644
--- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
@@ -41,8 +41,6 @@  GLIBC_2.29 pthread_setschedprio F
 GLIBC_2.29 pthread_sigqueue F
 GLIBC_2.29 pthread_timedjoin_np F
 GLIBC_2.29 pthread_tryjoin_np F
-GLIBC_2.29 sem_trywait F
-GLIBC_2.29 sem_wait F
 GLIBC_2.29 thrd_create F
 GLIBC_2.29 thrd_detach F
 GLIBC_2.29 thrd_join F
diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
index 2d1fa9694b..5886b23300 100644
--- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
@@ -1459,7 +1459,9 @@  GLIBC_2.2 sem_init F
 GLIBC_2.2 sem_open F
 GLIBC_2.2 sem_post F
 GLIBC_2.2 sem_timedwait F
+GLIBC_2.2 sem_trywait F
 GLIBC_2.2 sem_unlink F
+GLIBC_2.2 sem_wait F
 GLIBC_2.2 semctl F
 GLIBC_2.2 semget F
 GLIBC_2.2 semop F
@@ -2256,7 +2258,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_delete F
diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
index 30f7add73e..d19abde30d 100644
--- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
@@ -31,8 +31,6 @@  GLIBC_2.2 pthread_getconcurrency F
 GLIBC_2.2 pthread_getcpuclockid F
 GLIBC_2.2 pthread_join F
 GLIBC_2.2 pthread_setconcurrency F
-GLIBC_2.2 sem_trywait F
-GLIBC_2.2 sem_wait F
 GLIBC_2.2.3 __libpthread_version_placeholder F
 GLIBC_2.2.6 __libpthread_version_placeholder F
 GLIBC_2.28 thrd_create F
diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
index e270a9c9ab..4694ef5169 100644
--- a/sysdeps/unix/sysv/linux/i386/libc.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
@@ -992,6 +992,8 @@  GLIBC_2.0 sem_destroy F
 GLIBC_2.0 sem_getvalue F
 GLIBC_2.0 sem_init F
 GLIBC_2.0 sem_post F
+GLIBC_2.0 sem_trywait F
+GLIBC_2.0 sem_wait F
 GLIBC_2.0 semctl F
 GLIBC_2.0 semget F
 GLIBC_2.0 semop F
@@ -1612,6 +1614,8 @@  GLIBC_2.1 sem_destroy F
 GLIBC_2.1 sem_getvalue F
 GLIBC_2.1 sem_init F
 GLIBC_2.1 sem_post F
+GLIBC_2.1 sem_trywait F
+GLIBC_2.1 sem_wait F
 GLIBC_2.1 sendfile F
 GLIBC_2.1 setrlimit64 F
 GLIBC_2.1 setutxent F
@@ -2437,7 +2441,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_delete F
diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
index c7a1d8f0ff..7431c8546e 100644
--- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
@@ -9,8 +9,6 @@  GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_join F
-GLIBC_2.0 sem_trywait F
-GLIBC_2.0 sem_wait F
 GLIBC_2.1 pthread_attr_getguardsize F
 GLIBC_2.1 pthread_attr_getstackaddr F
 GLIBC_2.1 pthread_attr_getstacksize F
@@ -20,8 +18,6 @@  GLIBC_2.1 pthread_attr_setstacksize F
 GLIBC_2.1 pthread_create F
 GLIBC_2.1 pthread_getconcurrency F
 GLIBC_2.1 pthread_setconcurrency F
-GLIBC_2.1 sem_trywait F
-GLIBC_2.1 sem_wait F
 GLIBC_2.1.1 __libpthread_version_placeholder F
 GLIBC_2.1.2 __libpthread_version_placeholder F
 GLIBC_2.11 pthread_sigqueue F
diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
index 76dfc3a9ff..66b154da95 100644
--- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
@@ -1480,7 +1480,9 @@  GLIBC_2.2 sem_init F
 GLIBC_2.2 sem_open F
 GLIBC_2.2 sem_post F
 GLIBC_2.2 sem_timedwait F
+GLIBC_2.2 sem_trywait F
 GLIBC_2.2 sem_unlink F
+GLIBC_2.2 sem_wait F
 GLIBC_2.2 semctl F
 GLIBC_2.2 semget F
 GLIBC_2.2 semop F
@@ -2290,7 +2292,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_delete F
diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
index 225bfd0e6a..05fae6161a 100644
--- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
@@ -31,8 +31,6 @@  GLIBC_2.2 pthread_getconcurrency F
 GLIBC_2.2 pthread_getcpuclockid F
 GLIBC_2.2 pthread_join F
 GLIBC_2.2 pthread_setconcurrency F
-GLIBC_2.2 sem_trywait F
-GLIBC_2.2 sem_wait F
 GLIBC_2.2.3 __libpthread_version_placeholder F
 GLIBC_2.2.6 __libpthread_version_placeholder F
 GLIBC_2.28 thrd_create F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
index 50b6beebdb..dfcce32e4d 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
@@ -261,7 +261,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_delete F
@@ -1833,7 +1835,9 @@  GLIBC_2.4 sem_init F
 GLIBC_2.4 sem_open F
 GLIBC_2.4 sem_post F
 GLIBC_2.4 sem_timedwait F
+GLIBC_2.4 sem_trywait F
 GLIBC_2.4 sem_unlink F
+GLIBC_2.4 sem_wait F
 GLIBC_2.4 semctl F
 GLIBC_2.4 semget F
 GLIBC_2.4 semop F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
index 1e819c1173..3aba51fbd0 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
@@ -47,5 +47,3 @@  GLIBC_2.4 pthread_setconcurrency F
 GLIBC_2.4 pthread_setschedprio F
 GLIBC_2.4 pthread_timedjoin_np F
 GLIBC_2.4 pthread_tryjoin_np F
-GLIBC_2.4 sem_trywait F
-GLIBC_2.4 sem_wait F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
index f42dfe0d54..a643d84325 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
@@ -991,6 +991,8 @@  GLIBC_2.0 sem_destroy F
 GLIBC_2.0 sem_getvalue F
 GLIBC_2.0 sem_init F
 GLIBC_2.0 sem_post F
+GLIBC_2.0 sem_trywait F
+GLIBC_2.0 sem_wait F
 GLIBC_2.0 semctl F
 GLIBC_2.0 semget F
 GLIBC_2.0 semop F
@@ -1608,6 +1610,8 @@  GLIBC_2.1 sem_destroy F
 GLIBC_2.1 sem_getvalue F
 GLIBC_2.1 sem_init F
 GLIBC_2.1 sem_post F
+GLIBC_2.1 sem_trywait F
+GLIBC_2.1 sem_wait F
 GLIBC_2.1 sendfile F
 GLIBC_2.1 setrlimit64 F
 GLIBC_2.1 setutxent F
@@ -2380,7 +2384,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_delete F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
index c7a1d8f0ff..7431c8546e 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
@@ -9,8 +9,6 @@  GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_join F
-GLIBC_2.0 sem_trywait F
-GLIBC_2.0 sem_wait F
 GLIBC_2.1 pthread_attr_getguardsize F
 GLIBC_2.1 pthread_attr_getstackaddr F
 GLIBC_2.1 pthread_attr_getstacksize F
@@ -20,8 +18,6 @@  GLIBC_2.1 pthread_attr_setstacksize F
 GLIBC_2.1 pthread_create F
 GLIBC_2.1 pthread_getconcurrency F
 GLIBC_2.1 pthread_setconcurrency F
-GLIBC_2.1 sem_trywait F
-GLIBC_2.1 sem_wait F
 GLIBC_2.1.1 __libpthread_version_placeholder F
 GLIBC_2.1.2 __libpthread_version_placeholder F
 GLIBC_2.11 pthread_sigqueue F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
index 563c3a0e35..91d77eb8c9 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
@@ -1669,7 +1669,9 @@  GLIBC_2.18 sem_init F
 GLIBC_2.18 sem_open F
 GLIBC_2.18 sem_post F
 GLIBC_2.18 sem_timedwait F
+GLIBC_2.18 sem_trywait F
 GLIBC_2.18 sem_unlink F
+GLIBC_2.18 sem_wait F
 GLIBC_2.18 semctl F
 GLIBC_2.18 semget F
 GLIBC_2.18 semop F
@@ -2356,7 +2358,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_delete F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
index d7bacba551..ac586fac3b 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
@@ -41,8 +41,6 @@  GLIBC_2.18 pthread_setschedprio F
 GLIBC_2.18 pthread_sigqueue F
 GLIBC_2.18 pthread_timedjoin_np F
 GLIBC_2.18 pthread_tryjoin_np F
-GLIBC_2.18 sem_trywait F
-GLIBC_2.18 sem_wait F
 GLIBC_2.28 thrd_create F
 GLIBC_2.28 thrd_detach F
 GLIBC_2.28 thrd_join F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
index 57a51ab39b..72dd2dea1a 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
@@ -1669,7 +1669,9 @@  GLIBC_2.18 sem_init F
 GLIBC_2.18 sem_open F
 GLIBC_2.18 sem_post F
 GLIBC_2.18 sem_timedwait F
+GLIBC_2.18 sem_trywait F
 GLIBC_2.18 sem_unlink F
+GLIBC_2.18 sem_wait F
 GLIBC_2.18 semctl F
 GLIBC_2.18 semget F
 GLIBC_2.18 semop F
@@ -2353,7 +2355,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_delete F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
index d7bacba551..ac586fac3b 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
@@ -41,8 +41,6 @@  GLIBC_2.18 pthread_setschedprio F
 GLIBC_2.18 pthread_sigqueue F
 GLIBC_2.18 pthread_timedjoin_np F
 GLIBC_2.18 pthread_tryjoin_np F
-GLIBC_2.18 sem_trywait F
-GLIBC_2.18 sem_wait F
 GLIBC_2.28 thrd_create F
 GLIBC_2.28 thrd_detach F
 GLIBC_2.28 thrd_join F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
index a7b828f541..2132171644 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
@@ -988,6 +988,8 @@  GLIBC_2.0 sem_destroy F
 GLIBC_2.0 sem_getvalue F
 GLIBC_2.0 sem_init F
 GLIBC_2.0 sem_post F
+GLIBC_2.0 sem_trywait F
+GLIBC_2.0 sem_wait F
 GLIBC_2.0 semctl F
 GLIBC_2.0 semget F
 GLIBC_2.0 semop F
@@ -1899,7 +1901,9 @@  GLIBC_2.2 sem_init F
 GLIBC_2.2 sem_open F
 GLIBC_2.2 sem_post F
 GLIBC_2.2 sem_timedwait F
+GLIBC_2.2 sem_trywait F
 GLIBC_2.2 sem_unlink F
+GLIBC_2.2 sem_wait F
 GLIBC_2.2 semctl F
 GLIBC_2.2 sendfile F
 GLIBC_2.2 setrlimit64 F
@@ -2343,7 +2347,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_delete F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
index c7256adbdb..16eef07725 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
@@ -9,8 +9,6 @@  GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_join F
-GLIBC_2.0 sem_trywait F
-GLIBC_2.0 sem_wait F
 GLIBC_2.11 pthread_sigqueue F
 GLIBC_2.12 pthread_getname_np F
 GLIBC_2.12 pthread_setname_np F
@@ -34,8 +32,6 @@  GLIBC_2.2 pthread_create F
 GLIBC_2.2 pthread_getconcurrency F
 GLIBC_2.2 pthread_getcpuclockid F
 GLIBC_2.2 pthread_setconcurrency F
-GLIBC_2.2 sem_trywait F
-GLIBC_2.2 sem_wait F
 GLIBC_2.2.3 __libpthread_version_placeholder F
 GLIBC_2.2.6 __libpthread_version_placeholder F
 GLIBC_2.28 thrd_create F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
index 38e27a67b7..f59b1cd90b 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
@@ -988,6 +988,8 @@  GLIBC_2.0 sem_destroy F
 GLIBC_2.0 sem_getvalue F
 GLIBC_2.0 sem_init F
 GLIBC_2.0 sem_post F
+GLIBC_2.0 sem_trywait F
+GLIBC_2.0 sem_wait F
 GLIBC_2.0 semctl F
 GLIBC_2.0 semget F
 GLIBC_2.0 semop F
@@ -1897,7 +1899,9 @@  GLIBC_2.2 sem_init F
 GLIBC_2.2 sem_open F
 GLIBC_2.2 sem_post F
 GLIBC_2.2 sem_timedwait F
+GLIBC_2.2 sem_trywait F
 GLIBC_2.2 sem_unlink F
+GLIBC_2.2 sem_wait F
 GLIBC_2.2 semctl F
 GLIBC_2.2 sendfile F
 GLIBC_2.2 setrlimit64 F
@@ -2341,7 +2345,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_delete F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
index c7256adbdb..16eef07725 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
@@ -9,8 +9,6 @@  GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_join F
-GLIBC_2.0 sem_trywait F
-GLIBC_2.0 sem_wait F
 GLIBC_2.11 pthread_sigqueue F
 GLIBC_2.12 pthread_getname_np F
 GLIBC_2.12 pthread_setname_np F
@@ -34,8 +32,6 @@  GLIBC_2.2 pthread_create F
 GLIBC_2.2 pthread_getconcurrency F
 GLIBC_2.2 pthread_getcpuclockid F
 GLIBC_2.2 pthread_setconcurrency F
-GLIBC_2.2 sem_trywait F
-GLIBC_2.2 sem_wait F
 GLIBC_2.2.3 __libpthread_version_placeholder F
 GLIBC_2.2.6 __libpthread_version_placeholder F
 GLIBC_2.28 thrd_create F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
index 932bbb01ed..1a8b007889 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
@@ -988,6 +988,8 @@  GLIBC_2.0 sem_destroy F
 GLIBC_2.0 sem_getvalue F
 GLIBC_2.0 sem_init F
 GLIBC_2.0 sem_post F
+GLIBC_2.0 sem_trywait F
+GLIBC_2.0 sem_wait F
 GLIBC_2.0 semctl F
 GLIBC_2.0 semget F
 GLIBC_2.0 semop F
@@ -1897,7 +1899,9 @@  GLIBC_2.2 sem_init F
 GLIBC_2.2 sem_open F
 GLIBC_2.2 sem_post F
 GLIBC_2.2 sem_timedwait F
+GLIBC_2.2 sem_trywait F
 GLIBC_2.2 sem_unlink F
+GLIBC_2.2 sem_wait F
 GLIBC_2.2 sendfile F
 GLIBC_2.2 setrlimit64 F
 GLIBC_2.2 setutxent F
@@ -2349,7 +2353,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_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 d2af27e80e..c3291ffa9e 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
@@ -986,6 +986,8 @@  GLIBC_2.0 sem_destroy F
 GLIBC_2.0 sem_getvalue F
 GLIBC_2.0 sem_init F
 GLIBC_2.0 sem_post F
+GLIBC_2.0 sem_trywait F
+GLIBC_2.0 sem_wait F
 GLIBC_2.0 semctl F
 GLIBC_2.0 semget F
 GLIBC_2.0 semop F
@@ -1893,7 +1895,9 @@  GLIBC_2.2 sem_init F
 GLIBC_2.2 sem_open F
 GLIBC_2.2 sem_post F
 GLIBC_2.2 sem_timedwait F
+GLIBC_2.2 sem_trywait F
 GLIBC_2.2 sem_unlink F
+GLIBC_2.2 sem_wait F
 GLIBC_2.2 sendfile F
 GLIBC_2.2 setrlimit64 F
 GLIBC_2.2 setutxent F
@@ -2343,7 +2347,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_delete F
diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
index b56a86af95..f118e29a13 100644
--- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
@@ -1712,7 +1712,9 @@  GLIBC_2.21 sem_init F
 GLIBC_2.21 sem_open F
 GLIBC_2.21 sem_post F
 GLIBC_2.21 sem_timedwait F
+GLIBC_2.21 sem_trywait F
 GLIBC_2.21 sem_unlink F
+GLIBC_2.21 sem_wait F
 GLIBC_2.21 semctl F
 GLIBC_2.21 semget F
 GLIBC_2.21 semop F
@@ -2395,7 +2397,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_delete F
diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
index 8c753b83c5..4080b80d4a 100644
--- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
@@ -41,8 +41,6 @@  GLIBC_2.21 pthread_setschedprio F
 GLIBC_2.21 pthread_sigqueue F
 GLIBC_2.21 pthread_timedjoin_np F
 GLIBC_2.21 pthread_tryjoin_np F
-GLIBC_2.21 sem_trywait F
-GLIBC_2.21 sem_wait F
 GLIBC_2.28 thrd_create F
 GLIBC_2.28 thrd_detach F
 GLIBC_2.28 thrd_join F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
index f66d77276d..7469a65e2e 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
@@ -999,6 +999,8 @@  GLIBC_2.0 sem_destroy F
 GLIBC_2.0 sem_getvalue F
 GLIBC_2.0 sem_init F
 GLIBC_2.0 sem_post F
+GLIBC_2.0 sem_trywait F
+GLIBC_2.0 sem_wait F
 GLIBC_2.0 semctl F
 GLIBC_2.0 semget F
 GLIBC_2.0 semop F
@@ -1613,6 +1615,8 @@  GLIBC_2.1 sem_destroy F
 GLIBC_2.1 sem_getvalue F
 GLIBC_2.1 sem_init F
 GLIBC_2.1 sem_post F
+GLIBC_2.1 sem_trywait F
+GLIBC_2.1 sem_wait F
 GLIBC_2.1 sendfile F
 GLIBC_2.1 setrlimit64 F
 GLIBC_2.1 setutxent F
@@ -2407,7 +2411,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_delete F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
index 83968d0c97..4bc2e431c3 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
@@ -9,8 +9,6 @@  GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_join F
-GLIBC_2.0 sem_trywait F
-GLIBC_2.0 sem_wait F
 GLIBC_2.1 pthread_attr_getguardsize F
 GLIBC_2.1 pthread_attr_getstackaddr F
 GLIBC_2.1 pthread_attr_getstacksize F
@@ -20,8 +18,6 @@  GLIBC_2.1 pthread_attr_setstacksize F
 GLIBC_2.1 pthread_create F
 GLIBC_2.1 pthread_getconcurrency F
 GLIBC_2.1 pthread_setconcurrency F
-GLIBC_2.1 sem_trywait F
-GLIBC_2.1 sem_wait F
 GLIBC_2.1.1 __libpthread_version_placeholder F
 GLIBC_2.1.2 __libpthread_version_placeholder F
 GLIBC_2.11 pthread_sigqueue F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
index bf1a6ba7ba..6998064cc8 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
@@ -999,6 +999,8 @@  GLIBC_2.0 sem_destroy F
 GLIBC_2.0 sem_getvalue F
 GLIBC_2.0 sem_init F
 GLIBC_2.0 sem_post F
+GLIBC_2.0 sem_trywait F
+GLIBC_2.0 sem_wait F
 GLIBC_2.0 semctl F
 GLIBC_2.0 semget F
 GLIBC_2.0 semop F
@@ -1613,6 +1615,8 @@  GLIBC_2.1 sem_destroy F
 GLIBC_2.1 sem_getvalue F
 GLIBC_2.1 sem_init F
 GLIBC_2.1 sem_post F
+GLIBC_2.1 sem_trywait F
+GLIBC_2.1 sem_wait F
 GLIBC_2.1 sendfile F
 GLIBC_2.1 setrlimit64 F
 GLIBC_2.1 setutxent F
@@ -2440,7 +2444,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_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 55eea26dc9..20014236c7 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
@@ -1584,7 +1584,9 @@  GLIBC_2.3 sem_init F
 GLIBC_2.3 sem_open F
 GLIBC_2.3 sem_post F
 GLIBC_2.3 sem_timedwait F
+GLIBC_2.3 sem_trywait F
 GLIBC_2.3 sem_unlink F
+GLIBC_2.3 sem_wait F
 GLIBC_2.3 semctl F
 GLIBC_2.3 semget F
 GLIBC_2.3 semop F
@@ -2257,7 +2259,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_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 b6a7fc4e23..e7287d88fb 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
@@ -34,8 +34,6 @@  GLIBC_2.3 pthread_getconcurrency F
 GLIBC_2.3 pthread_getcpuclockid F
 GLIBC_2.3 pthread_join F
 GLIBC_2.3 pthread_setconcurrency F
-GLIBC_2.3 sem_trywait F
-GLIBC_2.3 sem_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
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
index b5032df9df..24a7d912cc 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
@@ -1755,7 +1755,9 @@  GLIBC_2.17 sem_init F
 GLIBC_2.17 sem_open F
 GLIBC_2.17 sem_post F
 GLIBC_2.17 sem_timedwait F
+GLIBC_2.17 sem_trywait F
 GLIBC_2.17 sem_unlink F
+GLIBC_2.17 sem_wait F
 GLIBC_2.17 semctl F
 GLIBC_2.17 semget F
 GLIBC_2.17 semop F
@@ -2558,7 +2560,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_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 590f08ba58..cbf1879440 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
@@ -39,8 +39,6 @@  GLIBC_2.17 pthread_setschedprio F
 GLIBC_2.17 pthread_sigqueue F
 GLIBC_2.17 pthread_timedjoin_np F
 GLIBC_2.17 pthread_tryjoin_np F
-GLIBC_2.17 sem_trywait F
-GLIBC_2.17 sem_wait F
 GLIBC_2.18 pthread_getattr_default_np F
 GLIBC_2.18 pthread_setattr_default_np F
 GLIBC_2.28 thrd_create F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
index 7b86b09a47..b739614eea 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
@@ -1611,7 +1611,9 @@  GLIBC_2.33 sem_init F
 GLIBC_2.33 sem_open F
 GLIBC_2.33 sem_post F
 GLIBC_2.33 sem_timedwait F
+GLIBC_2.33 sem_trywait F
 GLIBC_2.33 sem_unlink F
+GLIBC_2.33 sem_wait F
 GLIBC_2.33 semctl F
 GLIBC_2.33 semget F
 GLIBC_2.33 semop F
@@ -2123,7 +2125,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_delete F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
index 74798905a5..0609c51490 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
@@ -42,8 +42,6 @@  GLIBC_2.33 pthread_setschedprio F
 GLIBC_2.33 pthread_sigqueue F
 GLIBC_2.33 pthread_timedjoin_np F
 GLIBC_2.33 pthread_tryjoin_np F
-GLIBC_2.33 sem_trywait F
-GLIBC_2.33 sem_wait F
 GLIBC_2.33 thrd_create F
 GLIBC_2.33 thrd_detach F
 GLIBC_2.33 thrd_join F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
index 36e7eff6a7..b6f1325a59 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
@@ -1659,7 +1659,9 @@  GLIBC_2.27 sem_init F
 GLIBC_2.27 sem_open F
 GLIBC_2.27 sem_post F
 GLIBC_2.27 sem_timedwait F
+GLIBC_2.27 sem_trywait F
 GLIBC_2.27 sem_unlink F
+GLIBC_2.27 sem_wait F
 GLIBC_2.27 semctl F
 GLIBC_2.27 semget F
 GLIBC_2.27 semop F
@@ -2323,7 +2325,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_delete F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
index 8eb140f7ac..2eab03d3c5 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
@@ -41,8 +41,6 @@  GLIBC_2.27 pthread_setschedprio F
 GLIBC_2.27 pthread_sigqueue F
 GLIBC_2.27 pthread_timedjoin_np F
 GLIBC_2.27 pthread_tryjoin_np F
-GLIBC_2.27 sem_trywait F
-GLIBC_2.27 sem_wait F
 GLIBC_2.28 thrd_create F
 GLIBC_2.28 thrd_detach F
 GLIBC_2.28 thrd_join F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
index 96d23b986b..f87d2ce120 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
@@ -990,6 +990,8 @@  GLIBC_2.0 sem_destroy F
 GLIBC_2.0 sem_getvalue F
 GLIBC_2.0 sem_init F
 GLIBC_2.0 sem_post F
+GLIBC_2.0 sem_trywait F
+GLIBC_2.0 sem_wait F
 GLIBC_2.0 semctl F
 GLIBC_2.0 semget F
 GLIBC_2.0 semop F
@@ -1605,6 +1607,8 @@  GLIBC_2.1 sem_destroy F
 GLIBC_2.1 sem_getvalue F
 GLIBC_2.1 sem_init F
 GLIBC_2.1 sem_post F
+GLIBC_2.1 sem_trywait F
+GLIBC_2.1 sem_wait F
 GLIBC_2.1 sendfile F
 GLIBC_2.1 setrlimit64 F
 GLIBC_2.1 setutxent F
@@ -2405,7 +2409,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_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 f59ac6c20d..696d0370ff 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
@@ -9,8 +9,6 @@  GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_join F
-GLIBC_2.0 sem_trywait F
-GLIBC_2.0 sem_wait F
 GLIBC_2.1 pthread_attr_getguardsize F
 GLIBC_2.1 pthread_attr_getstackaddr F
 GLIBC_2.1 pthread_attr_getstacksize F
@@ -20,8 +18,6 @@  GLIBC_2.1 pthread_attr_setstacksize F
 GLIBC_2.1 pthread_create F
 GLIBC_2.1 pthread_getconcurrency F
 GLIBC_2.1 pthread_setconcurrency F
-GLIBC_2.1 sem_trywait F
-GLIBC_2.1 sem_wait F
 GLIBC_2.1.1 __libpthread_version_placeholder F
 GLIBC_2.1.2 __libpthread_version_placeholder F
 GLIBC_2.11 pthread_sigqueue F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
index 928b499c84..360d76eff1 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
@@ -1477,7 +1477,9 @@  GLIBC_2.2 sem_init F
 GLIBC_2.2 sem_open F
 GLIBC_2.2 sem_post F
 GLIBC_2.2 sem_timedwait F
+GLIBC_2.2 sem_trywait F
 GLIBC_2.2 sem_unlink F
+GLIBC_2.2 sem_wait F
 GLIBC_2.2 semctl F
 GLIBC_2.2 semget F
 GLIBC_2.2 semop F
@@ -2294,7 +2296,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_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 a2f0c9965f..ab1712df42 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
@@ -32,8 +32,6 @@  GLIBC_2.2 pthread_getconcurrency F
 GLIBC_2.2 pthread_getcpuclockid F
 GLIBC_2.2 pthread_join F
 GLIBC_2.2 pthread_setconcurrency F
-GLIBC_2.2 sem_trywait F
-GLIBC_2.2 sem_wait F
 GLIBC_2.2.3 __libpthread_version_placeholder F
 GLIBC_2.2.6 __libpthread_version_placeholder F
 GLIBC_2.28 thrd_create F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
index 61594abaf2..efdeab47ad 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
@@ -1463,7 +1463,9 @@  GLIBC_2.2 sem_init F
 GLIBC_2.2 sem_open F
 GLIBC_2.2 sem_post F
 GLIBC_2.2 sem_timedwait F
+GLIBC_2.2 sem_trywait F
 GLIBC_2.2 sem_unlink F
+GLIBC_2.2 sem_wait F
 GLIBC_2.2 semctl F
 GLIBC_2.2 semget F
 GLIBC_2.2 semop F
@@ -2263,7 +2265,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_delete F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
index 30f7add73e..d19abde30d 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
@@ -31,8 +31,6 @@  GLIBC_2.2 pthread_getconcurrency F
 GLIBC_2.2 pthread_getcpuclockid F
 GLIBC_2.2 pthread_join F
 GLIBC_2.2 pthread_setconcurrency F
-GLIBC_2.2 sem_trywait F
-GLIBC_2.2 sem_wait F
 GLIBC_2.2.3 __libpthread_version_placeholder F
 GLIBC_2.2.6 __libpthread_version_placeholder F
 GLIBC_2.28 thrd_create F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
index 17d56762a5..30c6f58df0 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
@@ -1463,7 +1463,9 @@  GLIBC_2.2 sem_init F
 GLIBC_2.2 sem_open F
 GLIBC_2.2 sem_post F
 GLIBC_2.2 sem_timedwait F
+GLIBC_2.2 sem_trywait F
 GLIBC_2.2 sem_unlink F
+GLIBC_2.2 sem_wait F
 GLIBC_2.2 semctl F
 GLIBC_2.2 semget F
 GLIBC_2.2 semop F
@@ -2260,7 +2262,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_delete F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
index 30f7add73e..d19abde30d 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
@@ -31,8 +31,6 @@  GLIBC_2.2 pthread_getconcurrency F
 GLIBC_2.2 pthread_getcpuclockid F
 GLIBC_2.2 pthread_join F
 GLIBC_2.2 pthread_setconcurrency F
-GLIBC_2.2 sem_trywait F
-GLIBC_2.2 sem_wait F
 GLIBC_2.2.3 __libpthread_version_placeholder F
 GLIBC_2.2.6 __libpthread_version_placeholder F
 GLIBC_2.28 thrd_create F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
index f34f9851ee..72031725c9 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
@@ -993,6 +993,8 @@  GLIBC_2.0 sem_destroy F
 GLIBC_2.0 sem_getvalue F
 GLIBC_2.0 sem_init F
 GLIBC_2.0 sem_post F
+GLIBC_2.0 sem_trywait F
+GLIBC_2.0 sem_wait F
 GLIBC_2.0 semctl F
 GLIBC_2.0 semget F
 GLIBC_2.0 semop F
@@ -1606,6 +1608,8 @@  GLIBC_2.1 sem_destroy F
 GLIBC_2.1 sem_getvalue F
 GLIBC_2.1 sem_init F
 GLIBC_2.1 sem_post F
+GLIBC_2.1 sem_trywait F
+GLIBC_2.1 sem_wait F
 GLIBC_2.1 sendfile F
 GLIBC_2.1 setrlimit64 F
 GLIBC_2.1 setutxent F
@@ -2396,7 +2400,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_delete F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
index 6540830d09..4adb3dec7c 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
@@ -9,8 +9,6 @@  GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_join F
-GLIBC_2.0 sem_trywait F
-GLIBC_2.0 sem_wait F
 GLIBC_2.1 pthread_attr_getguardsize F
 GLIBC_2.1 pthread_attr_getstackaddr F
 GLIBC_2.1 pthread_attr_getstacksize F
@@ -20,8 +18,6 @@  GLIBC_2.1 pthread_attr_setstacksize F
 GLIBC_2.1 pthread_create F
 GLIBC_2.1 pthread_getconcurrency F
 GLIBC_2.1 pthread_setconcurrency F
-GLIBC_2.1 sem_trywait F
-GLIBC_2.1 sem_wait F
 GLIBC_2.1.1 __libpthread_version_placeholder F
 GLIBC_2.1.2 __libpthread_version_placeholder F
 GLIBC_2.11 pthread_sigqueue F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
index 17d1320652..1747388f2f 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
@@ -1506,7 +1506,9 @@  GLIBC_2.2 sem_init F
 GLIBC_2.2 sem_open F
 GLIBC_2.2 sem_post F
 GLIBC_2.2 sem_timedwait F
+GLIBC_2.2 sem_trywait F
 GLIBC_2.2 sem_unlink F
+GLIBC_2.2 sem_wait F
 GLIBC_2.2 semctl F
 GLIBC_2.2 semget F
 GLIBC_2.2 semop F
@@ -2311,7 +2313,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_delete F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
index 225bfd0e6a..05fae6161a 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
@@ -31,8 +31,6 @@  GLIBC_2.2 pthread_getconcurrency F
 GLIBC_2.2 pthread_getcpuclockid F
 GLIBC_2.2 pthread_join F
 GLIBC_2.2 pthread_setconcurrency F
-GLIBC_2.2 sem_trywait F
-GLIBC_2.2 sem_wait F
 GLIBC_2.2.3 __libpthread_version_placeholder F
 GLIBC_2.2.6 __libpthread_version_placeholder F
 GLIBC_2.28 thrd_create F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
index f59fc63658..f1c5e63435 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
@@ -1474,7 +1474,9 @@  GLIBC_2.2.5 sem_init F
 GLIBC_2.2.5 sem_open F
 GLIBC_2.2.5 sem_post F
 GLIBC_2.2.5 sem_timedwait F
+GLIBC_2.2.5 sem_trywait F
 GLIBC_2.2.5 sem_unlink F
+GLIBC_2.2.5 sem_wait F
 GLIBC_2.2.5 semctl F
 GLIBC_2.2.5 semget F
 GLIBC_2.2.5 semop F
@@ -2272,7 +2274,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_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 6fc3699f2c..b5faceae7b 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
@@ -31,8 +31,6 @@  GLIBC_2.2.5 pthread_getconcurrency F
 GLIBC_2.2.5 pthread_getcpuclockid F
 GLIBC_2.2.5 pthread_join F
 GLIBC_2.2.5 pthread_setconcurrency F
-GLIBC_2.2.5 sem_trywait F
-GLIBC_2.2.5 sem_wait F
 GLIBC_2.2.6 __libpthread_version_placeholder F
 GLIBC_2.28 thrd_create F
 GLIBC_2.28 thrd_detach F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
index d6e06954b6..3ca0ecde5c 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
@@ -1673,7 +1673,9 @@  GLIBC_2.16 sem_init F
 GLIBC_2.16 sem_open F
 GLIBC_2.16 sem_post F
 GLIBC_2.16 sem_timedwait F
+GLIBC_2.16 sem_trywait F
 GLIBC_2.16 sem_unlink F
+GLIBC_2.16 sem_wait F
 GLIBC_2.16 semctl F
 GLIBC_2.16 semget F
 GLIBC_2.16 semop F
@@ -2377,7 +2379,9 @@  GLIBC_2.34 sem_init F
 GLIBC_2.34 sem_open F
 GLIBC_2.34 sem_post F
 GLIBC_2.34 sem_timedwait F
+GLIBC_2.34 sem_trywait F
 GLIBC_2.34 sem_unlink F
+GLIBC_2.34 sem_wait F
 GLIBC_2.34 thrd_exit F
 GLIBC_2.34 tss_create F
 GLIBC_2.34 tss_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 ab481ebe8a..f4b4241951 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
@@ -39,8 +39,6 @@  GLIBC_2.16 pthread_setschedprio F
 GLIBC_2.16 pthread_sigqueue F
 GLIBC_2.16 pthread_timedjoin_np F
 GLIBC_2.16 pthread_tryjoin_np F
-GLIBC_2.16 sem_trywait F
-GLIBC_2.16 sem_wait F
 GLIBC_2.18 pthread_getattr_default_np F
 GLIBC_2.18 pthread_setattr_default_np F
 GLIBC_2.28 thrd_create F