diff mbox series

[16/34] Linux: Move aio_suspend, aio_suspend64, __aio_suspend_time64 to libc

Message ID 92036704851ce71f7b6acf248a01518739ac9ab4.1623956057.git.fweimer@redhat.com
State Committed
Commit 32e750516c653bc3005aaef87124a587a7bef196
Delegated to: Adhemerval Zanella Netto
Headers
Series Move librt into libc |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent

Commit Message

Florian Weimer June 17, 2021, 6:58 p.m. UTC 
  The symbols were moved using scripts/move-symbol-to-libc.py.

There is a minor oddity here: This is generic code shared with Hurd,
and Hurd does not have time64 support.  This is why the
versioned_symbol export for __aio_suspend_time64 is restricted to
the PTHREAD_IN_LIBC code.
---
 include/aio.h                                 |  4 ++
 rt/Makefile                                   |  2 +-
 rt/Versions                                   |  6 ++-
 rt/aio_suspend.c                              | 49 +++++++++++++++----
 sysdeps/unix/sysv/linux/Versions              |  2 +-
 sysdeps/unix/sysv/linux/aarch64/libc.abilist  |  4 ++
 sysdeps/unix/sysv/linux/aarch64/librt.abilist |  2 -
 sysdeps/unix/sysv/linux/alpha/libc.abilist    |  4 ++
 sysdeps/unix/sysv/linux/alpha/librt.abilist   |  2 -
 sysdeps/unix/sysv/linux/arc/libc.abilist      |  4 ++
 sysdeps/unix/sysv/linux/arc/librt.abilist     |  2 -
 sysdeps/unix/sysv/linux/arm/be/libc.abilist   |  5 ++
 sysdeps/unix/sysv/linux/arm/be/librt.abilist  |  3 --
 sysdeps/unix/sysv/linux/arm/le/libc.abilist   |  5 ++
 sysdeps/unix/sysv/linux/arm/le/librt.abilist  |  3 --
 sysdeps/unix/sysv/linux/csky/libc.abilist     |  5 ++
 sysdeps/unix/sysv/linux/csky/librt.abilist    |  3 --
 sysdeps/unix/sysv/linux/hppa/libc.abilist     |  5 ++
 sysdeps/unix/sysv/linux/hppa/librt.abilist    |  3 --
 sysdeps/unix/sysv/linux/i386/libc.abilist     |  5 ++
 sysdeps/unix/sysv/linux/i386/librt.abilist    |  3 --
 sysdeps/unix/sysv/linux/ia64/libc.abilist     |  4 ++
 sysdeps/unix/sysv/linux/ia64/librt.abilist    |  2 -
 .../sysv/linux/m68k/coldfire/libc.abilist     |  5 ++
 .../sysv/linux/m68k/coldfire/librt.abilist    |  3 --
 .../unix/sysv/linux/m68k/m680x0/libc.abilist  |  5 ++
 .../unix/sysv/linux/m68k/m680x0/librt.abilist |  3 --
 .../sysv/linux/microblaze/be/libc.abilist     |  5 ++
 .../sysv/linux/microblaze/be/librt.abilist    |  3 --
 .../sysv/linux/microblaze/le/libc.abilist     |  5 ++
 .../sysv/linux/microblaze/le/librt.abilist    |  3 --
 .../sysv/linux/mips/mips32/fpu/libc.abilist   |  5 ++
 .../unix/sysv/linux/mips/mips32/librt.abilist |  3 --
 .../sysv/linux/mips/mips32/nofpu/libc.abilist |  5 ++
 .../sysv/linux/mips/mips64/n32/libc.abilist   |  5 ++
 .../sysv/linux/mips/mips64/n32/librt.abilist  |  3 --
 .../sysv/linux/mips/mips64/n64/libc.abilist   |  4 ++
 .../sysv/linux/mips/mips64/n64/librt.abilist  |  2 -
 sysdeps/unix/sysv/linux/nios2/libc.abilist    |  5 ++
 sysdeps/unix/sysv/linux/nios2/librt.abilist   |  3 --
 .../linux/powerpc/powerpc32/fpu/libc.abilist  |  5 ++
 .../linux/powerpc/powerpc32/librt.abilist     |  3 --
 .../powerpc/powerpc32/nofpu/libc.abilist      |  5 ++
 .../linux/powerpc/powerpc64/be/libc.abilist   |  4 ++
 .../linux/powerpc/powerpc64/be/librt.abilist  |  2 -
 .../linux/powerpc/powerpc64/le/libc.abilist   |  4 ++
 .../linux/powerpc/powerpc64/le/librt.abilist  |  2 -
 .../unix/sysv/linux/riscv/rv32/libc.abilist   |  4 ++
 .../unix/sysv/linux/riscv/rv32/librt.abilist  |  2 -
 .../unix/sysv/linux/riscv/rv64/libc.abilist   |  4 ++
 .../unix/sysv/linux/riscv/rv64/librt.abilist  |  2 -
 .../unix/sysv/linux/s390/s390-32/libc.abilist |  5 ++
 .../sysv/linux/s390/s390-32/librt.abilist     |  3 --
 .../unix/sysv/linux/s390/s390-64/libc.abilist |  4 ++
 .../sysv/linux/s390/s390-64/librt.abilist     |  2 -
 sysdeps/unix/sysv/linux/sh/be/libc.abilist    |  5 ++
 sysdeps/unix/sysv/linux/sh/be/librt.abilist   |  3 --
 sysdeps/unix/sysv/linux/sh/le/libc.abilist    |  5 ++
 sysdeps/unix/sysv/linux/sh/le/librt.abilist   |  3 --
 .../sysv/linux/sparc/sparc32/libc.abilist     |  5 ++
 .../sysv/linux/sparc/sparc32/librt.abilist    |  3 --
 .../sysv/linux/sparc/sparc64/libc.abilist     |  4 ++
 .../sysv/linux/sparc/sparc64/librt.abilist    |  2 -
 .../unix/sysv/linux/x86_64/64/libc.abilist    |  4 ++
 .../unix/sysv/linux/x86_64/64/librt.abilist   |  2 -
 .../unix/sysv/linux/x86_64/x32/libc.abilist   |  4 ++
 .../unix/sysv/linux/x86_64/x32/librt.abilist  |  2 -
 67 files changed, 197 insertions(+), 90 deletions(-)

Comments

Adhemerval Zanella June 23, 2021, 7:52 p.m. UTC | #1 
On 17/06/2021 15:58, Florian Weimer via Libc-alpha wrote:
> The symbols were moved using scripts/move-symbol-to-libc.py.
> 
> There is a minor oddity here: This is generic code shared with Hurd,
> and Hurd does not have time64 support.  This is why the
> versioned_symbol export for __aio_suspend_time64 is restricted to
> the PTHREAD_IN_LIBC code.

LGTM, thanks. Only a small question below.

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

> ---
>  include/aio.h                                 |  4 ++
>  rt/Makefile                                   |  2 +-
>  rt/Versions                                   |  6 ++-
>  rt/aio_suspend.c                              | 49 +++++++++++++++----
>  sysdeps/unix/sysv/linux/Versions              |  2 +-
>  sysdeps/unix/sysv/linux/aarch64/libc.abilist  |  4 ++
>  sysdeps/unix/sysv/linux/aarch64/librt.abilist |  2 -
>  sysdeps/unix/sysv/linux/alpha/libc.abilist    |  4 ++
>  sysdeps/unix/sysv/linux/alpha/librt.abilist   |  2 -
>  sysdeps/unix/sysv/linux/arc/libc.abilist      |  4 ++
>  sysdeps/unix/sysv/linux/arc/librt.abilist     |  2 -
>  sysdeps/unix/sysv/linux/arm/be/libc.abilist   |  5 ++
>  sysdeps/unix/sysv/linux/arm/be/librt.abilist  |  3 --
>  sysdeps/unix/sysv/linux/arm/le/libc.abilist   |  5 ++
>  sysdeps/unix/sysv/linux/arm/le/librt.abilist  |  3 --
>  sysdeps/unix/sysv/linux/csky/libc.abilist     |  5 ++
>  sysdeps/unix/sysv/linux/csky/librt.abilist    |  3 --
>  sysdeps/unix/sysv/linux/hppa/libc.abilist     |  5 ++
>  sysdeps/unix/sysv/linux/hppa/librt.abilist    |  3 --
>  sysdeps/unix/sysv/linux/i386/libc.abilist     |  5 ++
>  sysdeps/unix/sysv/linux/i386/librt.abilist    |  3 --
>  sysdeps/unix/sysv/linux/ia64/libc.abilist     |  4 ++
>  sysdeps/unix/sysv/linux/ia64/librt.abilist    |  2 -
>  .../sysv/linux/m68k/coldfire/libc.abilist     |  5 ++
>  .../sysv/linux/m68k/coldfire/librt.abilist    |  3 --
>  .../unix/sysv/linux/m68k/m680x0/libc.abilist  |  5 ++
>  .../unix/sysv/linux/m68k/m680x0/librt.abilist |  3 --
>  .../sysv/linux/microblaze/be/libc.abilist     |  5 ++
>  .../sysv/linux/microblaze/be/librt.abilist    |  3 --
>  .../sysv/linux/microblaze/le/libc.abilist     |  5 ++
>  .../sysv/linux/microblaze/le/librt.abilist    |  3 --
>  .../sysv/linux/mips/mips32/fpu/libc.abilist   |  5 ++
>  .../unix/sysv/linux/mips/mips32/librt.abilist |  3 --
>  .../sysv/linux/mips/mips32/nofpu/libc.abilist |  5 ++
>  .../sysv/linux/mips/mips64/n32/libc.abilist   |  5 ++
>  .../sysv/linux/mips/mips64/n32/librt.abilist  |  3 --
>  .../sysv/linux/mips/mips64/n64/libc.abilist   |  4 ++
>  .../sysv/linux/mips/mips64/n64/librt.abilist  |  2 -
>  sysdeps/unix/sysv/linux/nios2/libc.abilist    |  5 ++
>  sysdeps/unix/sysv/linux/nios2/librt.abilist   |  3 --
>  .../linux/powerpc/powerpc32/fpu/libc.abilist  |  5 ++
>  .../linux/powerpc/powerpc32/librt.abilist     |  3 --
>  .../powerpc/powerpc32/nofpu/libc.abilist      |  5 ++
>  .../linux/powerpc/powerpc64/be/libc.abilist   |  4 ++
>  .../linux/powerpc/powerpc64/be/librt.abilist  |  2 -
>  .../linux/powerpc/powerpc64/le/libc.abilist   |  4 ++
>  .../linux/powerpc/powerpc64/le/librt.abilist  |  2 -
>  .../unix/sysv/linux/riscv/rv32/libc.abilist   |  4 ++
>  .../unix/sysv/linux/riscv/rv32/librt.abilist  |  2 -
>  .../unix/sysv/linux/riscv/rv64/libc.abilist   |  4 ++
>  .../unix/sysv/linux/riscv/rv64/librt.abilist  |  2 -
>  .../unix/sysv/linux/s390/s390-32/libc.abilist |  5 ++
>  .../sysv/linux/s390/s390-32/librt.abilist     |  3 --
>  .../unix/sysv/linux/s390/s390-64/libc.abilist |  4 ++
>  .../sysv/linux/s390/s390-64/librt.abilist     |  2 -
>  sysdeps/unix/sysv/linux/sh/be/libc.abilist    |  5 ++
>  sysdeps/unix/sysv/linux/sh/be/librt.abilist   |  3 --
>  sysdeps/unix/sysv/linux/sh/le/libc.abilist    |  5 ++
>  sysdeps/unix/sysv/linux/sh/le/librt.abilist   |  3 --
>  .../sysv/linux/sparc/sparc32/libc.abilist     |  5 ++
>  .../sysv/linux/sparc/sparc32/librt.abilist    |  3 --
>  .../sysv/linux/sparc/sparc64/libc.abilist     |  4 ++
>  .../sysv/linux/sparc/sparc64/librt.abilist    |  2 -
>  .../unix/sysv/linux/x86_64/64/libc.abilist    |  4 ++
>  .../unix/sysv/linux/x86_64/64/librt.abilist   |  2 -
>  .../unix/sysv/linux/x86_64/x32/libc.abilist   |  4 ++
>  .../unix/sysv/linux/x86_64/x32/librt.abilist  |  2 -
>  67 files changed, 197 insertions(+), 90 deletions(-)
> 
> diff --git a/include/aio.h b/include/aio.h
> index c7f4233310..5d67800aff 100644
> --- a/include/aio.h
> +++ b/include/aio.h
> @@ -15,7 +15,11 @@ extern void __aio_init (const struct aioinit *__init);
>  # else
>  extern int __aio_suspend_time64 (const struct aiocb *const list[], int nent,
>                                   const struct __timespec64 *timeout);
> +#  if PTHREAD_IN_LIBC
> +libc_hidden_proto (__aio_suspend_time64)
> +#  else
>  librt_hidden_proto (__aio_suspend_time64)
> +#endif
>  # endif
>  #endif
>  

Ok.

> diff --git a/rt/Makefile b/rt/Makefile
> index 810599a736..b375d37ba2 100644
> --- a/rt/Makefile
> +++ b/rt/Makefile
> @@ -29,7 +29,6 @@ routines = \
>    shm_unlink \
>  
>  librt-routines = \
> -  aio_suspend \
>    aio_write \
>    aio_write64 \
>    librt-compat \
> @@ -63,6 +62,7 @@ $(librt-routines-var) += \
>    aio_read64 \
>    aio_return \
>    aio_sigqueue \
> +  aio_suspend \
>  
>  tests := tst-shm tst-timer tst-timer2 \
>  	 tst-aio tst-aio64 tst-aio2 tst-aio3 tst-aio4 tst-aio5 tst-aio6 \

Ok.

