From 3df6dcc5c75b40d0ac0a9d22967da0a5a2b8df5c Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 25 Jun 2021 10:30:36 +0200 Subject: 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 : --- sysdeps/unix/sysv/linux/sparc/aio_cancel.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'sysdeps/unix/sysv/linux/sparc/aio_cancel.c') 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 -#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 -#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 -- cgit v1.2.3-70-g09d2