diff mbox series

[15/34] Linux: Move aio_return, aio_return64 into libc

Message ID 8687a68356f6b962237f60a1318672053a241818.1623956057.git.fweimer@redhat.com
State Committed
Commit 406fb327fb3b617d6abdd54bed2967c2a9f384c4
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.
---
 rt/Makefile                                       |  2 +-
 rt/Versions                                       |  6 +++++-
 rt/aio_return.c                                   | 15 +++++++++++++--
 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       |  4 ++++
 sysdeps/unix/sysv/linux/arm/be/librt.abilist      |  2 --
 sysdeps/unix/sysv/linux/arm/le/libc.abilist       |  4 ++++
 sysdeps/unix/sysv/linux/arm/le/librt.abilist      |  2 --
 sysdeps/unix/sysv/linux/csky/libc.abilist         |  4 ++++
 sysdeps/unix/sysv/linux/csky/librt.abilist        |  2 --
 sysdeps/unix/sysv/linux/hppa/libc.abilist         |  4 ++++
 sysdeps/unix/sysv/linux/hppa/librt.abilist        |  2 --
 sysdeps/unix/sysv/linux/i386/libc.abilist         |  4 ++++
 sysdeps/unix/sysv/linux/i386/librt.abilist        |  2 --
 sysdeps/unix/sysv/linux/ia64/libc.abilist         |  4 ++++
 sysdeps/unix/sysv/linux/ia64/librt.abilist        |  2 --
 .../unix/sysv/linux/m68k/coldfire/libc.abilist    |  4 ++++
 .../unix/sysv/linux/m68k/coldfire/librt.abilist   |  2 --
 sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist  |  4 ++++
 sysdeps/unix/sysv/linux/m68k/m680x0/librt.abilist |  2 --
 .../unix/sysv/linux/microblaze/be/libc.abilist    |  4 ++++
 .../unix/sysv/linux/microblaze/be/librt.abilist   |  2 --
 .../unix/sysv/linux/microblaze/le/libc.abilist    |  4 ++++
 .../unix/sysv/linux/microblaze/le/librt.abilist   |  2 --
 .../unix/sysv/linux/mips/mips32/fpu/libc.abilist  |  4 ++++
 sysdeps/unix/sysv/linux/mips/mips32/librt.abilist |  2 --
 .../sysv/linux/mips/mips32/nofpu/libc.abilist     |  4 ++++
 .../unix/sysv/linux/mips/mips64/n32/libc.abilist  |  4 ++++
 .../unix/sysv/linux/mips/mips64/n32/librt.abilist |  2 --
 .../unix/sysv/linux/mips/mips64/n64/libc.abilist  |  4 ++++
 .../unix/sysv/linux/mips/mips64/n64/librt.abilist |  2 --
 sysdeps/unix/sysv/linux/nios2/libc.abilist        |  4 ++++
 sysdeps/unix/sysv/linux/nios2/librt.abilist       |  2 --
 .../sysv/linux/powerpc/powerpc32/fpu/libc.abilist |  4 ++++
 .../sysv/linux/powerpc/powerpc32/librt.abilist    |  2 --
 .../linux/powerpc/powerpc32/nofpu/libc.abilist    |  4 ++++
 .../sysv/linux/powerpc/powerpc64/be/libc.abilist  |  4 ++++
 .../sysv/linux/powerpc/powerpc64/be/librt.abilist |  2 --
 .../sysv/linux/powerpc/powerpc64/le/libc.abilist  |  4 ++++
 .../sysv/linux/powerpc/powerpc64/le/librt.abilist |  2 --
 sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist   |  4 ++++
 sysdeps/unix/sysv/linux/riscv/rv32/librt.abilist  |  2 --
 sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist   |  4 ++++
 sysdeps/unix/sysv/linux/riscv/rv64/librt.abilist  |  2 --
 sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist |  4 ++++
 .../unix/sysv/linux/s390/s390-32/librt.abilist    |  2 --
 sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist |  4 ++++
 .../unix/sysv/linux/s390/s390-64/librt.abilist    |  2 --
 sysdeps/unix/sysv/linux/sh/be/libc.abilist        |  4 ++++
 sysdeps/unix/sysv/linux/sh/be/librt.abilist       |  2 --
 sysdeps/unix/sysv/linux/sh/le/libc.abilist        |  4 ++++
 sysdeps/unix/sysv/linux/sh/le/librt.abilist       |  2 --
 .../unix/sysv/linux/sparc/sparc32/libc.abilist    |  4 ++++
 .../unix/sysv/linux/sparc/sparc32/librt.abilist   |  2 --
 .../unix/sysv/linux/sparc/sparc64/libc.abilist    |  4 ++++
 .../unix/sysv/linux/sparc/sparc64/librt.abilist   |  2 --
 sysdeps/unix/sysv/linux/x86_64/64/libc.abilist    |  4 ++++
 sysdeps/unix/sysv/linux/x86_64/64/librt.abilist   |  2 --
 sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist   |  4 ++++
 sysdeps/unix/sysv/linux/x86_64/x32/librt.abilist  |  2 --
 65 files changed, 147 insertions(+), 64 deletions(-)

Comments

Adhemerval Zanella Netto June 23, 2021, 7:44 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.

LGTM, thanks.

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