> diff --git a/rt/Versions b/rt/Versions
> index 0780dc8400..d54b9cc4bf 100644
> --- a/rt/Versions
> +++ b/rt/Versions
> @@ -12,6 +12,8 @@ libc {
>      aio_read64;
>      aio_return;
>      aio_return64;
> +    aio_suspend;
> +    aio_suspend64;
>  %endif
>    }
>    GLIBC_2.2 {
> @@ -31,6 +33,8 @@ libc {
>      aio_read64;
>      aio_return;
>      aio_return64;
> +    aio_suspend;
> +    aio_suspend64;
>  %endif
>      shm_open;
>      shm_unlink;
> @@ -63,9 +67,9 @@ librt {
>      aio_read64;
>      aio_return;
>      aio_return64;
> -%endif
>      aio_suspend;
>      aio_suspend64;
> +%endif
>      aio_write;
>      aio_write64;
>      lio_listio;

Ok.

> diff --git a/rt/aio_suspend.c b/rt/aio_suspend.c
> index 6fd5b1bee2..29f01d1023 100644
> --- a/rt/aio_suspend.c
> +++ b/rt/aio_suspend.c
> @@ -36,6 +36,8 @@
>  
>  #include <libc-lock.h>
>  #include <aio_misc.h>
> +#include <pthreadP.h>
> +#include <shlib-compat.h>
>  
>  
>  struct clparam
> @@ -56,7 +58,7 @@ cleanup (void *arg)
>  #ifdef DONT_NEED_AIO_MISC_COND
>    /* Acquire the mutex.  If pthread_cond_*wait is used this would
>       happen implicitly.  */
> -  pthread_mutex_lock (&__aio_requests_mutex);
> +  __pthread_mutex_lock (&__aio_requests_mutex);
>  #endif
>  
>    const struct clparam *param = (const struct clparam *) arg;
> @@ -88,7 +90,7 @@ cleanup (void *arg)
>  #endif
>  
>    /* Release the mutex.  */
> -  pthread_mutex_unlock (&__aio_requests_mutex);
> +  __pthread_mutex_unlock (&__aio_requests_mutex);
>  }
>  
>  #ifdef DONT_NEED_AIO_MISC_COND
> @@ -105,7 +107,7 @@ do_aio_misc_wait (unsigned int *cntr, const struct __timespec64 *timeout)
>  #endif
>  
>  int
> -__aio_suspend_time64 (const struct aiocb *const list[], int nent,
> +___aio_suspend_time64 (const struct aiocb *const list[], int nent,
>  		      const struct __timespec64 *timeout)
>  {
>    if (__glibc_unlikely (nent < 0))
> @@ -125,7 +127,7 @@ __aio_suspend_time64 (const struct aiocb *const list[], int nent,
>    unsigned int cntr = 1;
>  
>    /* Request the mutex.  */
> -  pthread_mutex_lock (&__aio_requests_mutex);
> +  __pthread_mutex_lock (&__aio_requests_mutex);
>  
>    /* There is not yet a finished request.  Signal the request that
>       we are working for it.  */
> @@ -184,7 +186,11 @@ __aio_suspend_time64 (const struct aiocb *const list[], int nent,
>  	  .nent = nent
>  	};
>  
> -      pthread_cleanup_push (cleanup, &clparam);
> +#if PTHREAD_IN_LIBC
> +      __libc_cleanup_region_start (1, cleanup, &clparam);
> +#else
> +      __pthread_cleanup_push (cleanup, &clparam);
> +#endif
>  
>  #ifdef DONT_NEED_AIO_MISC_COND
>        result = do_aio_misc_wait (&cntr, timeout == NULL ? NULL : &ts);
> @@ -194,7 +200,11 @@ __aio_suspend_time64 (const struct aiocb *const list[], int nent,
>  				       timeout == NULL ? NULL : &ts32);
>  #endif
>  
> +#if PTHREAD_IN_LIBC
> +      __libc_cleanup_region_end (0);
> +#else
>        pthread_cleanup_pop (0);
> +#endif
>      }
>  

Ok.  What prevents to use __libc_cleanup_region_start on Hurd as well here?

>    /* Now remove the entry in the waiting list for all requests
> @@ -239,13 +249,22 @@ __aio_suspend_time64 (const struct aiocb *const list[], int nent,
>      }
>  
>    /* Release the mutex.  */
> -  pthread_mutex_unlock (&__aio_requests_mutex);
> +  __pthread_mutex_unlock (&__aio_requests_mutex);
>  
>    return result;
>  }
>  
> -#if __TIMESIZE != 64
> -librt_hidden_def (__aio_suspend_time64)
> +#if __TIMESIZE == 64
> +strong_alias (___aio_suspend_time64, __aio_suspend)
> +#else /* __TIMESIZE != 64 */
> +# if PTHREAD_IN_LIBC
> +libc_hidden_ver (___aio_suspend_time64, __aio_suspend_time64)
> +/* The conditional is slightly wrong: PTHREAD_IN_LIBC is a stand-in
> +   for whether time64 support is needed.  */
> +versioned_symbol (libc, ___aio_suspend_time64, __aio_suspend_time64, GLIBC_2_34);
> +# else
> +librt_hidden_ver (___aio_suspend_time64, __aio_suspend_time64)
> +# endif
>  
>  int
>  __aio_suspend (const struct aiocb *const list[], int nent,
> @@ -258,6 +277,16 @@ __aio_suspend (const struct aiocb *const list[], int nent,
>  
>    return __aio_suspend_time64 (list, nent, timeout != NULL ? &ts64 : NULL);
>  }
> -#endif
> +#endif /* __TIMESPEC64 != 64 */
> +
> +#if PTHREAD_IN_LIBC
> +versioned_symbol (libc, __aio_suspend, aio_suspend, GLIBC_2_34);
> +versioned_symbol (libc, __aio_suspend, aio_suspend64, GLIBC_2_34);
> +# if OTHER_SHLIB_COMPAT (librt, GLIBC_2_1, GLIBC_2_34)
> +compat_symbol (librt, __aio_suspend, aio_suspend, GLIBC_2_1);
> +compat_symbol (librt, __aio_suspend, aio_suspend64, GLIBC_2_1);
> +# endif
> +#else /* !PTHREAD_IN_LIBC */
>  weak_alias (__aio_suspend, aio_suspend)
> -weak_alias (aio_suspend, aio_suspend64)
> +weak_alias (__aio_suspend, aio_suspend64)
> +#endif /* !PTHREAD_IN_LIBC */

Ok.

> diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions
> index ea0b22d7af..f246a389e1 100644
> --- a/sysdeps/unix/sysv/linux/Versions
> +++ b/sysdeps/unix/sysv/linux/Versions
> @@ -192,6 +192,7 @@ libc {
>      # 64-bit time_t support
>      __adjtime64;
>      ___adjtimex64;
> +    __aio_suspend_time64;
>      __clock_adjtime64;
>      __clock_getres64;
>      __clock_gettime64;
> @@ -294,7 +295,6 @@ librt {
>    GLIBC_2.34 {
>  %ifdef TIME64_NON_DEFAULT
>      # 64-bit time_t support
> -    __aio_suspend_time64;
>      __mq_timedsend_time64;
>      __mq_timedreceive_time64;
>      __timer_gettime64;

Ok.

> diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> index 79405d26e9..6c76d0df61 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> @@ -600,6 +600,8 @@ GLIBC_2.17 aio_read F
>  GLIBC_2.17 aio_read64 F
>  GLIBC_2.17 aio_return F
>  GLIBC_2.17 aio_return64 F
> +GLIBC_2.17 aio_suspend F
> +GLIBC_2.17 aio_suspend64 F
>  GLIBC_2.17 alarm F
>  GLIBC_2.17 aligned_alloc F
>  GLIBC_2.17 alphasort F
> @@ -2370,6 +2372,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/aarch64/librt.abilist b/sysdeps/unix/sysv/linux/aarch64/librt.abilist
> index 451560dc87..37ff014ed8 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/librt.abilist
> @@ -1,6 +1,4 @@
>  GLIBC_2.17 __mq_open_2 F
> -GLIBC_2.17 aio_suspend F
> -GLIBC_2.17 aio_suspend64 F
>  GLIBC_2.17 aio_write F
>  GLIBC_2.17 aio_write64 F
>  GLIBC_2.17 lio_listio F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
> index f6fa8966f8..e7f0e1b49a 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
> @@ -1513,6 +1513,8 @@ GLIBC_2.1 aio_read F
>  GLIBC_2.1 aio_read64 F
>  GLIBC_2.1 aio_return F
>  GLIBC_2.1 aio_return64 F
> +GLIBC_2.1 aio_suspend F
> +GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 alphasort64 F
>  GLIBC_2.1 argp_err_exit_status D 0x4
>  GLIBC_2.1 argp_error F
> @@ -2465,6 +2467,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/alpha/librt.abilist b/sysdeps/unix/sysv/linux/alpha/librt.abilist
> index 90a66e4a4b..8a8fe654e0 100644
> --- a/sysdeps/unix/sysv/linux/alpha/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/librt.abilist
> @@ -1,5 +1,3 @@
> -GLIBC_2.1 aio_suspend F
> -GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 aio_write F
>  GLIBC_2.1 aio_write64 F
>  GLIBC_2.1 lio_listio F
> diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
> index a5c1df7eaf..cf93d14e6f 100644
> --- a/sysdeps/unix/sysv/linux/arc/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
> @@ -561,6 +561,8 @@ GLIBC_2.32 aio_read F
>  GLIBC_2.32 aio_read64 F
>  GLIBC_2.32 aio_return F
>  GLIBC_2.32 aio_return64 F
> +GLIBC_2.32 aio_suspend F
> +GLIBC_2.32 aio_suspend64 F
>  GLIBC_2.32 alarm F
>  GLIBC_2.32 aligned_alloc F
>  GLIBC_2.32 alphasort F
> @@ -2129,6 +2131,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/arc/librt.abilist b/sysdeps/unix/sysv/linux/arc/librt.abilist
> index 9cac9c759b..4eb7de36e1 100644
> --- a/sysdeps/unix/sysv/linux/arc/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/arc/librt.abilist
> @@ -1,6 +1,4 @@
>  GLIBC_2.32 __mq_open_2 F
> -GLIBC_2.32 aio_suspend F
> -GLIBC_2.32 aio_suspend64 F
>  GLIBC_2.32 aio_write F
>  GLIBC_2.32 aio_write64 F
>  GLIBC_2.32 lio_listio F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> index 1928717cfd..9d9e4c6b73 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> @@ -192,6 +192,7 @@ GLIBC_2.33 stat F
>  GLIBC_2.33 stat64 F
>  GLIBC_2.34 ___adjtimex64 F
>  GLIBC_2.34 __adjtime64 F
> +GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __clock_adjtime64 F
>  GLIBC_2.34 __clock_getres64 F
>  GLIBC_2.34 __clock_gettime64 F
> @@ -289,6 +290,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> @@ -1003,6 +1006,8 @@ GLIBC_2.4 aio_read F
>  GLIBC_2.4 aio_read64 F
>  GLIBC_2.4 aio_return F
>  GLIBC_2.4 aio_return64 F
> +GLIBC_2.4 aio_suspend F
> +GLIBC_2.4 aio_suspend64 F
>  GLIBC_2.4 alarm F
>  GLIBC_2.4 alphasort F
>  GLIBC_2.4 alphasort64 F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/librt.abilist b/sysdeps/unix/sysv/linux/arm/be/librt.abilist
> index 05957aae03..7cb476c7b4 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/librt.abilist
> @@ -1,10 +1,7 @@
> -GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __mq_timedreceive_time64 F
>  GLIBC_2.34 __mq_timedsend_time64 F
>  GLIBC_2.34 __timer_gettime64 F
>  GLIBC_2.34 __timer_settime64 F
> -GLIBC_2.4 aio_suspend F
> -GLIBC_2.4 aio_suspend64 F
>  GLIBC_2.4 aio_write F
>  GLIBC_2.4 aio_write64 F
>  GLIBC_2.4 lio_listio F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> index bee5d9f757..a195587b66 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> @@ -189,6 +189,7 @@ GLIBC_2.33 stat F
>  GLIBC_2.33 stat64 F
>  GLIBC_2.34 ___adjtimex64 F
>  GLIBC_2.34 __adjtime64 F
> +GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __clock_adjtime64 F
>  GLIBC_2.34 __clock_getres64 F
>  GLIBC_2.34 __clock_gettime64 F
> @@ -286,6 +287,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> @@ -1000,6 +1003,8 @@ GLIBC_2.4 aio_read F
>  GLIBC_2.4 aio_read64 F
>  GLIBC_2.4 aio_return F
>  GLIBC_2.4 aio_return64 F
> +GLIBC_2.4 aio_suspend F
> +GLIBC_2.4 aio_suspend64 F
>  GLIBC_2.4 alarm F
>  GLIBC_2.4 alphasort F
>  GLIBC_2.4 alphasort64 F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/librt.abilist b/sysdeps/unix/sysv/linux/arm/le/librt.abilist
> index 05957aae03..7cb476c7b4 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/librt.abilist
> @@ -1,10 +1,7 @@
> -GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __mq_timedreceive_time64 F
>  GLIBC_2.34 __mq_timedsend_time64 F
>  GLIBC_2.34 __timer_gettime64 F
>  GLIBC_2.34 __timer_settime64 F
> -GLIBC_2.4 aio_suspend F
> -GLIBC_2.4 aio_suspend64 F
>  GLIBC_2.4 aio_write F
>  GLIBC_2.4 aio_write64 F
>  GLIBC_2.4 lio_listio F
> diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist
> index 753f54085a..1e3c73aa2d 100644
> --- a/sysdeps/unix/sysv/linux/csky/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libc.abilist
> @@ -575,6 +575,8 @@ GLIBC_2.29 aio_read F
>  GLIBC_2.29 aio_read64 F
>  GLIBC_2.29 aio_return F
>  GLIBC_2.29 aio_return64 F
> +GLIBC_2.29 aio_suspend F
> +GLIBC_2.29 aio_suspend64 F
>  GLIBC_2.29 alarm F
>  GLIBC_2.29 aligned_alloc F
>  GLIBC_2.29 alphasort F
> @@ -2292,6 +2294,7 @@ GLIBC_2.33 stat F
>  GLIBC_2.33 stat64 F
>  GLIBC_2.34 ___adjtimex64 F
>  GLIBC_2.34 __adjtime64 F
> +GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __clock_adjtime64 F
>  GLIBC_2.34 __clock_getres64 F
>  GLIBC_2.34 __clock_gettime64 F
> @@ -2389,6 +2392,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/csky/librt.abilist b/sysdeps/unix/sysv/linux/csky/librt.abilist
> index 74fc5621d6..fcc993f16f 100644
> --- a/sysdeps/unix/sysv/linux/csky/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/librt.abilist
> @@ -1,6 +1,4 @@
>  GLIBC_2.29 __mq_open_2 F
> -GLIBC_2.29 aio_suspend F
> -GLIBC_2.29 aio_suspend64 F
>  GLIBC_2.29 aio_write F
>  GLIBC_2.29 aio_write64 F
>  GLIBC_2.29 lio_listio F
> @@ -20,7 +18,6 @@ GLIBC_2.29 timer_delete F
>  GLIBC_2.29 timer_getoverrun F
>  GLIBC_2.29 timer_gettime F
>  GLIBC_2.29 timer_settime F
> -GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __mq_timedreceive_time64 F
>  GLIBC_2.34 __mq_timedsend_time64 F
>  GLIBC_2.34 __timer_gettime64 F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
> index 4a96fcfb39..3e0ff7575e 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
> @@ -14,6 +14,8 @@ GLIBC_2.1 aio_read F
>  GLIBC_2.1 aio_read64 F
>  GLIBC_2.1 aio_return F
>  GLIBC_2.1 aio_return64 F
> +GLIBC_2.1 aio_suspend F
> +GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 dlopen F
>  GLIBC_2.1 dlvsym F
>  GLIBC_2.10 __cxa_at_quick_exit F
> @@ -2246,6 +2248,7 @@ GLIBC_2.33 stat F
>  GLIBC_2.33 stat64 F
>  GLIBC_2.34 ___adjtimex64 F
>  GLIBC_2.34 __adjtime64 F
> +GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __clock_adjtime64 F
>  GLIBC_2.34 __clock_getres64 F
>  GLIBC_2.34 __clock_gettime64 F
> @@ -2343,6 +2346,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/hppa/librt.abilist b/sysdeps/unix/sysv/linux/hppa/librt.abilist
> index 4cae24e768..b9b9b71dba 100644
> --- a/sysdeps/unix/sysv/linux/hppa/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/librt.abilist
> @@ -1,5 +1,3 @@
> -GLIBC_2.1 aio_suspend F
> -GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 aio_write F
>  GLIBC_2.1 aio_write64 F
>  GLIBC_2.1 lio_listio F
> @@ -19,7 +17,6 @@ GLIBC_2.3.4 mq_setattr F
>  GLIBC_2.3.4 mq_timedreceive F
>  GLIBC_2.3.4 mq_timedsend F
>  GLIBC_2.3.4 mq_unlink F
> -GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __mq_timedreceive_time64 F
>  GLIBC_2.34 __mq_timedsend_time64 F
>  GLIBC_2.34 __timer_gettime64 F
> diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
> index b704bf4756..54b5ee4649 100644
> --- a/sysdeps/unix/sysv/linux/i386/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
> @@ -1486,6 +1486,8 @@ GLIBC_2.1 aio_read F
>  GLIBC_2.1 aio_read64 F
>  GLIBC_2.1 aio_return F
>  GLIBC_2.1 aio_return64 F
> +GLIBC_2.1 aio_suspend F
> +GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 alphasort64 F
>  GLIBC_2.1 argp_err_exit_status D 0x4
>  GLIBC_2.1 argp_error F
> @@ -2429,6 +2431,7 @@ GLIBC_2.33 stat F
>  GLIBC_2.33 stat64 F
>  GLIBC_2.34 ___adjtimex64 F
>  GLIBC_2.34 __adjtime64 F
> +GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __clock_adjtime64 F
>  GLIBC_2.34 __clock_getres64 F
>  GLIBC_2.34 __clock_gettime64 F
> @@ -2527,6 +2530,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/i386/librt.abilist b/sysdeps/unix/sysv/linux/i386/librt.abilist
> index 4cae24e768..b9b9b71dba 100644
> --- a/sysdeps/unix/sysv/linux/i386/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/librt.abilist
> @@ -1,5 +1,3 @@
> -GLIBC_2.1 aio_suspend F
> -GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 aio_write F
>  GLIBC_2.1 aio_write64 F
>  GLIBC_2.1 lio_listio F
> @@ -19,7 +17,6 @@ GLIBC_2.3.4 mq_setattr F
>  GLIBC_2.3.4 mq_timedreceive F
>  GLIBC_2.3.4 mq_timedsend F
>  GLIBC_2.3.4 mq_unlink F
> -GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __mq_timedreceive_time64 F
>  GLIBC_2.34 __mq_timedsend_time64 F
>  GLIBC_2.34 __timer_gettime64 F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
> index 08bea0c72f..9aac5c8ff4 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
> @@ -14,6 +14,8 @@ GLIBC_2.1 aio_read F
>  GLIBC_2.1 aio_read64 F
>  GLIBC_2.1 aio_return F
>  GLIBC_2.1 aio_return64 F
> +GLIBC_2.1 aio_suspend F
> +GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 dlopen F
>  GLIBC_2.1 dlvsym F
>  GLIBC_2.10 __cxa_at_quick_exit F
> @@ -2303,6 +2305,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/ia64/librt.abilist b/sysdeps/unix/sysv/linux/ia64/librt.abilist
> index ac9f293b6b..67435f760c 100644
> --- a/sysdeps/unix/sysv/linux/ia64/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/librt.abilist
> @@ -1,5 +1,3 @@
> -GLIBC_2.1 aio_suspend F
> -GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 aio_write F
>  GLIBC_2.1 aio_write64 F
>  GLIBC_2.1 lio_listio F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> index 187672fa76..87baa69dfe 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> @@ -193,6 +193,7 @@ GLIBC_2.33 stat F
>  GLIBC_2.33 stat64 F
>  GLIBC_2.34 ___adjtimex64 F
>  GLIBC_2.34 __adjtime64 F
> +GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __clock_adjtime64 F
>  GLIBC_2.34 __clock_getres64 F
>  GLIBC_2.34 __clock_gettime64 F
> @@ -290,6 +291,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> @@ -991,6 +994,8 @@ GLIBC_2.4 aio_read F
>  GLIBC_2.4 aio_read64 F
>  GLIBC_2.4 aio_return F
>  GLIBC_2.4 aio_return64 F
> +GLIBC_2.4 aio_suspend F
> +GLIBC_2.4 aio_suspend64 F
>  GLIBC_2.4 alarm F
>  GLIBC_2.4 alphasort F
>  GLIBC_2.4 alphasort64 F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist
> index 05957aae03..7cb476c7b4 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist
> @@ -1,10 +1,7 @@
> -GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __mq_timedreceive_time64 F
>  GLIBC_2.34 __mq_timedsend_time64 F
>  GLIBC_2.34 __timer_gettime64 F
>  GLIBC_2.34 __timer_settime64 F
> -GLIBC_2.4 aio_suspend F
> -GLIBC_2.4 aio_suspend64 F
>  GLIBC_2.4 aio_write F
>  GLIBC_2.4 aio_write64 F
>  GLIBC_2.4 lio_listio F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> index 379779793c..68aa865da4 100644
> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> @@ -1484,6 +1484,8 @@ GLIBC_2.1 aio_read F
>  GLIBC_2.1 aio_read64 F
>  GLIBC_2.1 aio_return F
>  GLIBC_2.1 aio_return64 F
> +GLIBC_2.1 aio_suspend F
> +GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 alphasort64 F
>  GLIBC_2.1 argp_err_exit_status D 0x4
>  GLIBC_2.1 argp_error F
> @@ -2373,6 +2375,7 @@ GLIBC_2.33 stat F
>  GLIBC_2.33 stat64 F
>  GLIBC_2.34 ___adjtimex64 F
>  GLIBC_2.34 __adjtime64 F
> +GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __clock_adjtime64 F
>  GLIBC_2.34 __clock_getres64 F
>  GLIBC_2.34 __clock_gettime64 F
> @@ -2470,6 +2473,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/librt.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/librt.abilist
> index 4cae24e768..b9b9b71dba 100644
> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/librt.abilist
> @@ -1,5 +1,3 @@
> -GLIBC_2.1 aio_suspend F
> -GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 aio_write F
>  GLIBC_2.1 aio_write64 F
>  GLIBC_2.1 lio_listio F
> @@ -19,7 +17,6 @@ GLIBC_2.3.4 mq_setattr F
>  GLIBC_2.3.4 mq_timedreceive F
>  GLIBC_2.3.4 mq_timedsend F
>  GLIBC_2.3.4 mq_unlink F
> -GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __mq_timedreceive_time64 F
>  GLIBC_2.34 __mq_timedsend_time64 F
>  GLIBC_2.34 __timer_gettime64 F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> index 2fce5d9138..19aef593f3 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> @@ -602,6 +602,8 @@ GLIBC_2.18 aio_read F
>  GLIBC_2.18 aio_read64 F
>  GLIBC_2.18 aio_return F
>  GLIBC_2.18 aio_return64 F
> +GLIBC_2.18 aio_suspend F
> +GLIBC_2.18 aio_suspend64 F
>  GLIBC_2.18 alarm F
>  GLIBC_2.18 aligned_alloc F
>  GLIBC_2.18 alphasort F
> @@ -2343,6 +2345,7 @@ GLIBC_2.33 stat F
>  GLIBC_2.33 stat64 F
>  GLIBC_2.34 ___adjtimex64 F
>  GLIBC_2.34 __adjtime64 F
> +GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __clock_adjtime64 F
>  GLIBC_2.34 __clock_getres64 F
>  GLIBC_2.34 __clock_gettime64 F
> @@ -2440,6 +2443,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/librt.abilist b/sysdeps/unix/sysv/linux/microblaze/be/librt.abilist
> index 1503d19eae..06e862de52 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/librt.abilist
> @@ -1,6 +1,4 @@
>  GLIBC_2.18 __mq_open_2 F
> -GLIBC_2.18 aio_suspend F
> -GLIBC_2.18 aio_suspend64 F
>  GLIBC_2.18 aio_write F
>  GLIBC_2.18 aio_write64 F
>  GLIBC_2.18 lio_listio F
> @@ -20,7 +18,6 @@ GLIBC_2.18 timer_delete F
>  GLIBC_2.18 timer_getoverrun F
>  GLIBC_2.18 timer_gettime F
>  GLIBC_2.18 timer_settime F
> -GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __mq_timedreceive_time64 F
>  GLIBC_2.34 __mq_timedsend_time64 F
>  GLIBC_2.34 __timer_gettime64 F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> index 6c3cd2a9e3..d5f26a2d9b 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> @@ -602,6 +602,8 @@ GLIBC_2.18 aio_read F
>  GLIBC_2.18 aio_read64 F
>  GLIBC_2.18 aio_return F
>  GLIBC_2.18 aio_return64 F
> +GLIBC_2.18 aio_suspend F
> +GLIBC_2.18 aio_suspend64 F
>  GLIBC_2.18 alarm F
>  GLIBC_2.18 aligned_alloc F
>  GLIBC_2.18 alphasort F
> @@ -2340,6 +2342,7 @@ GLIBC_2.33 stat F
>  GLIBC_2.33 stat64 F
>  GLIBC_2.34 ___adjtimex64 F
>  GLIBC_2.34 __adjtime64 F
> +GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __clock_adjtime64 F
>  GLIBC_2.34 __clock_getres64 F
>  GLIBC_2.34 __clock_gettime64 F
> @@ -2437,6 +2440,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/librt.abilist b/sysdeps/unix/sysv/linux/microblaze/le/librt.abilist
> index 1503d19eae..06e862de52 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/librt.abilist
> @@ -1,6 +1,4 @@
>  GLIBC_2.18 __mq_open_2 F
> -GLIBC_2.18 aio_suspend F
> -GLIBC_2.18 aio_suspend64 F
>  GLIBC_2.18 aio_write F
>  GLIBC_2.18 aio_write64 F
>  GLIBC_2.18 lio_listio F
> @@ -20,7 +18,6 @@ GLIBC_2.18 timer_delete F
>  GLIBC_2.18 timer_getoverrun F
>  GLIBC_2.18 timer_gettime F
>  GLIBC_2.18 timer_settime F
> -GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __mq_timedreceive_time64 F
>  GLIBC_2.34 __mq_timedsend_time64 F
>  GLIBC_2.34 __timer_gettime64 F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> index 46aa64baaa..ba77980ef8 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> @@ -1662,6 +1662,8 @@ GLIBC_2.2 aio_read F
>  GLIBC_2.2 aio_read64 F
>  GLIBC_2.2 aio_return F
>  GLIBC_2.2 aio_return64 F
> +GLIBC_2.2 aio_suspend F
> +GLIBC_2.2 aio_suspend64 F
>  GLIBC_2.2 alphasort64 F
>  GLIBC_2.2 argp_err_exit_status D 0x4
>  GLIBC_2.2 argp_error F
> @@ -2338,6 +2340,7 @@ GLIBC_2.33 stat F
>  GLIBC_2.33 stat64 F
>  GLIBC_2.34 ___adjtimex64 F
>  GLIBC_2.34 __adjtime64 F
> +GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __clock_adjtime64 F
>  GLIBC_2.34 __clock_getres64 F
>  GLIBC_2.34 __clock_gettime64 F
> @@ -2435,6 +2438,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/librt.abilist b/sysdeps/unix/sysv/linux/mips/mips32/librt.abilist
> index 2b7c3cabec..0a07f87ce9 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/librt.abilist
> @@ -1,5 +1,3 @@
> -GLIBC_2.2 aio_suspend F
> -GLIBC_2.2 aio_suspend64 F
>  GLIBC_2.2 aio_write F
>  GLIBC_2.2 aio_write64 F
>  GLIBC_2.2 lio_listio F
> @@ -19,7 +17,6 @@ GLIBC_2.3.4 mq_setattr F
>  GLIBC_2.3.4 mq_timedreceive F
>  GLIBC_2.3.4 mq_timedsend F
>  GLIBC_2.3.4 mq_unlink F
> -GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __mq_timedreceive_time64 F
>  GLIBC_2.34 __mq_timedsend_time64 F
>  GLIBC_2.34 __timer_gettime64 F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> index 169b386cc1..1e6c7a1eb3 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> @@ -1660,6 +1660,8 @@ GLIBC_2.2 aio_read F
>  GLIBC_2.2 aio_read64 F
>  GLIBC_2.2 aio_return F
>  GLIBC_2.2 aio_return64 F
> +GLIBC_2.2 aio_suspend F
> +GLIBC_2.2 aio_suspend64 F
>  GLIBC_2.2 alphasort64 F
>  GLIBC_2.2 argp_err_exit_status D 0x4
>  GLIBC_2.2 argp_error F
> @@ -2336,6 +2338,7 @@ GLIBC_2.33 stat F
>  GLIBC_2.33 stat64 F
>  GLIBC_2.34 ___adjtimex64 F
>  GLIBC_2.34 __adjtime64 F
> +GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __clock_adjtime64 F
>  GLIBC_2.34 __clock_getres64 F
>  GLIBC_2.34 __clock_gettime64 F
> @@ -2433,6 +2436,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> index ad52c15c3e..fd731ffed0 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> @@ -1661,6 +1661,8 @@ GLIBC_2.2 aio_read F
>  GLIBC_2.2 aio_read64 F
>  GLIBC_2.2 aio_return F
>  GLIBC_2.2 aio_return64 F
> +GLIBC_2.2 aio_suspend F
> +GLIBC_2.2 aio_suspend64 F
>  GLIBC_2.2 alphasort64 F
>  GLIBC_2.2 argp_err_exit_status D 0x4
>  GLIBC_2.2 argp_error F
> @@ -2344,6 +2346,7 @@ GLIBC_2.33 stat F
>  GLIBC_2.33 stat64 F
>  GLIBC_2.34 ___adjtimex64 F
>  GLIBC_2.34 __adjtime64 F
> +GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __clock_adjtime64 F
>  GLIBC_2.34 __clock_getres64 F
>  GLIBC_2.34 __clock_gettime64 F
> @@ -2441,6 +2444,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/librt.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/librt.abilist
> index 2b7c3cabec..0a07f87ce9 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/librt.abilist
> @@ -1,5 +1,3 @@
> -GLIBC_2.2 aio_suspend F
> -GLIBC_2.2 aio_suspend64 F
>  GLIBC_2.2 aio_write F
>  GLIBC_2.2 aio_write64 F
>  GLIBC_2.2 lio_listio F
> @@ -19,7 +17,6 @@ GLIBC_2.3.4 mq_setattr F
>  GLIBC_2.3.4 mq_timedreceive F
>  GLIBC_2.3.4 mq_timedsend F
>  GLIBC_2.3.4 mq_unlink F
> -GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __mq_timedreceive_time64 F
>  GLIBC_2.34 __mq_timedsend_time64 F
>  GLIBC_2.34 __timer_gettime64 F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> index 16a67a0d6d..9f82375689 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> @@ -1657,6 +1657,8 @@ GLIBC_2.2 aio_read F
>  GLIBC_2.2 aio_read64 F
>  GLIBC_2.2 aio_return F
>  GLIBC_2.2 aio_return64 F
> +GLIBC_2.2 aio_suspend F
> +GLIBC_2.2 aio_suspend64 F
>  GLIBC_2.2 alphasort64 F
>  GLIBC_2.2 argp_err_exit_status D 0x4
>  GLIBC_2.2 argp_error F
> @@ -2359,6 +2361,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/librt.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/librt.abilist
> index 293b92eaec..7d7be4d9ec 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/librt.abilist
> @@ -1,5 +1,3 @@
> -GLIBC_2.2 aio_suspend F
> -GLIBC_2.2 aio_suspend64 F
>  GLIBC_2.2 aio_write F
>  GLIBC_2.2 aio_write64 F
>  GLIBC_2.2 lio_listio F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
> index 3567fa8efc..77a0544dbf 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
> @@ -644,6 +644,8 @@ GLIBC_2.21 aio_read F
>  GLIBC_2.21 aio_read64 F
>  GLIBC_2.21 aio_return F
>  GLIBC_2.21 aio_return64 F
> +GLIBC_2.21 aio_suspend F
> +GLIBC_2.21 aio_suspend64 F
>  GLIBC_2.21 alarm F
>  GLIBC_2.21 aligned_alloc F
>  GLIBC_2.21 alphasort F
> @@ -2382,6 +2384,7 @@ GLIBC_2.33 stat F
>  GLIBC_2.33 stat64 F
>  GLIBC_2.34 ___adjtimex64 F
>  GLIBC_2.34 __adjtime64 F
> +GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __clock_adjtime64 F
>  GLIBC_2.34 __clock_getres64 F
>  GLIBC_2.34 __clock_gettime64 F
> @@ -2479,6 +2482,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/nios2/librt.abilist b/sysdeps/unix/sysv/linux/nios2/librt.abilist
> index b63036c526..0db5142065 100644
> --- a/sysdeps/unix/sysv/linux/nios2/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/librt.abilist
> @@ -1,6 +1,4 @@
>  GLIBC_2.21 __mq_open_2 F
> -GLIBC_2.21 aio_suspend F
> -GLIBC_2.21 aio_suspend64 F
>  GLIBC_2.21 aio_write F
>  GLIBC_2.21 aio_write64 F
>  GLIBC_2.21 lio_listio F
> @@ -20,7 +18,6 @@ GLIBC_2.21 timer_delete F
>  GLIBC_2.21 timer_getoverrun F
>  GLIBC_2.21 timer_gettime F
>  GLIBC_2.21 timer_settime F
> -GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __mq_timedreceive_time64 F
>  GLIBC_2.34 __mq_timedsend_time64 F
>  GLIBC_2.34 __timer_gettime64 F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> index 0b393c0a5a..ed6f66c610 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> @@ -1491,6 +1491,8 @@ GLIBC_2.1 aio_read F
>  GLIBC_2.1 aio_read64 F
>  GLIBC_2.1 aio_return F
>  GLIBC_2.1 aio_return64 F
> +GLIBC_2.1 aio_suspend F
> +GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 alphasort64 F
>  GLIBC_2.1 argp_err_exit_status D 0x4
>  GLIBC_2.1 argp_error F
> @@ -2400,6 +2402,7 @@ GLIBC_2.33 stat F
>  GLIBC_2.33 stat64 F
>  GLIBC_2.34 ___adjtimex64 F
>  GLIBC_2.34 __adjtime64 F
> +GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __clock_adjtime64 F
>  GLIBC_2.34 __clock_getres64 F
>  GLIBC_2.34 __clock_gettime64 F
> @@ -2497,6 +2500,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist
> index 4cae24e768..b9b9b71dba 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist
> @@ -1,5 +1,3 @@
> -GLIBC_2.1 aio_suspend F
> -GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 aio_write F
>  GLIBC_2.1 aio_write64 F
>  GLIBC_2.1 lio_listio F
> @@ -19,7 +17,6 @@ GLIBC_2.3.4 mq_setattr F
>  GLIBC_2.3.4 mq_timedreceive F
>  GLIBC_2.3.4 mq_timedsend F
>  GLIBC_2.3.4 mq_unlink F
> -GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __mq_timedreceive_time64 F
>  GLIBC_2.34 __mq_timedsend_time64 F
>  GLIBC_2.34 __timer_gettime64 F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> index 0bc73512d3..817530d12f 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> @@ -1491,6 +1491,8 @@ GLIBC_2.1 aio_read F
>  GLIBC_2.1 aio_read64 F
>  GLIBC_2.1 aio_return F
>  GLIBC_2.1 aio_return64 F
> +GLIBC_2.1 aio_suspend F
> +GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 alphasort64 F
>  GLIBC_2.1 argp_err_exit_status D 0x4
>  GLIBC_2.1 argp_error F
> @@ -2433,6 +2435,7 @@ GLIBC_2.33 stat F
>  GLIBC_2.33 stat64 F
>  GLIBC_2.34 ___adjtimex64 F
>  GLIBC_2.34 __adjtime64 F
> +GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __clock_adjtime64 F
>  GLIBC_2.34 __clock_getres64 F
>  GLIBC_2.34 __clock_gettime64 F
> @@ -2530,6 +2533,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> index 22d277a32e..40a27cfd26 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> @@ -644,6 +644,8 @@ GLIBC_2.3 aio_read F
>  GLIBC_2.3 aio_read64 F
>  GLIBC_2.3 aio_return F
>  GLIBC_2.3 aio_return64 F
> +GLIBC_2.3 aio_suspend F
> +GLIBC_2.3 aio_suspend64 F
>  GLIBC_2.3 alarm F
>  GLIBC_2.3 alphasort F
>  GLIBC_2.3 alphasort64 F
> @@ -2267,6 +2269,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/librt.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/librt.abilist
> index b98e7cf9de..205c9536b4 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/librt.abilist
> @@ -1,5 +1,3 @@
> -GLIBC_2.3 aio_suspend F
> -GLIBC_2.3 aio_suspend64 F
>  GLIBC_2.3 aio_write F
>  GLIBC_2.3 aio_write64 F
>  GLIBC_2.3 lio_listio F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> index 15b0f5e367..208096bebf 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> @@ -688,6 +688,8 @@ GLIBC_2.17 aio_read F
>  GLIBC_2.17 aio_read64 F
>  GLIBC_2.17 aio_return F
>  GLIBC_2.17 aio_return64 F
> +GLIBC_2.17 aio_suspend F
> +GLIBC_2.17 aio_suspend64 F
>  GLIBC_2.17 alarm F
>  GLIBC_2.17 aligned_alloc F
>  GLIBC_2.17 alphasort F
> @@ -2566,6 +2568,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/librt.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/librt.abilist
> index 451560dc87..37ff014ed8 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/librt.abilist
> @@ -1,6 +1,4 @@
>  GLIBC_2.17 __mq_open_2 F
> -GLIBC_2.17 aio_suspend F
> -GLIBC_2.17 aio_suspend64 F
>  GLIBC_2.17 aio_write F
>  GLIBC_2.17 aio_write64 F
>  GLIBC_2.17 lio_listio F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> index 6003434931..20b4b7c0ad 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> @@ -555,6 +555,8 @@ GLIBC_2.33 aio_read F
>  GLIBC_2.33 aio_read64 F
>  GLIBC_2.33 aio_return F
>  GLIBC_2.33 aio_return64 F
> +GLIBC_2.33 aio_suspend F
> +GLIBC_2.33 aio_suspend64 F
>  GLIBC_2.33 alarm F
>  GLIBC_2.33 aligned_alloc F
>  GLIBC_2.33 alphasort F
> @@ -2131,6 +2133,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/librt.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/librt.abilist
> index dc23391407..51c25c849d 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv32/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv32/librt.abilist
> @@ -1,6 +1,4 @@
>  GLIBC_2.33 __mq_open_2 F
> -GLIBC_2.33 aio_suspend F
> -GLIBC_2.33 aio_suspend64 F
>  GLIBC_2.33 aio_write F
>  GLIBC_2.33 aio_write64 F
>  GLIBC_2.33 lio_listio F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> index 5041f05217..9675d2f767 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> @@ -581,6 +581,8 @@ GLIBC_2.27 aio_read F
>  GLIBC_2.27 aio_read64 F
>  GLIBC_2.27 aio_return F
>  GLIBC_2.27 aio_return64 F
> +GLIBC_2.27 aio_suspend F
> +GLIBC_2.27 aio_suspend64 F
>  GLIBC_2.27 alarm F
>  GLIBC_2.27 aligned_alloc F
>  GLIBC_2.27 alphasort F
> @@ -2331,6 +2333,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/librt.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/librt.abilist
> index 5f1cecd612..7ccf2b6591 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/librt.abilist
> @@ -1,6 +1,4 @@
>  GLIBC_2.27 __mq_open_2 F
> -GLIBC_2.27 aio_suspend F
> -GLIBC_2.27 aio_suspend64 F
>  GLIBC_2.27 aio_write F
>  GLIBC_2.27 aio_write64 F
>  GLIBC_2.27 lio_listio F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> index ed6c511cc9..3f64ebb9bd 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> @@ -1483,6 +1483,8 @@ GLIBC_2.1 aio_read F
>  GLIBC_2.1 aio_read64 F
>  GLIBC_2.1 aio_return F
>  GLIBC_2.1 aio_return64 F
> +GLIBC_2.1 aio_suspend F
> +GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 alphasort64 F
>  GLIBC_2.1 argp_err_exit_status D 0x4
>  GLIBC_2.1 argp_error F
> @@ -2398,6 +2400,7 @@ GLIBC_2.33 stat F
>  GLIBC_2.33 stat64 F
>  GLIBC_2.34 ___adjtimex64 F
>  GLIBC_2.34 __adjtime64 F
> +GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __clock_adjtime64 F
>  GLIBC_2.34 __clock_getres64 F
>  GLIBC_2.34 __clock_gettime64 F
> @@ -2495,6 +2498,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/librt.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/librt.abilist
> index 4cae24e768..b9b9b71dba 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/librt.abilist
> @@ -1,5 +1,3 @@
> -GLIBC_2.1 aio_suspend F
> -GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 aio_write F
>  GLIBC_2.1 aio_write64 F
>  GLIBC_2.1 lio_listio F
> @@ -19,7 +17,6 @@ GLIBC_2.3.4 mq_setattr F
>  GLIBC_2.3.4 mq_timedreceive F
>  GLIBC_2.3.4 mq_timedsend F
>  GLIBC_2.3.4 mq_unlink F
> -GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __mq_timedreceive_time64 F
>  GLIBC_2.34 __mq_timedsend_time64 F
>  GLIBC_2.34 __timer_gettime64 F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> index 9f1e31574e..f727420c0a 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> @@ -581,6 +581,8 @@ GLIBC_2.2 aio_read F
>  GLIBC_2.2 aio_read64 F
>  GLIBC_2.2 aio_return F
>  GLIBC_2.2 aio_return64 F
> +GLIBC_2.2 aio_suspend F
> +GLIBC_2.2 aio_suspend64 F
>  GLIBC_2.2 alarm F
>  GLIBC_2.2 alphasort F
>  GLIBC_2.2 alphasort64 F
> @@ -2304,6 +2306,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/librt.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/librt.abilist
> index 2442ed5222..15c2ca3e70 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/librt.abilist
> @@ -1,5 +1,3 @@
> -GLIBC_2.2 aio_suspend F
> -GLIBC_2.2 aio_suspend64 F
>  GLIBC_2.2 aio_write F
>  GLIBC_2.2 aio_write64 F
>  GLIBC_2.2 lio_listio F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> index b9e583fa88..3aed85ad55 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> @@ -18,6 +18,8 @@ GLIBC_2.1 aio_read F
>  GLIBC_2.1 aio_read64 F
>  GLIBC_2.1 aio_return F
>  GLIBC_2.1 aio_return64 F
> +GLIBC_2.1 aio_suspend F
> +GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 dlopen F
>  GLIBC_2.1 dlvsym F
>  GLIBC_2.10 __cxa_at_quick_exit F
> @@ -2253,6 +2255,7 @@ GLIBC_2.33 stat F
>  GLIBC_2.33 stat64 F
>  GLIBC_2.34 ___adjtimex64 F
>  GLIBC_2.34 __adjtime64 F
> +GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __clock_adjtime64 F
>  GLIBC_2.34 __clock_getres64 F
>  GLIBC_2.34 __clock_gettime64 F
> @@ -2350,6 +2353,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/librt.abilist b/sysdeps/unix/sysv/linux/sh/be/librt.abilist
> index 4cae24e768..b9b9b71dba 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/librt.abilist
> @@ -1,5 +1,3 @@
> -GLIBC_2.1 aio_suspend F
> -GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 aio_write F
>  GLIBC_2.1 aio_write64 F
>  GLIBC_2.1 lio_listio F
> @@ -19,7 +17,6 @@ GLIBC_2.3.4 mq_setattr F
>  GLIBC_2.3.4 mq_timedreceive F
>  GLIBC_2.3.4 mq_timedsend F
>  GLIBC_2.3.4 mq_unlink F
> -GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __mq_timedreceive_time64 F
>  GLIBC_2.34 __mq_timedsend_time64 F
>  GLIBC_2.34 __timer_gettime64 F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> index 2f737fadb8..eed02a7f07 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> @@ -18,6 +18,8 @@ GLIBC_2.1 aio_read F
>  GLIBC_2.1 aio_read64 F
>  GLIBC_2.1 aio_return F
>  GLIBC_2.1 aio_return64 F
> +GLIBC_2.1 aio_suspend F
> +GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 dlopen F
>  GLIBC_2.1 dlvsym F
>  GLIBC_2.10 __cxa_at_quick_exit F
> @@ -2250,6 +2252,7 @@ GLIBC_2.33 stat F
>  GLIBC_2.33 stat64 F
>  GLIBC_2.34 ___adjtimex64 F
>  GLIBC_2.34 __adjtime64 F
> +GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __clock_adjtime64 F
>  GLIBC_2.34 __clock_getres64 F
>  GLIBC_2.34 __clock_gettime64 F
> @@ -2347,6 +2350,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/librt.abilist b/sysdeps/unix/sysv/linux/sh/le/librt.abilist
> index 4cae24e768..b9b9b71dba 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/librt.abilist
> @@ -1,5 +1,3 @@
> -GLIBC_2.1 aio_suspend F
> -GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 aio_write F
>  GLIBC_2.1 aio_write64 F
>  GLIBC_2.1 lio_listio F
> @@ -19,7 +17,6 @@ GLIBC_2.3.4 mq_setattr F
>  GLIBC_2.3.4 mq_timedreceive F
>  GLIBC_2.3.4 mq_timedsend F
>  GLIBC_2.3.4 mq_unlink F
> -GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __mq_timedreceive_time64 F
>  GLIBC_2.34 __mq_timedsend_time64 F
>  GLIBC_2.34 __timer_gettime64 F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> index f4c87b4fa9..c627a8beb7 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> @@ -1485,6 +1485,8 @@ GLIBC_2.1 aio_read F
>  GLIBC_2.1 aio_read64 F
>  GLIBC_2.1 aio_return F
>  GLIBC_2.1 aio_return64 F
> +GLIBC_2.1 aio_suspend F
> +GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 alphasort64 F
>  GLIBC_2.1 argp_err_exit_status D 0x4
>  GLIBC_2.1 argp_error F
> @@ -2393,6 +2395,7 @@ GLIBC_2.33 stat F
>  GLIBC_2.33 stat64 F
>  GLIBC_2.34 ___adjtimex64 F
>  GLIBC_2.34 __adjtime64 F
> +GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __clock_adjtime64 F
>  GLIBC_2.34 __clock_getres64 F
>  GLIBC_2.34 __clock_gettime64 F
> @@ -2490,6 +2493,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/librt.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/librt.abilist
> index 6061373aae..13fff57eb0 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/librt.abilist
> @@ -1,5 +1,3 @@
> -GLIBC_2.1 aio_suspend F
> -GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 aio_write F
>  GLIBC_2.1 aio_write64 F
>  GLIBC_2.1 lio_listio F
> @@ -20,7 +18,6 @@ GLIBC_2.3.4 mq_setattr F
>  GLIBC_2.3.4 mq_timedreceive F
>  GLIBC_2.3.4 mq_timedsend F
>  GLIBC_2.3.4 mq_unlink F
> -GLIBC_2.34 __aio_suspend_time64 F
>  GLIBC_2.34 __mq_timedreceive_time64 F
>  GLIBC_2.34 __mq_timedsend_time64 F
>  GLIBC_2.34 __timer_gettime64 F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> index 03acd40463..574b4ef2c1 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> @@ -18,6 +18,8 @@ GLIBC_2.1 aio_read F
>  GLIBC_2.1 aio_read64 F
>  GLIBC_2.1 aio_return F
>  GLIBC_2.1 aio_return64 F
> +GLIBC_2.1 aio_suspend F
> +GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 dlopen F
>  GLIBC_2.1 dlvsym F
>  GLIBC_2.10 __cxa_at_quick_exit F
> @@ -2326,6 +2328,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/librt.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/librt.abilist
> index 90a66e4a4b..8a8fe654e0 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/librt.abilist
> @@ -1,5 +1,3 @@
> -GLIBC_2.1 aio_suspend F
> -GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 aio_write F
>  GLIBC_2.1 aio_write64 F
>  GLIBC_2.1 lio_listio F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> index f81fe5301d..6e3c1ce83b 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> @@ -570,6 +570,8 @@ GLIBC_2.2.5 aio_read F
>  GLIBC_2.2.5 aio_read64 F
>  GLIBC_2.2.5 aio_return F
>  GLIBC_2.2.5 aio_return64 F
> +GLIBC_2.2.5 aio_suspend F
> +GLIBC_2.2.5 aio_suspend64 F
>  GLIBC_2.2.5 alarm F
>  GLIBC_2.2.5 alphasort F
>  GLIBC_2.2.5 alphasort64 F
> @@ -2282,6 +2284,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/librt.abilist b/sysdeps/unix/sysv/linux/x86_64/64/librt.abilist
> index 62fe3da2cb..c2e8ab87d0 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/librt.abilist
> @@ -1,5 +1,3 @@
> -GLIBC_2.2.5 aio_suspend F
> -GLIBC_2.2.5 aio_suspend64 F
>  GLIBC_2.2.5 aio_write F
>  GLIBC_2.2.5 aio_write64 F
>  GLIBC_2.2.5 lio_listio F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> index 45d74a3958..42376975e6 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> @@ -603,6 +603,8 @@ GLIBC_2.16 aio_read F
>  GLIBC_2.16 aio_read64 F
>  GLIBC_2.16 aio_return F
>  GLIBC_2.16 aio_return64 F
> +GLIBC_2.16 aio_suspend F
> +GLIBC_2.16 aio_suspend64 F
>  GLIBC_2.16 alarm F
>  GLIBC_2.16 aligned_alloc F
>  GLIBC_2.16 alphasort F
> @@ -2385,6 +2387,8 @@ GLIBC_2.34 aio_read F
>  GLIBC_2.34 aio_read64 F
>  GLIBC_2.34 aio_return F
>  GLIBC_2.34 aio_return64 F
> +GLIBC_2.34 aio_suspend F
> +GLIBC_2.34 aio_suspend64 F
>  GLIBC_2.34 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/librt.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/librt.abilist
> index a531990038..f7245c6716 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/librt.abilist
> @@ -1,6 +1,4 @@
>  GLIBC_2.16 __mq_open_2 F
> -GLIBC_2.16 aio_suspend F
> -GLIBC_2.16 aio_suspend64 F
>  GLIBC_2.16 aio_write F
>  GLIBC_2.16 aio_write64 F
>  GLIBC_2.16 lio_listio F
> 

Ok.
Florian Weimer June 23, 2021, 7:59 p.m. UTC | #2 
* Adhemerval Zanella:

>> -      pthread_cleanup_push (cleanup, &clparam);
>> +#if PTHREAD_IN_LIBC
>> +      __libc_cleanup_region_start (1, cleanup, &clparam);
>> +#else
>> +      __pthread_cleanup_push (cleanup, &clparam);
>> +#endif
>>  
>>  #ifdef DONT_NEED_AIO_MISC_COND
>>        result = do_aio_misc_wait (&cntr, timeout == NULL ? NULL : &ts);
>> @@ -194,7 +200,11 @@ __aio_suspend_time64 (const struct aiocb *const list[], int nent,
>>  				       timeout == NULL ? NULL : &ts32);
>>  #endif
>>  
>> +#if PTHREAD_IN_LIBC
>> +      __libc_cleanup_region_end (0);
>> +#else
>>        pthread_cleanup_pop (0);
>> +#endif
>>      }
>>  
>
> Ok.  What prevents to use __libc_cleanup_region_start on Hurd as well here?

I assumed that it would be available only within libc.

I have no way to test this on Hurd, which is why I wanted to keep the
original code.

Thanks,
Florian
diff mbox series

Patch

diff --git a/include/aio.h b/include/aio.h
index c7f4233310..5d67800aff 100644
--- a/include/aio.h
+++ b/include/aio.h
@@ -15,7 +15,11 @@  extern void __aio_init (const struct aioinit *__init);
 # else
 extern int __aio_suspend_time64 (const struct aiocb *const list[], int nent,
                                  const struct __timespec64 *timeout);
+#  if PTHREAD_IN_LIBC
+libc_hidden_proto (__aio_suspend_time64)
+#  else
 librt_hidden_proto (__aio_suspend_time64)
+#endif
 # endif
 #endif
 
diff --git a/rt/Makefile b/rt/Makefile
index 810599a736..b375d37ba2 100644
--- a/rt/Makefile
+++ b/rt/Makefile
@@ -29,7 +29,6 @@  routines = \
   shm_unlink \
 
 librt-routines = \
-  aio_suspend \
   aio_write \
   aio_write64 \
   librt-compat \
@@ -63,6 +62,7 @@  $(librt-routines-var) += \
   aio_read64 \
   aio_return \
   aio_sigqueue \
+  aio_suspend \
 
 tests := tst-shm tst-timer tst-timer2 \
 	 tst-aio tst-aio64 tst-aio2 tst-aio3 tst-aio4 tst-aio5 tst-aio6 \
diff --git a/rt/Versions b/rt/Versions
index 0780dc8400..d54b9cc4bf 100644
--- a/rt/Versions
+++ b/rt/Versions
@@ -12,6 +12,8 @@  libc {
     aio_read64;
     aio_return;
     aio_return64;
+    aio_suspend;
+    aio_suspend64;
 %endif
   }
   GLIBC_2.2 {
@@ -31,6 +33,8 @@  libc {
     aio_read64;
     aio_return;
     aio_return64;
+    aio_suspend;
+    aio_suspend64;
 %endif
     shm_open;
     shm_unlink;
@@ -63,9 +67,9 @@  librt {
     aio_read64;
     aio_return;
     aio_return64;
-%endif
     aio_suspend;
     aio_suspend64;
+%endif
     aio_write;
     aio_write64;
     lio_listio;
diff --git a/rt/aio_suspend.c b/rt/aio_suspend.c
index 6fd5b1bee2..29f01d1023 100644
--- a/rt/aio_suspend.c
+++ b/rt/aio_suspend.c
@@ -36,6 +36,8 @@ 
 
 #include <libc-lock.h>
 #include <aio_misc.h>
+#include <pthreadP.h>
+#include <shlib-compat.h>
 
 
 struct clparam
@@ -56,7 +58,7 @@  cleanup (void *arg)
 #ifdef DONT_NEED_AIO_MISC_COND
   /* Acquire the mutex.  If pthread_cond_*wait is used this would
      happen implicitly.  */
-  pthread_mutex_lock (&__aio_requests_mutex);
+  __pthread_mutex_lock (&__aio_requests_mutex);
 #endif
 
   const struct clparam *param = (const struct clparam *) arg;
@@ -88,7 +90,7 @@  cleanup (void *arg)
 #endif
 
   /* Release the mutex.  */
-  pthread_mutex_unlock (&__aio_requests_mutex);
+  __pthread_mutex_unlock (&__aio_requests_mutex);
 }
 
 #ifdef DONT_NEED_AIO_MISC_COND
@@ -105,7 +107,7 @@  do_aio_misc_wait (unsigned int *cntr, const struct __timespec64 *timeout)
 #endif
 
 int
-__aio_suspend_time64 (const struct aiocb *const list[], int nent,
+___aio_suspend_time64 (const struct aiocb *const list[], int nent,
 		      const struct __timespec64 *timeout)
 {
   if (__glibc_unlikely (nent < 0))
@@ -125,7 +127,7 @@  __aio_suspend_time64 (const struct aiocb *const list[], int nent,
   unsigned int cntr = 1;
 
   /* Request the mutex.  */
-  pthread_mutex_lock (&__aio_requests_mutex);
+  __pthread_mutex_lock (&__aio_requests_mutex);
 
   /* There is not yet a finished request.  Signal the request that
      we are working for it.  */
@@ -184,7 +186,11 @@  __aio_suspend_time64 (const struct aiocb *const list[], int nent,
 	  .nent = nent
 	};
 
-      pthread_cleanup_push (cleanup, &clparam);
+#if PTHREAD_IN_LIBC
+      __libc_cleanup_region_start (1, cleanup, &clparam);
+#else
+      __pthread_cleanup_push (cleanup, &clparam);
+#endif
 
 #ifdef DONT_NEED_AIO_MISC_COND
       result = do_aio_misc_wait (&cntr, timeout == NULL ? NULL : &ts);
@@ -194,7 +200,11 @@  __aio_suspend_time64 (const struct aiocb *const list[], int nent,
 				       timeout == NULL ? NULL : &ts32);
 #endif
 
+#if PTHREAD_IN_LIBC
+      __libc_cleanup_region_end (0);
+#else
       pthread_cleanup_pop (0);
+#endif
     }
 
   /* Now remove the entry in the waiting list for all requests
@@ -239,13 +249,22 @@  __aio_suspend_time64 (const struct aiocb *const list[], int nent,
     }
 
   /* Release the mutex.  */
-  pthread_mutex_unlock (&__aio_requests_mutex);
+  __pthread_mutex_unlock (&__aio_requests_mutex);
 
   return result;
 }
 
-#if __TIMESIZE != 64
-librt_hidden_def (__aio_suspend_time64)
+#if __TIMESIZE == 64
+strong_alias (___aio_suspend_time64, __aio_suspend)
+#else /* __TIMESIZE != 64 */
+# if PTHREAD_IN_LIBC
+libc_hidden_ver (___aio_suspend_time64, __aio_suspend_time64)
+/* The conditional is slightly wrong: PTHREAD_IN_LIBC is a stand-in
+   for whether time64 support is needed.  */
+versioned_symbol (libc, ___aio_suspend_time64, __aio_suspend_time64, GLIBC_2_34);
+# else
+librt_hidden_ver (___aio_suspend_time64, __aio_suspend_time64)
+# endif
 
 int
 __aio_suspend (const struct aiocb *const list[], int nent,
@@ -258,6 +277,16 @@  __aio_suspend (const struct aiocb *const list[], int nent,
 
   return __aio_suspend_time64 (list, nent, timeout != NULL ? &ts64 : NULL);
 }
-#endif
+#endif /* __TIMESPEC64 != 64 */
+
+#if PTHREAD_IN_LIBC
+versioned_symbol (libc, __aio_suspend, aio_suspend, GLIBC_2_34);
+versioned_symbol (libc, __aio_suspend, aio_suspend64, GLIBC_2_34);
+# if OTHER_SHLIB_COMPAT (librt, GLIBC_2_1, GLIBC_2_34)
+compat_symbol (librt, __aio_suspend, aio_suspend, GLIBC_2_1);
+compat_symbol (librt, __aio_suspend, aio_suspend64, GLIBC_2_1);
+# endif
+#else /* !PTHREAD_IN_LIBC */
 weak_alias (__aio_suspend, aio_suspend)
-weak_alias (aio_suspend, aio_suspend64)
+weak_alias (__aio_suspend, aio_suspend64)
+#endif /* !PTHREAD_IN_LIBC */
diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions
index ea0b22d7af..f246a389e1 100644
--- a/sysdeps/unix/sysv/linux/Versions
+++ b/sysdeps/unix/sysv/linux/Versions
@@ -192,6 +192,7 @@  libc {
     # 64-bit time_t support
     __adjtime64;
     ___adjtimex64;
+    __aio_suspend_time64;
     __clock_adjtime64;
     __clock_getres64;
     __clock_gettime64;
@@ -294,7 +295,6 @@  librt {
   GLIBC_2.34 {
 %ifdef TIME64_NON_DEFAULT
     # 64-bit time_t support
-    __aio_suspend_time64;
     __mq_timedsend_time64;
     __mq_timedreceive_time64;
     __timer_gettime64;
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index 79405d26e9..6c76d0df61 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -600,6 +600,8 @@  GLIBC_2.17 aio_read F
 GLIBC_2.17 aio_read64 F
 GLIBC_2.17 aio_return F
 GLIBC_2.17 aio_return64 F
+GLIBC_2.17 aio_suspend F
+GLIBC_2.17 aio_suspend64 F
 GLIBC_2.17 alarm F
 GLIBC_2.17 aligned_alloc F
 GLIBC_2.17 alphasort F
@@ -2370,6 +2372,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/aarch64/librt.abilist b/sysdeps/unix/sysv/linux/aarch64/librt.abilist
index 451560dc87..37ff014ed8 100644
--- a/sysdeps/unix/sysv/linux/aarch64/librt.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/librt.abilist
@@ -1,6 +1,4 @@ 
 GLIBC_2.17 __mq_open_2 F
-GLIBC_2.17 aio_suspend F
-GLIBC_2.17 aio_suspend64 F
 GLIBC_2.17 aio_write F
 GLIBC_2.17 aio_write64 F
 GLIBC_2.17 lio_listio F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index f6fa8966f8..e7f0e1b49a 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -1513,6 +1513,8 @@  GLIBC_2.1 aio_read F
 GLIBC_2.1 aio_read64 F
 GLIBC_2.1 aio_return F
 GLIBC_2.1 aio_return64 F
+GLIBC_2.1 aio_suspend F
+GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 alphasort64 F
 GLIBC_2.1 argp_err_exit_status D 0x4
 GLIBC_2.1 argp_error F
@@ -2465,6 +2467,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/alpha/librt.abilist b/sysdeps/unix/sysv/linux/alpha/librt.abilist
index 90a66e4a4b..8a8fe654e0 100644
--- a/sysdeps/unix/sysv/linux/alpha/librt.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/librt.abilist
@@ -1,5 +1,3 @@ 
-GLIBC_2.1 aio_suspend F
-GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 aio_write F
 GLIBC_2.1 aio_write64 F
 GLIBC_2.1 lio_listio F
diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
index a5c1df7eaf..cf93d14e6f 100644
--- a/sysdeps/unix/sysv/linux/arc/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
@@ -561,6 +561,8 @@  GLIBC_2.32 aio_read F
 GLIBC_2.32 aio_read64 F
 GLIBC_2.32 aio_return F
 GLIBC_2.32 aio_return64 F
+GLIBC_2.32 aio_suspend F
+GLIBC_2.32 aio_suspend64 F
 GLIBC_2.32 alarm F
 GLIBC_2.32 aligned_alloc F
 GLIBC_2.32 alphasort F
@@ -2129,6 +2131,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/arc/librt.abilist b/sysdeps/unix/sysv/linux/arc/librt.abilist
index 9cac9c759b..4eb7de36e1 100644
--- a/sysdeps/unix/sysv/linux/arc/librt.abilist
+++ b/sysdeps/unix/sysv/linux/arc/librt.abilist
@@ -1,6 +1,4 @@ 
 GLIBC_2.32 __mq_open_2 F
-GLIBC_2.32 aio_suspend F
-GLIBC_2.32 aio_suspend64 F
 GLIBC_2.32 aio_write F
 GLIBC_2.32 aio_write64 F
 GLIBC_2.32 lio_listio F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
index 1928717cfd..9d9e4c6b73 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
@@ -192,6 +192,7 @@  GLIBC_2.33 stat F
 GLIBC_2.33 stat64 F
 GLIBC_2.34 ___adjtimex64 F
 GLIBC_2.34 __adjtime64 F
+GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __clock_adjtime64 F
 GLIBC_2.34 __clock_getres64 F
 GLIBC_2.34 __clock_gettime64 F
@@ -289,6 +290,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
@@ -1003,6 +1006,8 @@  GLIBC_2.4 aio_read F
 GLIBC_2.4 aio_read64 F
 GLIBC_2.4 aio_return F
 GLIBC_2.4 aio_return64 F
+GLIBC_2.4 aio_suspend F
+GLIBC_2.4 aio_suspend64 F
 GLIBC_2.4 alarm F
 GLIBC_2.4 alphasort F
 GLIBC_2.4 alphasort64 F
diff --git a/sysdeps/unix/sysv/linux/arm/be/librt.abilist b/sysdeps/unix/sysv/linux/arm/be/librt.abilist
index 05957aae03..7cb476c7b4 100644
--- a/sysdeps/unix/sysv/linux/arm/be/librt.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/librt.abilist
@@ -1,10 +1,7 @@ 
-GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __mq_timedreceive_time64 F
 GLIBC_2.34 __mq_timedsend_time64 F
 GLIBC_2.34 __timer_gettime64 F
 GLIBC_2.34 __timer_settime64 F
-GLIBC_2.4 aio_suspend F
-GLIBC_2.4 aio_suspend64 F
 GLIBC_2.4 aio_write F
 GLIBC_2.4 aio_write64 F
 GLIBC_2.4 lio_listio F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
index bee5d9f757..a195587b66 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
@@ -189,6 +189,7 @@  GLIBC_2.33 stat F
 GLIBC_2.33 stat64 F
 GLIBC_2.34 ___adjtimex64 F
 GLIBC_2.34 __adjtime64 F
+GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __clock_adjtime64 F
 GLIBC_2.34 __clock_getres64 F
 GLIBC_2.34 __clock_gettime64 F
@@ -286,6 +287,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
@@ -1000,6 +1003,8 @@  GLIBC_2.4 aio_read F
 GLIBC_2.4 aio_read64 F
 GLIBC_2.4 aio_return F
 GLIBC_2.4 aio_return64 F
+GLIBC_2.4 aio_suspend F
+GLIBC_2.4 aio_suspend64 F
 GLIBC_2.4 alarm F
 GLIBC_2.4 alphasort F
 GLIBC_2.4 alphasort64 F
diff --git a/sysdeps/unix/sysv/linux/arm/le/librt.abilist b/sysdeps/unix/sysv/linux/arm/le/librt.abilist
index 05957aae03..7cb476c7b4 100644
--- a/sysdeps/unix/sysv/linux/arm/le/librt.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/librt.abilist
@@ -1,10 +1,7 @@ 
-GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __mq_timedreceive_time64 F
 GLIBC_2.34 __mq_timedsend_time64 F
 GLIBC_2.34 __timer_gettime64 F
 GLIBC_2.34 __timer_settime64 F
-GLIBC_2.4 aio_suspend F
-GLIBC_2.4 aio_suspend64 F
 GLIBC_2.4 aio_write F
 GLIBC_2.4 aio_write64 F
 GLIBC_2.4 lio_listio F
diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist
index 753f54085a..1e3c73aa2d 100644
--- a/sysdeps/unix/sysv/linux/csky/libc.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libc.abilist
@@ -575,6 +575,8 @@  GLIBC_2.29 aio_read F
 GLIBC_2.29 aio_read64 F
 GLIBC_2.29 aio_return F
 GLIBC_2.29 aio_return64 F
+GLIBC_2.29 aio_suspend F
+GLIBC_2.29 aio_suspend64 F
 GLIBC_2.29 alarm F
 GLIBC_2.29 aligned_alloc F
 GLIBC_2.29 alphasort F
@@ -2292,6 +2294,7 @@  GLIBC_2.33 stat F
 GLIBC_2.33 stat64 F
 GLIBC_2.34 ___adjtimex64 F
 GLIBC_2.34 __adjtime64 F
+GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __clock_adjtime64 F
 GLIBC_2.34 __clock_getres64 F
 GLIBC_2.34 __clock_gettime64 F
@@ -2389,6 +2392,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/csky/librt.abilist b/sysdeps/unix/sysv/linux/csky/librt.abilist
index 74fc5621d6..fcc993f16f 100644
--- a/sysdeps/unix/sysv/linux/csky/librt.abilist
+++ b/sysdeps/unix/sysv/linux/csky/librt.abilist
@@ -1,6 +1,4 @@ 
 GLIBC_2.29 __mq_open_2 F
-GLIBC_2.29 aio_suspend F
-GLIBC_2.29 aio_suspend64 F
 GLIBC_2.29 aio_write F
 GLIBC_2.29 aio_write64 F
 GLIBC_2.29 lio_listio F
@@ -20,7 +18,6 @@  GLIBC_2.29 timer_delete F
 GLIBC_2.29 timer_getoverrun F
 GLIBC_2.29 timer_gettime F
 GLIBC_2.29 timer_settime F
-GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __mq_timedreceive_time64 F
 GLIBC_2.34 __mq_timedsend_time64 F
 GLIBC_2.34 __timer_gettime64 F
diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
index 4a96fcfb39..3e0ff7575e 100644
--- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
@@ -14,6 +14,8 @@  GLIBC_2.1 aio_read F
 GLIBC_2.1 aio_read64 F
 GLIBC_2.1 aio_return F
 GLIBC_2.1 aio_return64 F
+GLIBC_2.1 aio_suspend F
+GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 dlopen F
 GLIBC_2.1 dlvsym F
 GLIBC_2.10 __cxa_at_quick_exit F
@@ -2246,6 +2248,7 @@  GLIBC_2.33 stat F
 GLIBC_2.33 stat64 F
 GLIBC_2.34 ___adjtimex64 F
 GLIBC_2.34 __adjtime64 F
+GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __clock_adjtime64 F
 GLIBC_2.34 __clock_getres64 F
 GLIBC_2.34 __clock_gettime64 F
@@ -2343,6 +2346,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/hppa/librt.abilist b/sysdeps/unix/sysv/linux/hppa/librt.abilist
index 4cae24e768..b9b9b71dba 100644
--- a/sysdeps/unix/sysv/linux/hppa/librt.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/librt.abilist
@@ -1,5 +1,3 @@ 
-GLIBC_2.1 aio_suspend F
-GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 aio_write F
 GLIBC_2.1 aio_write64 F
 GLIBC_2.1 lio_listio F
@@ -19,7 +17,6 @@  GLIBC_2.3.4 mq_setattr F
 GLIBC_2.3.4 mq_timedreceive F
 GLIBC_2.3.4 mq_timedsend F
 GLIBC_2.3.4 mq_unlink F
-GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __mq_timedreceive_time64 F
 GLIBC_2.34 __mq_timedsend_time64 F
 GLIBC_2.34 __timer_gettime64 F
diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
index b704bf4756..54b5ee4649 100644
--- a/sysdeps/unix/sysv/linux/i386/libc.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
@@ -1486,6 +1486,8 @@  GLIBC_2.1 aio_read F
 GLIBC_2.1 aio_read64 F
 GLIBC_2.1 aio_return F
 GLIBC_2.1 aio_return64 F
+GLIBC_2.1 aio_suspend F
+GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 alphasort64 F
 GLIBC_2.1 argp_err_exit_status D 0x4
 GLIBC_2.1 argp_error F
@@ -2429,6 +2431,7 @@  GLIBC_2.33 stat F
 GLIBC_2.33 stat64 F
 GLIBC_2.34 ___adjtimex64 F
 GLIBC_2.34 __adjtime64 F
+GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __clock_adjtime64 F
 GLIBC_2.34 __clock_getres64 F
 GLIBC_2.34 __clock_gettime64 F
@@ -2527,6 +2530,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/i386/librt.abilist b/sysdeps/unix/sysv/linux/i386/librt.abilist
index 4cae24e768..b9b9b71dba 100644
--- a/sysdeps/unix/sysv/linux/i386/librt.abilist
+++ b/sysdeps/unix/sysv/linux/i386/librt.abilist
@@ -1,5 +1,3 @@ 
-GLIBC_2.1 aio_suspend F
-GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 aio_write F
 GLIBC_2.1 aio_write64 F
 GLIBC_2.1 lio_listio F
@@ -19,7 +17,6 @@  GLIBC_2.3.4 mq_setattr F
 GLIBC_2.3.4 mq_timedreceive F
 GLIBC_2.3.4 mq_timedsend F
 GLIBC_2.3.4 mq_unlink F
-GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __mq_timedreceive_time64 F
 GLIBC_2.34 __mq_timedsend_time64 F
 GLIBC_2.34 __timer_gettime64 F
diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
index 08bea0c72f..9aac5c8ff4 100644
--- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
@@ -14,6 +14,8 @@  GLIBC_2.1 aio_read F
 GLIBC_2.1 aio_read64 F
 GLIBC_2.1 aio_return F
 GLIBC_2.1 aio_return64 F
+GLIBC_2.1 aio_suspend F
+GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 dlopen F
 GLIBC_2.1 dlvsym F
 GLIBC_2.10 __cxa_at_quick_exit F
@@ -2303,6 +2305,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/ia64/librt.abilist b/sysdeps/unix/sysv/linux/ia64/librt.abilist
index ac9f293b6b..67435f760c 100644
--- a/sysdeps/unix/sysv/linux/ia64/librt.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/librt.abilist
@@ -1,5 +1,3 @@ 
-GLIBC_2.1 aio_suspend F
-GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 aio_write F
 GLIBC_2.1 aio_write64 F
 GLIBC_2.1 lio_listio F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
index 187672fa76..87baa69dfe 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
@@ -193,6 +193,7 @@  GLIBC_2.33 stat F
 GLIBC_2.33 stat64 F
 GLIBC_2.34 ___adjtimex64 F
 GLIBC_2.34 __adjtime64 F
+GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __clock_adjtime64 F
 GLIBC_2.34 __clock_getres64 F
 GLIBC_2.34 __clock_gettime64 F
@@ -290,6 +291,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
@@ -991,6 +994,8 @@  GLIBC_2.4 aio_read F
 GLIBC_2.4 aio_read64 F
 GLIBC_2.4 aio_return F
 GLIBC_2.4 aio_return64 F
+GLIBC_2.4 aio_suspend F
+GLIBC_2.4 aio_suspend64 F
 GLIBC_2.4 alarm F
 GLIBC_2.4 alphasort F
 GLIBC_2.4 alphasort64 F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist
index 05957aae03..7cb476c7b4 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist
@@ -1,10 +1,7 @@ 
-GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __mq_timedreceive_time64 F
 GLIBC_2.34 __mq_timedsend_time64 F
 GLIBC_2.34 __timer_gettime64 F
 GLIBC_2.34 __timer_settime64 F
-GLIBC_2.4 aio_suspend F
-GLIBC_2.4 aio_suspend64 F
 GLIBC_2.4 aio_write F
 GLIBC_2.4 aio_write64 F
 GLIBC_2.4 lio_listio F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
index 379779793c..68aa865da4 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
@@ -1484,6 +1484,8 @@  GLIBC_2.1 aio_read F
 GLIBC_2.1 aio_read64 F
 GLIBC_2.1 aio_return F
 GLIBC_2.1 aio_return64 F
+GLIBC_2.1 aio_suspend F
+GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 alphasort64 F
 GLIBC_2.1 argp_err_exit_status D 0x4
 GLIBC_2.1 argp_error F
@@ -2373,6 +2375,7 @@  GLIBC_2.33 stat F
 GLIBC_2.33 stat64 F
 GLIBC_2.34 ___adjtimex64 F
 GLIBC_2.34 __adjtime64 F
+GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __clock_adjtime64 F
 GLIBC_2.34 __clock_getres64 F
 GLIBC_2.34 __clock_gettime64 F
@@ -2470,6 +2473,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/librt.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/librt.abilist
index 4cae24e768..b9b9b71dba 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/librt.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/librt.abilist
@@ -1,5 +1,3 @@ 
-GLIBC_2.1 aio_suspend F
-GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 aio_write F
 GLIBC_2.1 aio_write64 F
 GLIBC_2.1 lio_listio F
@@ -19,7 +17,6 @@  GLIBC_2.3.4 mq_setattr F
 GLIBC_2.3.4 mq_timedreceive F
 GLIBC_2.3.4 mq_timedsend F
 GLIBC_2.3.4 mq_unlink F
-GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __mq_timedreceive_time64 F
 GLIBC_2.34 __mq_timedsend_time64 F
 GLIBC_2.34 __timer_gettime64 F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
index 2fce5d9138..19aef593f3 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
@@ -602,6 +602,8 @@  GLIBC_2.18 aio_read F
 GLIBC_2.18 aio_read64 F
 GLIBC_2.18 aio_return F
 GLIBC_2.18 aio_return64 F
+GLIBC_2.18 aio_suspend F
+GLIBC_2.18 aio_suspend64 F
 GLIBC_2.18 alarm F
 GLIBC_2.18 aligned_alloc F
 GLIBC_2.18 alphasort F
@@ -2343,6 +2345,7 @@  GLIBC_2.33 stat F
 GLIBC_2.33 stat64 F
 GLIBC_2.34 ___adjtimex64 F
 GLIBC_2.34 __adjtime64 F
+GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __clock_adjtime64 F
 GLIBC_2.34 __clock_getres64 F
 GLIBC_2.34 __clock_gettime64 F
@@ -2440,6 +2443,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/librt.abilist b/sysdeps/unix/sysv/linux/microblaze/be/librt.abilist
index 1503d19eae..06e862de52 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/librt.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/librt.abilist
@@ -1,6 +1,4 @@ 
 GLIBC_2.18 __mq_open_2 F
-GLIBC_2.18 aio_suspend F
-GLIBC_2.18 aio_suspend64 F
 GLIBC_2.18 aio_write F
 GLIBC_2.18 aio_write64 F
 GLIBC_2.18 lio_listio F
@@ -20,7 +18,6 @@  GLIBC_2.18 timer_delete F
 GLIBC_2.18 timer_getoverrun F
 GLIBC_2.18 timer_gettime F
 GLIBC_2.18 timer_settime F
-GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __mq_timedreceive_time64 F
 GLIBC_2.34 __mq_timedsend_time64 F
 GLIBC_2.34 __timer_gettime64 F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
index 6c3cd2a9e3..d5f26a2d9b 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
@@ -602,6 +602,8 @@  GLIBC_2.18 aio_read F
 GLIBC_2.18 aio_read64 F
 GLIBC_2.18 aio_return F
 GLIBC_2.18 aio_return64 F
+GLIBC_2.18 aio_suspend F
+GLIBC_2.18 aio_suspend64 F
 GLIBC_2.18 alarm F
 GLIBC_2.18 aligned_alloc F
 GLIBC_2.18 alphasort F
@@ -2340,6 +2342,7 @@  GLIBC_2.33 stat F
 GLIBC_2.33 stat64 F
 GLIBC_2.34 ___adjtimex64 F
 GLIBC_2.34 __adjtime64 F
+GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __clock_adjtime64 F
 GLIBC_2.34 __clock_getres64 F
 GLIBC_2.34 __clock_gettime64 F
@@ -2437,6 +2440,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/librt.abilist b/sysdeps/unix/sysv/linux/microblaze/le/librt.abilist
index 1503d19eae..06e862de52 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/librt.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/librt.abilist
@@ -1,6 +1,4 @@ 
 GLIBC_2.18 __mq_open_2 F
-GLIBC_2.18 aio_suspend F
-GLIBC_2.18 aio_suspend64 F
 GLIBC_2.18 aio_write F
 GLIBC_2.18 aio_write64 F
 GLIBC_2.18 lio_listio F
@@ -20,7 +18,6 @@  GLIBC_2.18 timer_delete F
 GLIBC_2.18 timer_getoverrun F
 GLIBC_2.18 timer_gettime F
 GLIBC_2.18 timer_settime F
-GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __mq_timedreceive_time64 F
 GLIBC_2.34 __mq_timedsend_time64 F
 GLIBC_2.34 __timer_gettime64 F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
index 46aa64baaa..ba77980ef8 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
@@ -1662,6 +1662,8 @@  GLIBC_2.2 aio_read F
 GLIBC_2.2 aio_read64 F
 GLIBC_2.2 aio_return F
 GLIBC_2.2 aio_return64 F
+GLIBC_2.2 aio_suspend F
+GLIBC_2.2 aio_suspend64 F
 GLIBC_2.2 alphasort64 F
 GLIBC_2.2 argp_err_exit_status D 0x4
 GLIBC_2.2 argp_error F
@@ -2338,6 +2340,7 @@  GLIBC_2.33 stat F
 GLIBC_2.33 stat64 F
 GLIBC_2.34 ___adjtimex64 F
 GLIBC_2.34 __adjtime64 F
+GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __clock_adjtime64 F
 GLIBC_2.34 __clock_getres64 F
 GLIBC_2.34 __clock_gettime64 F
@@ -2435,6 +2438,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/librt.abilist b/sysdeps/unix/sysv/linux/mips/mips32/librt.abilist
index 2b7c3cabec..0a07f87ce9 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/librt.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/librt.abilist
@@ -1,5 +1,3 @@ 
-GLIBC_2.2 aio_suspend F
-GLIBC_2.2 aio_suspend64 F
 GLIBC_2.2 aio_write F
 GLIBC_2.2 aio_write64 F
 GLIBC_2.2 lio_listio F
@@ -19,7 +17,6 @@  GLIBC_2.3.4 mq_setattr F
 GLIBC_2.3.4 mq_timedreceive F
 GLIBC_2.3.4 mq_timedsend F
 GLIBC_2.3.4 mq_unlink F
-GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __mq_timedreceive_time64 F
 GLIBC_2.34 __mq_timedsend_time64 F
 GLIBC_2.34 __timer_gettime64 F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
index 169b386cc1..1e6c7a1eb3 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
@@ -1660,6 +1660,8 @@  GLIBC_2.2 aio_read F
 GLIBC_2.2 aio_read64 F
 GLIBC_2.2 aio_return F
 GLIBC_2.2 aio_return64 F
+GLIBC_2.2 aio_suspend F
+GLIBC_2.2 aio_suspend64 F
 GLIBC_2.2 alphasort64 F
 GLIBC_2.2 argp_err_exit_status D 0x4
 GLIBC_2.2 argp_error F
@@ -2336,6 +2338,7 @@  GLIBC_2.33 stat F
 GLIBC_2.33 stat64 F
 GLIBC_2.34 ___adjtimex64 F
 GLIBC_2.34 __adjtime64 F
+GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __clock_adjtime64 F
 GLIBC_2.34 __clock_getres64 F
 GLIBC_2.34 __clock_gettime64 F
@@ -2433,6 +2436,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
index ad52c15c3e..fd731ffed0 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
@@ -1661,6 +1661,8 @@  GLIBC_2.2 aio_read F
 GLIBC_2.2 aio_read64 F
 GLIBC_2.2 aio_return F
 GLIBC_2.2 aio_return64 F
+GLIBC_2.2 aio_suspend F
+GLIBC_2.2 aio_suspend64 F
 GLIBC_2.2 alphasort64 F
 GLIBC_2.2 argp_err_exit_status D 0x4
 GLIBC_2.2 argp_error F
@@ -2344,6 +2346,7 @@  GLIBC_2.33 stat F
 GLIBC_2.33 stat64 F
 GLIBC_2.34 ___adjtimex64 F
 GLIBC_2.34 __adjtime64 F
+GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __clock_adjtime64 F
 GLIBC_2.34 __clock_getres64 F
 GLIBC_2.34 __clock_gettime64 F
@@ -2441,6 +2444,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/librt.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/librt.abilist
index 2b7c3cabec..0a07f87ce9 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/librt.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/librt.abilist
@@ -1,5 +1,3 @@ 
-GLIBC_2.2 aio_suspend F
-GLIBC_2.2 aio_suspend64 F
 GLIBC_2.2 aio_write F
 GLIBC_2.2 aio_write64 F
 GLIBC_2.2 lio_listio F
@@ -19,7 +17,6 @@  GLIBC_2.3.4 mq_setattr F
 GLIBC_2.3.4 mq_timedreceive F
 GLIBC_2.3.4 mq_timedsend F
 GLIBC_2.3.4 mq_unlink F
-GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __mq_timedreceive_time64 F
 GLIBC_2.34 __mq_timedsend_time64 F
 GLIBC_2.34 __timer_gettime64 F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
index 16a67a0d6d..9f82375689 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
@@ -1657,6 +1657,8 @@  GLIBC_2.2 aio_read F
 GLIBC_2.2 aio_read64 F
 GLIBC_2.2 aio_return F
 GLIBC_2.2 aio_return64 F
+GLIBC_2.2 aio_suspend F
+GLIBC_2.2 aio_suspend64 F
 GLIBC_2.2 alphasort64 F
 GLIBC_2.2 argp_err_exit_status D 0x4
 GLIBC_2.2 argp_error F
@@ -2359,6 +2361,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/librt.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/librt.abilist
index 293b92eaec..7d7be4d9ec 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/librt.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/librt.abilist
@@ -1,5 +1,3 @@ 
-GLIBC_2.2 aio_suspend F
-GLIBC_2.2 aio_suspend64 F
 GLIBC_2.2 aio_write F
 GLIBC_2.2 aio_write64 F
 GLIBC_2.2 lio_listio F
diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
index 3567fa8efc..77a0544dbf 100644
--- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
@@ -644,6 +644,8 @@  GLIBC_2.21 aio_read F
 GLIBC_2.21 aio_read64 F
 GLIBC_2.21 aio_return F
 GLIBC_2.21 aio_return64 F
+GLIBC_2.21 aio_suspend F
+GLIBC_2.21 aio_suspend64 F
 GLIBC_2.21 alarm F
 GLIBC_2.21 aligned_alloc F
 GLIBC_2.21 alphasort F
@@ -2382,6 +2384,7 @@  GLIBC_2.33 stat F
 GLIBC_2.33 stat64 F
 GLIBC_2.34 ___adjtimex64 F
 GLIBC_2.34 __adjtime64 F
+GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __clock_adjtime64 F
 GLIBC_2.34 __clock_getres64 F
 GLIBC_2.34 __clock_gettime64 F
@@ -2479,6 +2482,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/nios2/librt.abilist b/sysdeps/unix/sysv/linux/nios2/librt.abilist
index b63036c526..0db5142065 100644
--- a/sysdeps/unix/sysv/linux/nios2/librt.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/librt.abilist
@@ -1,6 +1,4 @@ 
 GLIBC_2.21 __mq_open_2 F
-GLIBC_2.21 aio_suspend F
-GLIBC_2.21 aio_suspend64 F
 GLIBC_2.21 aio_write F
 GLIBC_2.21 aio_write64 F
 GLIBC_2.21 lio_listio F
@@ -20,7 +18,6 @@  GLIBC_2.21 timer_delete F
 GLIBC_2.21 timer_getoverrun F
 GLIBC_2.21 timer_gettime F
 GLIBC_2.21 timer_settime F
-GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __mq_timedreceive_time64 F
 GLIBC_2.34 __mq_timedsend_time64 F
 GLIBC_2.34 __timer_gettime64 F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
index 0b393c0a5a..ed6f66c610 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
@@ -1491,6 +1491,8 @@  GLIBC_2.1 aio_read F
 GLIBC_2.1 aio_read64 F
 GLIBC_2.1 aio_return F
 GLIBC_2.1 aio_return64 F
+GLIBC_2.1 aio_suspend F
+GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 alphasort64 F
 GLIBC_2.1 argp_err_exit_status D 0x4
 GLIBC_2.1 argp_error F
@@ -2400,6 +2402,7 @@  GLIBC_2.33 stat F
 GLIBC_2.33 stat64 F
 GLIBC_2.34 ___adjtimex64 F
 GLIBC_2.34 __adjtime64 F
+GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __clock_adjtime64 F
 GLIBC_2.34 __clock_getres64 F
 GLIBC_2.34 __clock_gettime64 F
@@ -2497,6 +2500,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist
index 4cae24e768..b9b9b71dba 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist
@@ -1,5 +1,3 @@ 
-GLIBC_2.1 aio_suspend F
-GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 aio_write F
 GLIBC_2.1 aio_write64 F
 GLIBC_2.1 lio_listio F
@@ -19,7 +17,6 @@  GLIBC_2.3.4 mq_setattr F
 GLIBC_2.3.4 mq_timedreceive F
 GLIBC_2.3.4 mq_timedsend F
 GLIBC_2.3.4 mq_unlink F
-GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __mq_timedreceive_time64 F
 GLIBC_2.34 __mq_timedsend_time64 F
 GLIBC_2.34 __timer_gettime64 F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
index 0bc73512d3..817530d12f 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
@@ -1491,6 +1491,8 @@  GLIBC_2.1 aio_read F
 GLIBC_2.1 aio_read64 F
 GLIBC_2.1 aio_return F
 GLIBC_2.1 aio_return64 F
+GLIBC_2.1 aio_suspend F
+GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 alphasort64 F
 GLIBC_2.1 argp_err_exit_status D 0x4
 GLIBC_2.1 argp_error F
@@ -2433,6 +2435,7 @@  GLIBC_2.33 stat F
 GLIBC_2.33 stat64 F
 GLIBC_2.34 ___adjtimex64 F
 GLIBC_2.34 __adjtime64 F
+GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __clock_adjtime64 F
 GLIBC_2.34 __clock_getres64 F
 GLIBC_2.34 __clock_gettime64 F
@@ -2530,6 +2533,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
index 22d277a32e..40a27cfd26 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
@@ -644,6 +644,8 @@  GLIBC_2.3 aio_read F
 GLIBC_2.3 aio_read64 F
 GLIBC_2.3 aio_return F
 GLIBC_2.3 aio_return64 F
+GLIBC_2.3 aio_suspend F
+GLIBC_2.3 aio_suspend64 F
 GLIBC_2.3 alarm F
 GLIBC_2.3 alphasort F
 GLIBC_2.3 alphasort64 F
@@ -2267,6 +2269,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/librt.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/librt.abilist
index b98e7cf9de..205c9536b4 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/librt.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/librt.abilist
@@ -1,5 +1,3 @@ 
-GLIBC_2.3 aio_suspend F
-GLIBC_2.3 aio_suspend64 F
 GLIBC_2.3 aio_write F
 GLIBC_2.3 aio_write64 F
 GLIBC_2.3 lio_listio F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
index 15b0f5e367..208096bebf 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
@@ -688,6 +688,8 @@  GLIBC_2.17 aio_read F
 GLIBC_2.17 aio_read64 F
 GLIBC_2.17 aio_return F
 GLIBC_2.17 aio_return64 F
+GLIBC_2.17 aio_suspend F
+GLIBC_2.17 aio_suspend64 F
 GLIBC_2.17 alarm F
 GLIBC_2.17 aligned_alloc F
 GLIBC_2.17 alphasort F
@@ -2566,6 +2568,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/librt.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/librt.abilist
index 451560dc87..37ff014ed8 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/librt.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/librt.abilist
@@ -1,6 +1,4 @@ 
 GLIBC_2.17 __mq_open_2 F
-GLIBC_2.17 aio_suspend F
-GLIBC_2.17 aio_suspend64 F
 GLIBC_2.17 aio_write F
 GLIBC_2.17 aio_write64 F
 GLIBC_2.17 lio_listio F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
index 6003434931..20b4b7c0ad 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
@@ -555,6 +555,8 @@  GLIBC_2.33 aio_read F
 GLIBC_2.33 aio_read64 F
 GLIBC_2.33 aio_return F
 GLIBC_2.33 aio_return64 F
+GLIBC_2.33 aio_suspend F
+GLIBC_2.33 aio_suspend64 F
 GLIBC_2.33 alarm F
 GLIBC_2.33 aligned_alloc F
 GLIBC_2.33 alphasort F
@@ -2131,6 +2133,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/librt.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/librt.abilist
index dc23391407..51c25c849d 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/librt.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/librt.abilist
@@ -1,6 +1,4 @@ 
 GLIBC_2.33 __mq_open_2 F
-GLIBC_2.33 aio_suspend F
-GLIBC_2.33 aio_suspend64 F
 GLIBC_2.33 aio_write F
 GLIBC_2.33 aio_write64 F
 GLIBC_2.33 lio_listio F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
index 5041f05217..9675d2f767 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
@@ -581,6 +581,8 @@  GLIBC_2.27 aio_read F
 GLIBC_2.27 aio_read64 F
 GLIBC_2.27 aio_return F
 GLIBC_2.27 aio_return64 F
+GLIBC_2.27 aio_suspend F
+GLIBC_2.27 aio_suspend64 F
 GLIBC_2.27 alarm F
 GLIBC_2.27 aligned_alloc F
 GLIBC_2.27 alphasort F
@@ -2331,6 +2333,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/librt.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/librt.abilist
index 5f1cecd612..7ccf2b6591 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/librt.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/librt.abilist
@@ -1,6 +1,4 @@ 
 GLIBC_2.27 __mq_open_2 F
-GLIBC_2.27 aio_suspend F
-GLIBC_2.27 aio_suspend64 F
 GLIBC_2.27 aio_write F
 GLIBC_2.27 aio_write64 F
 GLIBC_2.27 lio_listio F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
index ed6c511cc9..3f64ebb9bd 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
@@ -1483,6 +1483,8 @@  GLIBC_2.1 aio_read F
 GLIBC_2.1 aio_read64 F
 GLIBC_2.1 aio_return F
 GLIBC_2.1 aio_return64 F
+GLIBC_2.1 aio_suspend F
+GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 alphasort64 F
 GLIBC_2.1 argp_err_exit_status D 0x4
 GLIBC_2.1 argp_error F
@@ -2398,6 +2400,7 @@  GLIBC_2.33 stat F
 GLIBC_2.33 stat64 F
 GLIBC_2.34 ___adjtimex64 F
 GLIBC_2.34 __adjtime64 F
+GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __clock_adjtime64 F
 GLIBC_2.34 __clock_getres64 F
 GLIBC_2.34 __clock_gettime64 F
@@ -2495,6 +2498,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/librt.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/librt.abilist
index 4cae24e768..b9b9b71dba 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/librt.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/librt.abilist
@@ -1,5 +1,3 @@ 
-GLIBC_2.1 aio_suspend F
-GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 aio_write F
 GLIBC_2.1 aio_write64 F
 GLIBC_2.1 lio_listio F
@@ -19,7 +17,6 @@  GLIBC_2.3.4 mq_setattr F
 GLIBC_2.3.4 mq_timedreceive F
 GLIBC_2.3.4 mq_timedsend F
 GLIBC_2.3.4 mq_unlink F
-GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __mq_timedreceive_time64 F
 GLIBC_2.34 __mq_timedsend_time64 F
 GLIBC_2.34 __timer_gettime64 F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
index 9f1e31574e..f727420c0a 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
@@ -581,6 +581,8 @@  GLIBC_2.2 aio_read F
 GLIBC_2.2 aio_read64 F
 GLIBC_2.2 aio_return F
 GLIBC_2.2 aio_return64 F
+GLIBC_2.2 aio_suspend F
+GLIBC_2.2 aio_suspend64 F
 GLIBC_2.2 alarm F
 GLIBC_2.2 alphasort F
 GLIBC_2.2 alphasort64 F
@@ -2304,6 +2306,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/librt.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/librt.abilist
index 2442ed5222..15c2ca3e70 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/librt.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/librt.abilist
@@ -1,5 +1,3 @@ 
-GLIBC_2.2 aio_suspend F
-GLIBC_2.2 aio_suspend64 F
 GLIBC_2.2 aio_write F
 GLIBC_2.2 aio_write64 F
 GLIBC_2.2 lio_listio F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
index b9e583fa88..3aed85ad55 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
@@ -18,6 +18,8 @@  GLIBC_2.1 aio_read F
 GLIBC_2.1 aio_read64 F
 GLIBC_2.1 aio_return F
 GLIBC_2.1 aio_return64 F
+GLIBC_2.1 aio_suspend F
+GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 dlopen F
 GLIBC_2.1 dlvsym F
 GLIBC_2.10 __cxa_at_quick_exit F
@@ -2253,6 +2255,7 @@  GLIBC_2.33 stat F
 GLIBC_2.33 stat64 F
 GLIBC_2.34 ___adjtimex64 F
 GLIBC_2.34 __adjtime64 F
+GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __clock_adjtime64 F
 GLIBC_2.34 __clock_getres64 F
 GLIBC_2.34 __clock_gettime64 F
@@ -2350,6 +2353,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/sh/be/librt.abilist b/sysdeps/unix/sysv/linux/sh/be/librt.abilist
index 4cae24e768..b9b9b71dba 100644
--- a/sysdeps/unix/sysv/linux/sh/be/librt.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/librt.abilist
@@ -1,5 +1,3 @@ 
-GLIBC_2.1 aio_suspend F
-GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 aio_write F
 GLIBC_2.1 aio_write64 F
 GLIBC_2.1 lio_listio F
@@ -19,7 +17,6 @@  GLIBC_2.3.4 mq_setattr F
 GLIBC_2.3.4 mq_timedreceive F
 GLIBC_2.3.4 mq_timedsend F
 GLIBC_2.3.4 mq_unlink F
-GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __mq_timedreceive_time64 F
 GLIBC_2.34 __mq_timedsend_time64 F
 GLIBC_2.34 __timer_gettime64 F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
index 2f737fadb8..eed02a7f07 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
@@ -18,6 +18,8 @@  GLIBC_2.1 aio_read F
 GLIBC_2.1 aio_read64 F
 GLIBC_2.1 aio_return F
 GLIBC_2.1 aio_return64 F
+GLIBC_2.1 aio_suspend F
+GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 dlopen F
 GLIBC_2.1 dlvsym F
 GLIBC_2.10 __cxa_at_quick_exit F
@@ -2250,6 +2252,7 @@  GLIBC_2.33 stat F
 GLIBC_2.33 stat64 F
 GLIBC_2.34 ___adjtimex64 F
 GLIBC_2.34 __adjtime64 F
+GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __clock_adjtime64 F
 GLIBC_2.34 __clock_getres64 F
 GLIBC_2.34 __clock_gettime64 F
@@ -2347,6 +2350,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/sh/le/librt.abilist b/sysdeps/unix/sysv/linux/sh/le/librt.abilist
index 4cae24e768..b9b9b71dba 100644
--- a/sysdeps/unix/sysv/linux/sh/le/librt.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/librt.abilist
@@ -1,5 +1,3 @@ 
-GLIBC_2.1 aio_suspend F
-GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 aio_write F
 GLIBC_2.1 aio_write64 F
 GLIBC_2.1 lio_listio F
@@ -19,7 +17,6 @@  GLIBC_2.3.4 mq_setattr F
 GLIBC_2.3.4 mq_timedreceive F
 GLIBC_2.3.4 mq_timedsend F
 GLIBC_2.3.4 mq_unlink F
-GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __mq_timedreceive_time64 F
 GLIBC_2.34 __mq_timedsend_time64 F
 GLIBC_2.34 __timer_gettime64 F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
index f4c87b4fa9..c627a8beb7 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
@@ -1485,6 +1485,8 @@  GLIBC_2.1 aio_read F
 GLIBC_2.1 aio_read64 F
 GLIBC_2.1 aio_return F
 GLIBC_2.1 aio_return64 F
+GLIBC_2.1 aio_suspend F
+GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 alphasort64 F
 GLIBC_2.1 argp_err_exit_status D 0x4
 GLIBC_2.1 argp_error F
@@ -2393,6 +2395,7 @@  GLIBC_2.33 stat F
 GLIBC_2.33 stat64 F
 GLIBC_2.34 ___adjtimex64 F
 GLIBC_2.34 __adjtime64 F
+GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __clock_adjtime64 F
 GLIBC_2.34 __clock_getres64 F
 GLIBC_2.34 __clock_gettime64 F
@@ -2490,6 +2493,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/librt.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/librt.abilist
index 6061373aae..13fff57eb0 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/librt.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/librt.abilist
@@ -1,5 +1,3 @@ 
-GLIBC_2.1 aio_suspend F
-GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 aio_write F
 GLIBC_2.1 aio_write64 F
 GLIBC_2.1 lio_listio F
@@ -20,7 +18,6 @@  GLIBC_2.3.4 mq_setattr F
 GLIBC_2.3.4 mq_timedreceive F
 GLIBC_2.3.4 mq_timedsend F
 GLIBC_2.3.4 mq_unlink F
-GLIBC_2.34 __aio_suspend_time64 F
 GLIBC_2.34 __mq_timedreceive_time64 F
 GLIBC_2.34 __mq_timedsend_time64 F
 GLIBC_2.34 __timer_gettime64 F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
index 03acd40463..574b4ef2c1 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
@@ -18,6 +18,8 @@  GLIBC_2.1 aio_read F
 GLIBC_2.1 aio_read64 F
 GLIBC_2.1 aio_return F
 GLIBC_2.1 aio_return64 F
+GLIBC_2.1 aio_suspend F
+GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 dlopen F
 GLIBC_2.1 dlvsym F
 GLIBC_2.10 __cxa_at_quick_exit F
@@ -2326,6 +2328,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/librt.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/librt.abilist
index 90a66e4a4b..8a8fe654e0 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/librt.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/librt.abilist
@@ -1,5 +1,3 @@ 
-GLIBC_2.1 aio_suspend F
-GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 aio_write F
 GLIBC_2.1 aio_write64 F
 GLIBC_2.1 lio_listio F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
index f81fe5301d..6e3c1ce83b 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
@@ -570,6 +570,8 @@  GLIBC_2.2.5 aio_read F
 GLIBC_2.2.5 aio_read64 F
 GLIBC_2.2.5 aio_return F
 GLIBC_2.2.5 aio_return64 F
+GLIBC_2.2.5 aio_suspend F
+GLIBC_2.2.5 aio_suspend64 F
 GLIBC_2.2.5 alarm F
 GLIBC_2.2.5 alphasort F
 GLIBC_2.2.5 alphasort64 F
@@ -2282,6 +2284,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/librt.abilist b/sysdeps/unix/sysv/linux/x86_64/64/librt.abilist
index 62fe3da2cb..c2e8ab87d0 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/librt.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/librt.abilist
@@ -1,5 +1,3 @@ 
-GLIBC_2.2.5 aio_suspend F
-GLIBC_2.2.5 aio_suspend64 F
 GLIBC_2.2.5 aio_write F
 GLIBC_2.2.5 aio_write64 F
 GLIBC_2.2.5 lio_listio F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
index 45d74a3958..42376975e6 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
@@ -603,6 +603,8 @@  GLIBC_2.16 aio_read F
 GLIBC_2.16 aio_read64 F
 GLIBC_2.16 aio_return F
 GLIBC_2.16 aio_return64 F
+GLIBC_2.16 aio_suspend F
+GLIBC_2.16 aio_suspend64 F
 GLIBC_2.16 alarm F
 GLIBC_2.16 aligned_alloc F
 GLIBC_2.16 alphasort F
@@ -2385,6 +2387,8 @@  GLIBC_2.34 aio_read F
 GLIBC_2.34 aio_read64 F
 GLIBC_2.34 aio_return F
 GLIBC_2.34 aio_return64 F
+GLIBC_2.34 aio_suspend F
+GLIBC_2.34 aio_suspend64 F
 GLIBC_2.34 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/librt.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/librt.abilist
index a531990038..f7245c6716 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/librt.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/librt.abilist
@@ -1,6 +1,4 @@ 
 GLIBC_2.16 __mq_open_2 F
-GLIBC_2.16 aio_suspend F
-GLIBC_2.16 aio_suspend64 F
 GLIBC_2.16 aio_write F
 GLIBC_2.16 aio_write64 F
 GLIBC_2.16 lio_listio F