diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-06-25 10:30:36 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-06-25 11:48:46 +0200 |
| commit | 3df6dcc5c75b40d0ac0a9d22967da0a5a2b8df5c (patch) | |
| tree | 7d411f73feedaca24ae047dca2f4892c412e246d /sysdeps/unix/sysv/linux/sparc/aio_cancel.c | |
| parent | d12506b2dbbeb259468e0f06e87a98174e69a743 (diff) | |
| download | glibc-3df6dcc5c75b40d0ac0a9d22967da0a5a2b8df5c.tar glibc-3df6dcc5c75b40d0ac0a9d22967da0a5a2b8df5c.tar.gz glibc-3df6dcc5c75b40d0ac0a9d22967da0a5a2b8df5c.tar.bz2 glibc-3df6dcc5c75b40d0ac0a9d22967da0a5a2b8df5c.zip | |
Linux: Move aio_cancel, aio_cancel64 into libc
The symbols were moved using scripts/move-symbol-to-libc.py.
A version placeholder symbol is needed on alpha and sparc because
of the additional symbols formerly at version GLIBC_2.3.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>:
Diffstat (limited to 'sysdeps/unix/sysv/linux/sparc/aio_cancel.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/aio_cancel.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/sysdeps/unix/sysv/linux/sparc/aio_cancel.c b/sysdeps/unix/sysv/linux/sparc/aio_cancel.c index 9f69b080ed..6e4352a9a4 100644 --- a/sysdeps/unix/sysv/linux/sparc/aio_cancel.c +++ b/sysdeps/unix/sysv/linux/sparc/aio_cancel.c @@ -8,26 +8,28 @@ extern __typeof (aio_cancel) __new_aio_cancel; extern __typeof (aio_cancel) __old_aio_cancel; -#define aio_cancel __new_aio_cancel +#define __aio_cancel __new_aio_cancel #include <rt/aio_cancel.c> -#undef aio_cancel -strong_alias (__new_aio_cancel, __new_aio_cancel64); -versioned_symbol (librt, __new_aio_cancel, aio_cancel, GLIBC_2_3); -versioned_symbol (librt, __new_aio_cancel64, aio_cancel64, GLIBC_2_3); +#undef __aio_cancel +versioned_symbol (libc, __new_aio_cancel, aio_cancel, GLIBC_2_34); +versioned_symbol (libc, __new_aio_cancel, aio_cancel64, GLIBC_2_34); +#if OTHER_SHLIB_COMPAT (librt, GLIBC_2_3, GLIBC_2_34) +compat_symbol (librt, __new_aio_cancel, aio_cancel, GLIBC_2_3); +compat_symbol (librt, __new_aio_cancel, aio_cancel64, GLIBC_2_3); +#endif -#if SHLIB_COMPAT (librt, GLIBC_2_1, GLIBC_2_3) +#if OTHER_SHLIB_COMPAT (librt, GLIBC_2_1, GLIBC_2_3) #undef ECANCELED -#define aio_cancel __old_aio_cancel +#define __aio_cancel __old_aio_cancel #define ECANCELED 125 #include <rt/aio_cancel.c> -#undef aio_cancel -strong_alias (__old_aio_cancel, __old_aio_cancel64); +#undef __aio_cancel compat_symbol (librt, __old_aio_cancel, aio_cancel, GLIBC_2_1); -compat_symbol (librt, __old_aio_cancel64, aio_cancel64, GLIBC_2_1); +compat_symbol (librt, __old_aio_cancel, aio_cancel64, GLIBC_2_1); #endif |