> ---
>  rt/Makefile                                       |  2 +-
>  rt/Versions                                       |  6 +++++-
>  rt/aio_return.c                                   | 15 +++++++++++++--
>  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       |  4 ++++
>  sysdeps/unix/sysv/linux/arm/be/librt.abilist      |  2 --
>  sysdeps/unix/sysv/linux/arm/le/libc.abilist       |  4 ++++
>  sysdeps/unix/sysv/linux/arm/le/librt.abilist      |  2 --
>  sysdeps/unix/sysv/linux/csky/libc.abilist         |  4 ++++
>  sysdeps/unix/sysv/linux/csky/librt.abilist        |  2 --
>  sysdeps/unix/sysv/linux/hppa/libc.abilist         |  4 ++++
>  sysdeps/unix/sysv/linux/hppa/librt.abilist        |  2 --
>  sysdeps/unix/sysv/linux/i386/libc.abilist         |  4 ++++
>  sysdeps/unix/sysv/linux/i386/librt.abilist        |  2 --
>  sysdeps/unix/sysv/linux/ia64/libc.abilist         |  4 ++++
>  sysdeps/unix/sysv/linux/ia64/librt.abilist        |  2 --
>  .../unix/sysv/linux/m68k/coldfire/libc.abilist    |  4 ++++
>  .../unix/sysv/linux/m68k/coldfire/librt.abilist   |  2 --
>  sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist  |  4 ++++
>  sysdeps/unix/sysv/linux/m68k/m680x0/librt.abilist |  2 --
>  .../unix/sysv/linux/microblaze/be/libc.abilist    |  4 ++++
>  .../unix/sysv/linux/microblaze/be/librt.abilist   |  2 --
>  .../unix/sysv/linux/microblaze/le/libc.abilist    |  4 ++++
>  .../unix/sysv/linux/microblaze/le/librt.abilist   |  2 --
>  .../unix/sysv/linux/mips/mips32/fpu/libc.abilist  |  4 ++++
>  sysdeps/unix/sysv/linux/mips/mips32/librt.abilist |  2 --
>  .../sysv/linux/mips/mips32/nofpu/libc.abilist     |  4 ++++
>  .../unix/sysv/linux/mips/mips64/n32/libc.abilist  |  4 ++++
>  .../unix/sysv/linux/mips/mips64/n32/librt.abilist |  2 --
>  .../unix/sysv/linux/mips/mips64/n64/libc.abilist  |  4 ++++
>  .../unix/sysv/linux/mips/mips64/n64/librt.abilist |  2 --
>  sysdeps/unix/sysv/linux/nios2/libc.abilist        |  4 ++++
>  sysdeps/unix/sysv/linux/nios2/librt.abilist       |  2 --
>  .../sysv/linux/powerpc/powerpc32/fpu/libc.abilist |  4 ++++
>  .../sysv/linux/powerpc/powerpc32/librt.abilist    |  2 --
>  .../linux/powerpc/powerpc32/nofpu/libc.abilist    |  4 ++++
>  .../sysv/linux/powerpc/powerpc64/be/libc.abilist  |  4 ++++
>  .../sysv/linux/powerpc/powerpc64/be/librt.abilist |  2 --
>  .../sysv/linux/powerpc/powerpc64/le/libc.abilist  |  4 ++++
>  .../sysv/linux/powerpc/powerpc64/le/librt.abilist |  2 --
>  sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist   |  4 ++++
>  sysdeps/unix/sysv/linux/riscv/rv32/librt.abilist  |  2 --
>  sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist   |  4 ++++
>  sysdeps/unix/sysv/linux/riscv/rv64/librt.abilist  |  2 --
>  sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist |  4 ++++
>  .../unix/sysv/linux/s390/s390-32/librt.abilist    |  2 --
>  sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist |  4 ++++
>  .../unix/sysv/linux/s390/s390-64/librt.abilist    |  2 --
>  sysdeps/unix/sysv/linux/sh/be/libc.abilist        |  4 ++++
>  sysdeps/unix/sysv/linux/sh/be/librt.abilist       |  2 --
>  sysdeps/unix/sysv/linux/sh/le/libc.abilist        |  4 ++++
>  sysdeps/unix/sysv/linux/sh/le/librt.abilist       |  2 --
>  .../unix/sysv/linux/sparc/sparc32/libc.abilist    |  4 ++++
>  .../unix/sysv/linux/sparc/sparc32/librt.abilist   |  2 --
>  .../unix/sysv/linux/sparc/sparc64/libc.abilist    |  4 ++++
>  .../unix/sysv/linux/sparc/sparc64/librt.abilist   |  2 --
>  sysdeps/unix/sysv/linux/x86_64/64/libc.abilist    |  4 ++++
>  sysdeps/unix/sysv/linux/x86_64/64/librt.abilist   |  2 --
>  sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist   |  4 ++++
>  sysdeps/unix/sysv/linux/x86_64/x32/librt.abilist  |  2 --
>  65 files changed, 147 insertions(+), 64 deletions(-)
> 
> diff --git a/rt/Makefile b/rt/Makefile
> index f080be56d5..810599a736 100644
> --- a/rt/Makefile
> +++ b/rt/Makefile
> @@ -29,7 +29,6 @@ routines = \
>    shm_unlink \
>  
>  librt-routines = \
> -  aio_return \
>    aio_suspend \
>    aio_write \
>    aio_write64 \
> @@ -62,6 +61,7 @@ $(librt-routines-var) += \
>    aio_notify \
>    aio_read \
>    aio_read64 \
> +  aio_return \
>    aio_sigqueue \
>  
>  tests := tst-shm tst-timer tst-timer2 \

Ok.

> diff --git a/rt/Versions b/rt/Versions
> index 6db40bebc4..0780dc8400 100644
> --- a/rt/Versions
> +++ b/rt/Versions
> @@ -10,6 +10,8 @@ libc {
>      aio_fsync64;
>      aio_read;
>      aio_read64;
> +    aio_return;
> +    aio_return64;
>  %endif
>    }
>    GLIBC_2.2 {
> @@ -27,6 +29,8 @@ libc {
>      aio_fsync64;
>      aio_read;
>      aio_read64;
> +    aio_return;
> +    aio_return64;
>  %endif
>      shm_open;
>      shm_unlink;
> @@ -57,9 +61,9 @@ librt {
>      aio_init;
>      aio_read;
>      aio_read64;
> -%endif
>      aio_return;
>      aio_return64;
> +%endif
>      aio_suspend;
>      aio_suspend64;
>      aio_write;

Ok.

> diff --git a/rt/aio_return.c b/rt/aio_return.c
> index cc50719dcb..a7a0b141d2 100644
> --- a/rt/aio_return.c
> +++ b/rt/aio_return.c
> @@ -28,11 +28,22 @@
>  /* And undo the hack.  */
>  #undef aio_return64
>  
> +#include <shlib-compat.h>
>  
>  ssize_t
> -aio_return (struct aiocb *aiocbp)
> +__aio_return (struct aiocb *aiocbp)
>  {
>    return aiocbp->__return_value;
>  }
>  
> -weak_alias (aio_return, aio_return64)
> +#if PTHREAD_IN_LIBC
> +versioned_symbol (libc, __aio_return, aio_return, GLIBC_2_34);
> +versioned_symbol (libc, __aio_return, aio_return64, GLIBC_2_34);
> +# if OTHER_SHLIB_COMPAT (librt, GLIBC_2_1, GLIBC_2_34)
> +compat_symbol (librt, __aio_return, aio_return, GLIBC_2_1);
> +compat_symbol (librt, __aio_return, aio_return64, GLIBC_2_1);
> +# endif
> +#else /* !PTHREAD_IN_LIBC */
> +strong_alias (__aio_return, aio_return)
> +weak_alias (__aio_return, aio_return64)
> +#endif

Ok.

> diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> index d210f88f0e..79405d26e9 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> @@ -598,6 +598,8 @@ GLIBC_2.17 aio_fsync64 F
>  GLIBC_2.17 aio_init F
>  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 alarm F
>  GLIBC_2.17 aligned_alloc F
>  GLIBC_2.17 alphasort F
> @@ -2366,6 +2368,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 58a853230e..451560dc87 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_return F
> -GLIBC_2.17 aio_return64 F
>  GLIBC_2.17 aio_suspend F
>  GLIBC_2.17 aio_suspend64 F
>  GLIBC_2.17 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
> index 08ea11c9fe..f6fa8966f8 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
> @@ -1511,6 +1511,8 @@ GLIBC_2.1 aio_fsync64 F
>  GLIBC_2.1 aio_init F
>  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 alphasort64 F
>  GLIBC_2.1 argp_err_exit_status D 0x4
>  GLIBC_2.1 argp_error F
> @@ -2461,6 +2463,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 2afa483191..90a66e4a4b 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_return F
> -GLIBC_2.1 aio_return64 F
>  GLIBC_2.1 aio_suspend F
>  GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
> index 817c4c6ff0..a5c1df7eaf 100644
> --- a/sysdeps/unix/sysv/linux/arc/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
> @@ -559,6 +559,8 @@ GLIBC_2.32 aio_fsync64 F
>  GLIBC_2.32 aio_init F
>  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 alarm F
>  GLIBC_2.32 aligned_alloc F
>  GLIBC_2.32 alphasort F
> @@ -2125,6 +2127,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 e49be2ff36..9cac9c759b 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_return F
> -GLIBC_2.32 aio_return64 F
>  GLIBC_2.32 aio_suspend F
>  GLIBC_2.32 aio_suspend64 F
>  GLIBC_2.32 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> index 0be92527af..1928717cfd 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> @@ -287,6 +287,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> @@ -999,6 +1001,8 @@ GLIBC_2.4 aio_fsync64 F
>  GLIBC_2.4 aio_init F
>  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 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 9a68bb887b..05957aae03 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/librt.abilist
> @@ -3,8 +3,6 @@ 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_return F
> -GLIBC_2.4 aio_return64 F
>  GLIBC_2.4 aio_suspend F
>  GLIBC_2.4 aio_suspend64 F
>  GLIBC_2.4 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> index 615b37769a..bee5d9f757 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> @@ -284,6 +284,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> @@ -996,6 +998,8 @@ GLIBC_2.4 aio_fsync64 F
>  GLIBC_2.4 aio_init F
>  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 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 9a68bb887b..05957aae03 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/librt.abilist
> @@ -3,8 +3,6 @@ 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_return F
> -GLIBC_2.4 aio_return64 F
>  GLIBC_2.4 aio_suspend F
>  GLIBC_2.4 aio_suspend64 F
>  GLIBC_2.4 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist
> index e77bb5b57b..753f54085a 100644
> --- a/sysdeps/unix/sysv/linux/csky/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libc.abilist
> @@ -573,6 +573,8 @@ GLIBC_2.29 aio_fsync64 F
>  GLIBC_2.29 aio_init F
>  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 alarm F
>  GLIBC_2.29 aligned_alloc F
>  GLIBC_2.29 alphasort F
> @@ -2385,6 +2387,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 93475f5bd5..74fc5621d6 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_return F
> -GLIBC_2.29 aio_return64 F
>  GLIBC_2.29 aio_suspend F
>  GLIBC_2.29 aio_suspend64 F
>  GLIBC_2.29 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
> index 12704a350a..4a96fcfb39 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
> @@ -12,6 +12,8 @@ GLIBC_2.1 aio_fsync64 F
>  GLIBC_2.1 aio_init F
>  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 dlopen F
>  GLIBC_2.1 dlvsym F
>  GLIBC_2.10 __cxa_at_quick_exit F
> @@ -2339,6 +2341,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 0402dcddcc..4cae24e768 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_return F
> -GLIBC_2.1 aio_return64 F
>  GLIBC_2.1 aio_suspend F
>  GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
> index 67d1fbcade..b704bf4756 100644
> --- a/sysdeps/unix/sysv/linux/i386/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
> @@ -1484,6 +1484,8 @@ GLIBC_2.1 aio_fsync64 F
>  GLIBC_2.1 aio_init F
>  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 alphasort64 F
>  GLIBC_2.1 argp_err_exit_status D 0x4
>  GLIBC_2.1 argp_error F
> @@ -2523,6 +2525,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 0402dcddcc..4cae24e768 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_return F
> -GLIBC_2.1 aio_return64 F
>  GLIBC_2.1 aio_suspend F
>  GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
> index 83d6bbfdf2..08bea0c72f 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
> @@ -12,6 +12,8 @@ GLIBC_2.1 aio_fsync64 F
>  GLIBC_2.1 aio_init F
>  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 dlopen F
>  GLIBC_2.1 dlvsym F
>  GLIBC_2.10 __cxa_at_quick_exit F
> @@ -2299,6 +2301,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 152692a5a6..ac9f293b6b 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_return F
> -GLIBC_2.1 aio_return64 F
>  GLIBC_2.1 aio_suspend F
>  GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> index 537df59369..187672fa76 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> @@ -288,6 +288,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 call_once F
>  GLIBC_2.34 cnd_broadcast F
>  GLIBC_2.34 cnd_destroy F
> @@ -987,6 +989,8 @@ GLIBC_2.4 aio_fsync64 F
>  GLIBC_2.4 aio_init F
>  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 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 9a68bb887b..05957aae03 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist
> @@ -3,8 +3,6 @@ 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_return F
> -GLIBC_2.4 aio_return64 F
>  GLIBC_2.4 aio_suspend F
>  GLIBC_2.4 aio_suspend64 F
>  GLIBC_2.4 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> index fefee687b2..379779793c 100644
> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> @@ -1482,6 +1482,8 @@ GLIBC_2.1 aio_fsync64 F
>  GLIBC_2.1 aio_init F
>  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 alphasort64 F
>  GLIBC_2.1 argp_err_exit_status D 0x4
>  GLIBC_2.1 argp_error F
> @@ -2466,6 +2468,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 0402dcddcc..4cae24e768 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_return F
> -GLIBC_2.1 aio_return64 F
>  GLIBC_2.1 aio_suspend F
>  GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> index 635b62cd31..2fce5d9138 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> @@ -600,6 +600,8 @@ GLIBC_2.18 aio_fsync64 F
>  GLIBC_2.18 aio_init F
>  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 alarm F
>  GLIBC_2.18 aligned_alloc F
>  GLIBC_2.18 alphasort F
> @@ -2436,6 +2438,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 34f5bc3964..1503d19eae 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_return F
> -GLIBC_2.18 aio_return64 F
>  GLIBC_2.18 aio_suspend F
>  GLIBC_2.18 aio_suspend64 F
>  GLIBC_2.18 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> index cce81d50da..6c3cd2a9e3 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> @@ -600,6 +600,8 @@ GLIBC_2.18 aio_fsync64 F
>  GLIBC_2.18 aio_init F
>  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 alarm F
>  GLIBC_2.18 aligned_alloc F
>  GLIBC_2.18 alphasort F
> @@ -2433,6 +2435,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 34f5bc3964..1503d19eae 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_return F
> -GLIBC_2.18 aio_return64 F
>  GLIBC_2.18 aio_suspend F
>  GLIBC_2.18 aio_suspend64 F
>  GLIBC_2.18 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> index d4e0f597ba..46aa64baaa 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> @@ -1660,6 +1660,8 @@ GLIBC_2.2 aio_fsync64 F
>  GLIBC_2.2 aio_init F
>  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 alphasort64 F
>  GLIBC_2.2 argp_err_exit_status D 0x4
>  GLIBC_2.2 argp_error F
> @@ -2431,6 +2433,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 d886f0376c..2b7c3cabec 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_return F
> -GLIBC_2.2 aio_return64 F
>  GLIBC_2.2 aio_suspend F
>  GLIBC_2.2 aio_suspend64 F
>  GLIBC_2.2 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> index 757c40c34c..169b386cc1 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> @@ -1658,6 +1658,8 @@ GLIBC_2.2 aio_fsync64 F
>  GLIBC_2.2 aio_init F
>  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 alphasort64 F
>  GLIBC_2.2 argp_err_exit_status D 0x4
>  GLIBC_2.2 argp_error F
> @@ -2429,6 +2431,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 d1c919b14f..ad52c15c3e 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> @@ -1659,6 +1659,8 @@ GLIBC_2.2 aio_fsync64 F
>  GLIBC_2.2 aio_init F
>  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 alphasort64 F
>  GLIBC_2.2 argp_err_exit_status D 0x4
>  GLIBC_2.2 argp_error F
> @@ -2437,6 +2439,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 d886f0376c..2b7c3cabec 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_return F
> -GLIBC_2.2 aio_return64 F
>  GLIBC_2.2 aio_suspend F
>  GLIBC_2.2 aio_suspend64 F
>  GLIBC_2.2 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> index 6c3dd08461..16a67a0d6d 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> @@ -1655,6 +1655,8 @@ GLIBC_2.2 aio_fsync64 F
>  GLIBC_2.2 aio_init F
>  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 alphasort64 F
>  GLIBC_2.2 argp_err_exit_status D 0x4
>  GLIBC_2.2 argp_error F
> @@ -2355,6 +2357,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 6c94c34024..293b92eaec 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_return F
> -GLIBC_2.2 aio_return64 F
>  GLIBC_2.2 aio_suspend F
>  GLIBC_2.2 aio_suspend64 F
>  GLIBC_2.2 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
> index 160e1d491e..3567fa8efc 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
> @@ -642,6 +642,8 @@ GLIBC_2.21 aio_fsync64 F
>  GLIBC_2.21 aio_init F
>  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 alarm F
>  GLIBC_2.21 aligned_alloc F
>  GLIBC_2.21 alphasort F
> @@ -2475,6 +2477,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 7d197b8c5d..b63036c526 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_return F
> -GLIBC_2.21 aio_return64 F
>  GLIBC_2.21 aio_suspend F
>  GLIBC_2.21 aio_suspend64 F
>  GLIBC_2.21 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> index 2923d162e0..0b393c0a5a 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> @@ -1489,6 +1489,8 @@ GLIBC_2.1 aio_fsync64 F
>  GLIBC_2.1 aio_init F
>  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 alphasort64 F
>  GLIBC_2.1 argp_err_exit_status D 0x4
>  GLIBC_2.1 argp_error F
> @@ -2493,6 +2495,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 0402dcddcc..4cae24e768 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_return F
> -GLIBC_2.1 aio_return64 F
>  GLIBC_2.1 aio_suspend F
>  GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> index b6feabe5e4..0bc73512d3 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> @@ -1489,6 +1489,8 @@ GLIBC_2.1 aio_fsync64 F
>  GLIBC_2.1 aio_init F
>  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 alphasort64 F
>  GLIBC_2.1 argp_err_exit_status D 0x4
>  GLIBC_2.1 argp_error F
> @@ -2526,6 +2528,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 b149e31698..22d277a32e 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> @@ -642,6 +642,8 @@ GLIBC_2.3 aio_fsync64 F
>  GLIBC_2.3 aio_init F
>  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 alarm F
>  GLIBC_2.3 alphasort F
>  GLIBC_2.3 alphasort64 F
> @@ -2263,6 +2265,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 d0ddb7852e..b98e7cf9de 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_return F
> -GLIBC_2.3 aio_return64 F
>  GLIBC_2.3 aio_suspend F
>  GLIBC_2.3 aio_suspend64 F
>  GLIBC_2.3 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> index 607abc7f32..15b0f5e367 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> @@ -686,6 +686,8 @@ GLIBC_2.17 aio_fsync64 F
>  GLIBC_2.17 aio_init F
>  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 alarm F
>  GLIBC_2.17 aligned_alloc F
>  GLIBC_2.17 alphasort F
> @@ -2562,6 +2564,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 58a853230e..451560dc87 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_return F
> -GLIBC_2.17 aio_return64 F
>  GLIBC_2.17 aio_suspend F
>  GLIBC_2.17 aio_suspend64 F
>  GLIBC_2.17 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> index de26c22e23..6003434931 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> @@ -553,6 +553,8 @@ GLIBC_2.33 aio_fsync64 F
>  GLIBC_2.33 aio_init F
>  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 alarm F
>  GLIBC_2.33 aligned_alloc F
>  GLIBC_2.33 alphasort F
> @@ -2127,6 +2129,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 8e15ebe652..dc23391407 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_return F
> -GLIBC_2.33 aio_return64 F
>  GLIBC_2.33 aio_suspend F
>  GLIBC_2.33 aio_suspend64 F
>  GLIBC_2.33 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> index d0ca205432..5041f05217 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> @@ -579,6 +579,8 @@ GLIBC_2.27 aio_fsync64 F
>  GLIBC_2.27 aio_init F
>  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 alarm F
>  GLIBC_2.27 aligned_alloc F
>  GLIBC_2.27 alphasort F
> @@ -2327,6 +2329,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 fe48c3cfea..5f1cecd612 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_return F
> -GLIBC_2.27 aio_return64 F
>  GLIBC_2.27 aio_suspend F
>  GLIBC_2.27 aio_suspend64 F
>  GLIBC_2.27 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> index a773148442..ed6c511cc9 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> @@ -1481,6 +1481,8 @@ GLIBC_2.1 aio_fsync64 F
>  GLIBC_2.1 aio_init F
>  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 alphasort64 F
>  GLIBC_2.1 argp_err_exit_status D 0x4
>  GLIBC_2.1 argp_error F
> @@ -2491,6 +2493,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 0402dcddcc..4cae24e768 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_return F
> -GLIBC_2.1 aio_return64 F
>  GLIBC_2.1 aio_suspend F
>  GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> index 14899f40f7..9f1e31574e 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> @@ -579,6 +579,8 @@ GLIBC_2.2 aio_fsync64 F
>  GLIBC_2.2 aio_init F
>  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 alarm F
>  GLIBC_2.2 alphasort F
>  GLIBC_2.2 alphasort64 F
> @@ -2300,6 +2302,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 a65683ca9d..2442ed5222 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_return F
> -GLIBC_2.2 aio_return64 F
>  GLIBC_2.2 aio_suspend F
>  GLIBC_2.2 aio_suspend64 F
>  GLIBC_2.2 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> index a255e3eeac..b9e583fa88 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> @@ -16,6 +16,8 @@ GLIBC_2.1 aio_fsync64 F
>  GLIBC_2.1 aio_init F
>  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 dlopen F
>  GLIBC_2.1 dlvsym F
>  GLIBC_2.10 __cxa_at_quick_exit F
> @@ -2346,6 +2348,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 0402dcddcc..4cae24e768 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_return F
> -GLIBC_2.1 aio_return64 F
>  GLIBC_2.1 aio_suspend F
>  GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> index 45c49ba662..2f737fadb8 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> @@ -16,6 +16,8 @@ GLIBC_2.1 aio_fsync64 F
>  GLIBC_2.1 aio_init F
>  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 dlopen F
>  GLIBC_2.1 dlvsym F
>  GLIBC_2.10 __cxa_at_quick_exit F
> @@ -2343,6 +2345,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 0402dcddcc..4cae24e768 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_return F
> -GLIBC_2.1 aio_return64 F
>  GLIBC_2.1 aio_suspend F
>  GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> index 07a68d78e3..f4c87b4fa9 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> @@ -1483,6 +1483,8 @@ GLIBC_2.1 aio_fsync64 F
>  GLIBC_2.1 aio_init F
>  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 alphasort64 F
>  GLIBC_2.1 argp_err_exit_status D 0x4
>  GLIBC_2.1 argp_error F
> @@ -2486,6 +2488,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 2202b8ef5f..6061373aae 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_return F
> -GLIBC_2.1 aio_return64 F
>  GLIBC_2.1 aio_suspend F
>  GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> index 8b549e7efc..03acd40463 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> @@ -16,6 +16,8 @@ GLIBC_2.1 aio_fsync64 F
>  GLIBC_2.1 aio_init F
>  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 dlopen F
>  GLIBC_2.1 dlvsym F
>  GLIBC_2.10 __cxa_at_quick_exit F
> @@ -2322,6 +2324,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 2afa483191..90a66e4a4b 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_return F
> -GLIBC_2.1 aio_return64 F
>  GLIBC_2.1 aio_suspend F
>  GLIBC_2.1 aio_suspend64 F
>  GLIBC_2.1 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> index e8d70016a6..f81fe5301d 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> @@ -568,6 +568,8 @@ GLIBC_2.2.5 aio_fsync64 F
>  GLIBC_2.2.5 aio_init F
>  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 alarm F
>  GLIBC_2.2.5 alphasort F
>  GLIBC_2.2.5 alphasort64 F
> @@ -2278,6 +2280,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 e9d2aeb05b..62fe3da2cb 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_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 aio_write F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> index 40921d5579..45d74a3958 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> @@ -601,6 +601,8 @@ GLIBC_2.16 aio_fsync64 F
>  GLIBC_2.16 aio_init F
>  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 alarm F
>  GLIBC_2.16 aligned_alloc F
>  GLIBC_2.16 alphasort F
> @@ -2381,6 +2383,8 @@ GLIBC_2.34 aio_fsync64 F
>  GLIBC_2.34 aio_init F
>  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 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 bbd0f42caa..a531990038 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_return F
> -GLIBC_2.16 aio_return64 F
>  GLIBC_2.16 aio_suspend F
>  GLIBC_2.16 aio_suspend64 F
>  GLIBC_2.16 aio_write F
> 

Ok.
diff mbox series

Patch

diff --git a/rt/Makefile b/rt/Makefile
index f080be56d5..810599a736 100644
--- a/rt/Makefile
+++ b/rt/Makefile
@@ -29,7 +29,6 @@  routines = \
   shm_unlink \
 
 librt-routines = \
-  aio_return \
   aio_suspend \
   aio_write \
   aio_write64 \
@@ -62,6 +61,7 @@  $(librt-routines-var) += \
   aio_notify \
   aio_read \
   aio_read64 \
+  aio_return \
   aio_sigqueue \
 
 tests := tst-shm tst-timer tst-timer2 \
diff --git a/rt/Versions b/rt/Versions
index 6db40bebc4..0780dc8400 100644
--- a/rt/Versions
+++ b/rt/Versions
@@ -10,6 +10,8 @@  libc {
     aio_fsync64;
     aio_read;
     aio_read64;
+    aio_return;
+    aio_return64;
 %endif
   }
   GLIBC_2.2 {
@@ -27,6 +29,8 @@  libc {
     aio_fsync64;
     aio_read;
     aio_read64;
+    aio_return;
+    aio_return64;
 %endif
     shm_open;
     shm_unlink;
@@ -57,9 +61,9 @@  librt {
     aio_init;
     aio_read;
     aio_read64;
-%endif
     aio_return;
     aio_return64;
+%endif
     aio_suspend;
     aio_suspend64;
     aio_write;
diff --git a/rt/aio_return.c b/rt/aio_return.c
index cc50719dcb..a7a0b141d2 100644
--- a/rt/aio_return.c
+++ b/rt/aio_return.c
@@ -28,11 +28,22 @@ 
 /* And undo the hack.  */
 #undef aio_return64
 
+#include <shlib-compat.h>
 
 ssize_t
-aio_return (struct aiocb *aiocbp)
+__aio_return (struct aiocb *aiocbp)
 {
   return aiocbp->__return_value;
 }
 
-weak_alias (aio_return, aio_return64)
+#if PTHREAD_IN_LIBC
+versioned_symbol (libc, __aio_return, aio_return, GLIBC_2_34);
+versioned_symbol (libc, __aio_return, aio_return64, GLIBC_2_34);
+# if OTHER_SHLIB_COMPAT (librt, GLIBC_2_1, GLIBC_2_34)
+compat_symbol (librt, __aio_return, aio_return, GLIBC_2_1);
+compat_symbol (librt, __aio_return, aio_return64, GLIBC_2_1);
+# endif
+#else /* !PTHREAD_IN_LIBC */
+strong_alias (__aio_return, aio_return)
+weak_alias (__aio_return, aio_return64)
+#endif
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index d210f88f0e..79405d26e9 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -598,6 +598,8 @@  GLIBC_2.17 aio_fsync64 F
 GLIBC_2.17 aio_init F
 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 alarm F
 GLIBC_2.17 aligned_alloc F
 GLIBC_2.17 alphasort F
@@ -2366,6 +2368,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 58a853230e..451560dc87 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_return F
-GLIBC_2.17 aio_return64 F
 GLIBC_2.17 aio_suspend F
 GLIBC_2.17 aio_suspend64 F
 GLIBC_2.17 aio_write F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index 08ea11c9fe..f6fa8966f8 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -1511,6 +1511,8 @@  GLIBC_2.1 aio_fsync64 F
 GLIBC_2.1 aio_init F
 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 alphasort64 F
 GLIBC_2.1 argp_err_exit_status D 0x4
 GLIBC_2.1 argp_error F
@@ -2461,6 +2463,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 2afa483191..90a66e4a4b 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_return F
-GLIBC_2.1 aio_return64 F
 GLIBC_2.1 aio_suspend F
 GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 aio_write F
diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
index 817c4c6ff0..a5c1df7eaf 100644
--- a/sysdeps/unix/sysv/linux/arc/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
@@ -559,6 +559,8 @@  GLIBC_2.32 aio_fsync64 F
 GLIBC_2.32 aio_init F
 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 alarm F
 GLIBC_2.32 aligned_alloc F
 GLIBC_2.32 alphasort F
@@ -2125,6 +2127,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 e49be2ff36..9cac9c759b 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_return F
-GLIBC_2.32 aio_return64 F
 GLIBC_2.32 aio_suspend F
 GLIBC_2.32 aio_suspend64 F
 GLIBC_2.32 aio_write F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
index 0be92527af..1928717cfd 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
@@ -287,6 +287,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
@@ -999,6 +1001,8 @@  GLIBC_2.4 aio_fsync64 F
 GLIBC_2.4 aio_init F
 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 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 9a68bb887b..05957aae03 100644
--- a/sysdeps/unix/sysv/linux/arm/be/librt.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/librt.abilist
@@ -3,8 +3,6 @@  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_return F
-GLIBC_2.4 aio_return64 F
 GLIBC_2.4 aio_suspend F
 GLIBC_2.4 aio_suspend64 F
 GLIBC_2.4 aio_write F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
index 615b37769a..bee5d9f757 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
@@ -284,6 +284,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
@@ -996,6 +998,8 @@  GLIBC_2.4 aio_fsync64 F
 GLIBC_2.4 aio_init F
 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 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 9a68bb887b..05957aae03 100644
--- a/sysdeps/unix/sysv/linux/arm/le/librt.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/librt.abilist
@@ -3,8 +3,6 @@  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_return F
-GLIBC_2.4 aio_return64 F
 GLIBC_2.4 aio_suspend F
 GLIBC_2.4 aio_suspend64 F
 GLIBC_2.4 aio_write F
diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist
index e77bb5b57b..753f54085a 100644
--- a/sysdeps/unix/sysv/linux/csky/libc.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libc.abilist
@@ -573,6 +573,8 @@  GLIBC_2.29 aio_fsync64 F
 GLIBC_2.29 aio_init F
 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 alarm F
 GLIBC_2.29 aligned_alloc F
 GLIBC_2.29 alphasort F
@@ -2385,6 +2387,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 93475f5bd5..74fc5621d6 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_return F
-GLIBC_2.29 aio_return64 F
 GLIBC_2.29 aio_suspend F
 GLIBC_2.29 aio_suspend64 F
 GLIBC_2.29 aio_write F
diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
index 12704a350a..4a96fcfb39 100644
--- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
@@ -12,6 +12,8 @@  GLIBC_2.1 aio_fsync64 F
 GLIBC_2.1 aio_init F
 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 dlopen F
 GLIBC_2.1 dlvsym F
 GLIBC_2.10 __cxa_at_quick_exit F
@@ -2339,6 +2341,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 0402dcddcc..4cae24e768 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_return F
-GLIBC_2.1 aio_return64 F
 GLIBC_2.1 aio_suspend F
 GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 aio_write F
diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
index 67d1fbcade..b704bf4756 100644
--- a/sysdeps/unix/sysv/linux/i386/libc.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
@@ -1484,6 +1484,8 @@  GLIBC_2.1 aio_fsync64 F
 GLIBC_2.1 aio_init F
 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 alphasort64 F
 GLIBC_2.1 argp_err_exit_status D 0x4
 GLIBC_2.1 argp_error F
@@ -2523,6 +2525,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 0402dcddcc..4cae24e768 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_return F
-GLIBC_2.1 aio_return64 F
 GLIBC_2.1 aio_suspend F
 GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 aio_write F
diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
index 83d6bbfdf2..08bea0c72f 100644
--- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
@@ -12,6 +12,8 @@  GLIBC_2.1 aio_fsync64 F
 GLIBC_2.1 aio_init F
 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 dlopen F
 GLIBC_2.1 dlvsym F
 GLIBC_2.10 __cxa_at_quick_exit F
@@ -2299,6 +2301,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 152692a5a6..ac9f293b6b 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_return F
-GLIBC_2.1 aio_return64 F
 GLIBC_2.1 aio_suspend F
 GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 aio_write F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
index 537df59369..187672fa76 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
@@ -288,6 +288,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 call_once F
 GLIBC_2.34 cnd_broadcast F
 GLIBC_2.34 cnd_destroy F
@@ -987,6 +989,8 @@  GLIBC_2.4 aio_fsync64 F
 GLIBC_2.4 aio_init F
 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 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 9a68bb887b..05957aae03 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist
@@ -3,8 +3,6 @@  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_return F
-GLIBC_2.4 aio_return64 F
 GLIBC_2.4 aio_suspend F
 GLIBC_2.4 aio_suspend64 F
 GLIBC_2.4 aio_write F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
index fefee687b2..379779793c 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
@@ -1482,6 +1482,8 @@  GLIBC_2.1 aio_fsync64 F
 GLIBC_2.1 aio_init F
 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 alphasort64 F
 GLIBC_2.1 argp_err_exit_status D 0x4
 GLIBC_2.1 argp_error F
@@ -2466,6 +2468,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 0402dcddcc..4cae24e768 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_return F
-GLIBC_2.1 aio_return64 F
 GLIBC_2.1 aio_suspend F
 GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 aio_write F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
index 635b62cd31..2fce5d9138 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
@@ -600,6 +600,8 @@  GLIBC_2.18 aio_fsync64 F
 GLIBC_2.18 aio_init F
 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 alarm F
 GLIBC_2.18 aligned_alloc F
 GLIBC_2.18 alphasort F
@@ -2436,6 +2438,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 34f5bc3964..1503d19eae 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_return F
-GLIBC_2.18 aio_return64 F
 GLIBC_2.18 aio_suspend F
 GLIBC_2.18 aio_suspend64 F
 GLIBC_2.18 aio_write F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
index cce81d50da..6c3cd2a9e3 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
@@ -600,6 +600,8 @@  GLIBC_2.18 aio_fsync64 F
 GLIBC_2.18 aio_init F
 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 alarm F
 GLIBC_2.18 aligned_alloc F
 GLIBC_2.18 alphasort F
@@ -2433,6 +2435,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 34f5bc3964..1503d19eae 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_return F
-GLIBC_2.18 aio_return64 F
 GLIBC_2.18 aio_suspend F
 GLIBC_2.18 aio_suspend64 F
 GLIBC_2.18 aio_write F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
index d4e0f597ba..46aa64baaa 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
@@ -1660,6 +1660,8 @@  GLIBC_2.2 aio_fsync64 F
 GLIBC_2.2 aio_init F
 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 alphasort64 F
 GLIBC_2.2 argp_err_exit_status D 0x4
 GLIBC_2.2 argp_error F
@@ -2431,6 +2433,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 d886f0376c..2b7c3cabec 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_return F
-GLIBC_2.2 aio_return64 F
 GLIBC_2.2 aio_suspend F
 GLIBC_2.2 aio_suspend64 F
 GLIBC_2.2 aio_write F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
index 757c40c34c..169b386cc1 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
@@ -1658,6 +1658,8 @@  GLIBC_2.2 aio_fsync64 F
 GLIBC_2.2 aio_init F
 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 alphasort64 F
 GLIBC_2.2 argp_err_exit_status D 0x4
 GLIBC_2.2 argp_error F
@@ -2429,6 +2431,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 d1c919b14f..ad52c15c3e 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
@@ -1659,6 +1659,8 @@  GLIBC_2.2 aio_fsync64 F
 GLIBC_2.2 aio_init F
 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 alphasort64 F
 GLIBC_2.2 argp_err_exit_status D 0x4
 GLIBC_2.2 argp_error F
@@ -2437,6 +2439,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 d886f0376c..2b7c3cabec 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_return F
-GLIBC_2.2 aio_return64 F
 GLIBC_2.2 aio_suspend F
 GLIBC_2.2 aio_suspend64 F
 GLIBC_2.2 aio_write F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
index 6c3dd08461..16a67a0d6d 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
@@ -1655,6 +1655,8 @@  GLIBC_2.2 aio_fsync64 F
 GLIBC_2.2 aio_init F
 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 alphasort64 F
 GLIBC_2.2 argp_err_exit_status D 0x4
 GLIBC_2.2 argp_error F
@@ -2355,6 +2357,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 6c94c34024..293b92eaec 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_return F
-GLIBC_2.2 aio_return64 F
 GLIBC_2.2 aio_suspend F
 GLIBC_2.2 aio_suspend64 F
 GLIBC_2.2 aio_write F
diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
index 160e1d491e..3567fa8efc 100644
--- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
@@ -642,6 +642,8 @@  GLIBC_2.21 aio_fsync64 F
 GLIBC_2.21 aio_init F
 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 alarm F
 GLIBC_2.21 aligned_alloc F
 GLIBC_2.21 alphasort F
@@ -2475,6 +2477,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 7d197b8c5d..b63036c526 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_return F
-GLIBC_2.21 aio_return64 F
 GLIBC_2.21 aio_suspend F
 GLIBC_2.21 aio_suspend64 F
 GLIBC_2.21 aio_write F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
index 2923d162e0..0b393c0a5a 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
@@ -1489,6 +1489,8 @@  GLIBC_2.1 aio_fsync64 F
 GLIBC_2.1 aio_init F
 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 alphasort64 F
 GLIBC_2.1 argp_err_exit_status D 0x4
 GLIBC_2.1 argp_error F
@@ -2493,6 +2495,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 0402dcddcc..4cae24e768 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_return F
-GLIBC_2.1 aio_return64 F
 GLIBC_2.1 aio_suspend F
 GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 aio_write F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
index b6feabe5e4..0bc73512d3 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
@@ -1489,6 +1489,8 @@  GLIBC_2.1 aio_fsync64 F
 GLIBC_2.1 aio_init F
 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 alphasort64 F
 GLIBC_2.1 argp_err_exit_status D 0x4
 GLIBC_2.1 argp_error F
@@ -2526,6 +2528,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 b149e31698..22d277a32e 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
@@ -642,6 +642,8 @@  GLIBC_2.3 aio_fsync64 F
 GLIBC_2.3 aio_init F
 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 alarm F
 GLIBC_2.3 alphasort F
 GLIBC_2.3 alphasort64 F
@@ -2263,6 +2265,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 d0ddb7852e..b98e7cf9de 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_return F
-GLIBC_2.3 aio_return64 F
 GLIBC_2.3 aio_suspend F
 GLIBC_2.3 aio_suspend64 F
 GLIBC_2.3 aio_write F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
index 607abc7f32..15b0f5e367 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
@@ -686,6 +686,8 @@  GLIBC_2.17 aio_fsync64 F
 GLIBC_2.17 aio_init F
 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 alarm F
 GLIBC_2.17 aligned_alloc F
 GLIBC_2.17 alphasort F
@@ -2562,6 +2564,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 58a853230e..451560dc87 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_return F
-GLIBC_2.17 aio_return64 F
 GLIBC_2.17 aio_suspend F
 GLIBC_2.17 aio_suspend64 F
 GLIBC_2.17 aio_write F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
index de26c22e23..6003434931 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
@@ -553,6 +553,8 @@  GLIBC_2.33 aio_fsync64 F
 GLIBC_2.33 aio_init F
 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 alarm F
 GLIBC_2.33 aligned_alloc F
 GLIBC_2.33 alphasort F
@@ -2127,6 +2129,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 8e15ebe652..dc23391407 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_return F
-GLIBC_2.33 aio_return64 F
 GLIBC_2.33 aio_suspend F
 GLIBC_2.33 aio_suspend64 F
 GLIBC_2.33 aio_write F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
index d0ca205432..5041f05217 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
@@ -579,6 +579,8 @@  GLIBC_2.27 aio_fsync64 F
 GLIBC_2.27 aio_init F
 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 alarm F
 GLIBC_2.27 aligned_alloc F
 GLIBC_2.27 alphasort F
@@ -2327,6 +2329,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 fe48c3cfea..5f1cecd612 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_return F
-GLIBC_2.27 aio_return64 F
 GLIBC_2.27 aio_suspend F
 GLIBC_2.27 aio_suspend64 F
 GLIBC_2.27 aio_write F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
index a773148442..ed6c511cc9 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
@@ -1481,6 +1481,8 @@  GLIBC_2.1 aio_fsync64 F
 GLIBC_2.1 aio_init F
 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 alphasort64 F
 GLIBC_2.1 argp_err_exit_status D 0x4
 GLIBC_2.1 argp_error F
@@ -2491,6 +2493,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 0402dcddcc..4cae24e768 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_return F
-GLIBC_2.1 aio_return64 F
 GLIBC_2.1 aio_suspend F
 GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 aio_write F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
index 14899f40f7..9f1e31574e 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
@@ -579,6 +579,8 @@  GLIBC_2.2 aio_fsync64 F
 GLIBC_2.2 aio_init F
 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 alarm F
 GLIBC_2.2 alphasort F
 GLIBC_2.2 alphasort64 F
@@ -2300,6 +2302,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 a65683ca9d..2442ed5222 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_return F
-GLIBC_2.2 aio_return64 F
 GLIBC_2.2 aio_suspend F
 GLIBC_2.2 aio_suspend64 F
 GLIBC_2.2 aio_write F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
index a255e3eeac..b9e583fa88 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
@@ -16,6 +16,8 @@  GLIBC_2.1 aio_fsync64 F
 GLIBC_2.1 aio_init F
 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 dlopen F
 GLIBC_2.1 dlvsym F
 GLIBC_2.10 __cxa_at_quick_exit F
@@ -2346,6 +2348,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 0402dcddcc..4cae24e768 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_return F
-GLIBC_2.1 aio_return64 F
 GLIBC_2.1 aio_suspend F
 GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 aio_write F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
index 45c49ba662..2f737fadb8 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
@@ -16,6 +16,8 @@  GLIBC_2.1 aio_fsync64 F
 GLIBC_2.1 aio_init F
 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 dlopen F
 GLIBC_2.1 dlvsym F
 GLIBC_2.10 __cxa_at_quick_exit F
@@ -2343,6 +2345,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 0402dcddcc..4cae24e768 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_return F
-GLIBC_2.1 aio_return64 F
 GLIBC_2.1 aio_suspend F
 GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 aio_write F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
index 07a68d78e3..f4c87b4fa9 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
@@ -1483,6 +1483,8 @@  GLIBC_2.1 aio_fsync64 F
 GLIBC_2.1 aio_init F
 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 alphasort64 F
 GLIBC_2.1 argp_err_exit_status D 0x4
 GLIBC_2.1 argp_error F
@@ -2486,6 +2488,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 2202b8ef5f..6061373aae 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_return F
-GLIBC_2.1 aio_return64 F
 GLIBC_2.1 aio_suspend F
 GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 aio_write F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
index 8b549e7efc..03acd40463 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
@@ -16,6 +16,8 @@  GLIBC_2.1 aio_fsync64 F
 GLIBC_2.1 aio_init F
 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 dlopen F
 GLIBC_2.1 dlvsym F
 GLIBC_2.10 __cxa_at_quick_exit F
@@ -2322,6 +2324,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 2afa483191..90a66e4a4b 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_return F
-GLIBC_2.1 aio_return64 F
 GLIBC_2.1 aio_suspend F
 GLIBC_2.1 aio_suspend64 F
 GLIBC_2.1 aio_write F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
index e8d70016a6..f81fe5301d 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
@@ -568,6 +568,8 @@  GLIBC_2.2.5 aio_fsync64 F
 GLIBC_2.2.5 aio_init F
 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 alarm F
 GLIBC_2.2.5 alphasort F
 GLIBC_2.2.5 alphasort64 F
@@ -2278,6 +2280,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 e9d2aeb05b..62fe3da2cb 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_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 aio_write F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
index 40921d5579..45d74a3958 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
@@ -601,6 +601,8 @@  GLIBC_2.16 aio_fsync64 F
 GLIBC_2.16 aio_init F
 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 alarm F
 GLIBC_2.16 aligned_alloc F
 GLIBC_2.16 alphasort F
@@ -2381,6 +2383,8 @@  GLIBC_2.34 aio_fsync64 F
 GLIBC_2.34 aio_init F
 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 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 bbd0f42caa..a531990038 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_return F
-GLIBC_2.16 aio_return64 F
 GLIBC_2.16 aio_suspend F
 GLIBC_2.16 aio_suspend64 F
 GLIBC_2.16 aio_write F