lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-07 06:43:00 +03:00
Code Activity

Linux: Move aio_cancel, aio_cancel64 into libc

Browse Source 
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>:
This commit is contained in:
Florian Weimer
2021-06-25 10:30:36 +02:00
parent d12506b2db
commit 3df6dcc5c7
72 changed files with 284 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sysdeps/unix/sysv/linux/sparc/Versions
View File

@@ -6,7 +6,12 @@ libc {
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
}
GLIBC_2.3 {
_sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
_sys_errlist;
_sys_nerr;
aio_cancel64;
aio_cancel;
sys_errlist;
sys_nerr;
}
GLIBC_2.3.3 {
# Changed PTHREAD_STACK_MIN.
@@ -29,10 +34,8 @@ libc {
__vdso_clock_gettime;
}
}
librt {
GLIBC_2.3 {
# AIO functions.
aio_cancel; aio_cancel64;
__librt_version_placeholder;
}
}

22
sysdeps/unix/sysv/linux/sparc/aio_cancel.c
View File

@@ -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

24
sysdeps/unix/sysv/linux/sparc/librt-compat.c Normal file
View File

@@ -0,0 +1,24 @@
/* Placeholder definitions to pull in removed symbol versions. sparc version.
Copyright (C) 2021 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <rt/librt-compat.c>
#if SHLIB_COMPAT (librt, GLIBC_2_3, GLIBC_2_34)
compat_symbol (librt, __librt_version_placeholder_1,
__librt_version_placeholder, GLIBC_2_3);
#endif

6
sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
View File

@@ -1474,6 +1474,8 @@ GLIBC_2.1 _sys_errlist D 0x1fc
GLIBC_2.1 _sys_nerr D 0x4
GLIBC_2.1 _sys_siglist D 0x100
GLIBC_2.1 addseverity F
GLIBC_2.1 aio_cancel F
GLIBC_2.1 aio_cancel64 F
GLIBC_2.1 aio_init F
GLIBC_2.1 alphasort64 F
GLIBC_2.1 argp_err_exit_status D 0x4
@@ -2165,6 +2167,8 @@ GLIBC_2.3 __uselocale F
GLIBC_2.3 __wcsftime_l F
GLIBC_2.3 _sys_errlist D 0x200
GLIBC_2.3 _sys_nerr D 0x4
GLIBC_2.3 aio_cancel F
GLIBC_2.3 aio_cancel64 F
GLIBC_2.3 duplocale F
GLIBC_2.3 fgetxattr F
GLIBC_2.3 flistxattr F
@@ -2467,6 +2471,8 @@ GLIBC_2.34 __wait3_time64 F
GLIBC_2.34 __wait4_time64 F
GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 aio_cancel F
GLIBC_2.34 aio_cancel64 F
GLIBC_2.34 aio_init F
GLIBC_2.34 call_once F
GLIBC_2.34 cnd_broadcast F

5
sysdeps/unix/sysv/linux/sparc/sparc32/librt.abilist
View File

@@ -1,5 +1,3 @@
GLIBC_2.1 aio_cancel F
GLIBC_2.1 aio_cancel64 F
GLIBC_2.1 aio_error F
GLIBC_2.1 aio_error64 F
GLIBC_2.1 aio_fsync F
@@ -19,8 +17,7 @@ GLIBC_2.2 timer_delete F
GLIBC_2.2 timer_getoverrun F
GLIBC_2.2 timer_gettime F
GLIBC_2.2 timer_settime F
GLIBC_2.3 aio_cancel F
GLIBC_2.3 aio_cancel64 F
GLIBC_2.3 __librt_version_placeholder F
GLIBC_2.3.4 mq_close F
GLIBC_2.3.4 mq_getattr F
GLIBC_2.3.4 mq_notify F

6
sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
View File

@@ -7,6 +7,8 @@ GLIBC_2.0 dlclose F
GLIBC_2.0 dlerror F
GLIBC_2.0 dlopen F
GLIBC_2.0 dlsym F
GLIBC_2.1 aio_cancel F
GLIBC_2.1 aio_cancel64 F
GLIBC_2.1 aio_init F
GLIBC_2.1 dlopen F
GLIBC_2.1 dlvsym F
@@ -2091,6 +2093,8 @@ GLIBC_2.3 __uselocale F
GLIBC_2.3 __wcsftime_l F
GLIBC_2.3 _sys_errlist D 0x400
GLIBC_2.3 _sys_nerr D 0x4
GLIBC_2.3 aio_cancel F
GLIBC_2.3 aio_cancel64 F
GLIBC_2.3 duplocale F
GLIBC_2.3 fgetxattr F
GLIBC_2.3 flistxattr F
@@ -2303,6 +2307,8 @@ GLIBC_2.34 __pthread_unregister_cancel_restore F
GLIBC_2.34 __pthread_unwind_next F
GLIBC_2.34 _pthread_cleanup_pop F
GLIBC_2.34 _pthread_cleanup_push F
GLIBC_2.34 aio_cancel F
GLIBC_2.34 aio_cancel64 F
GLIBC_2.34 aio_init F
GLIBC_2.34 call_once F
GLIBC_2.34 cnd_broadcast F

5
sysdeps/unix/sysv/linux/sparc/sparc64/librt.abilist
View File

@@ -1,5 +1,3 @@
GLIBC_2.1 aio_cancel F
GLIBC_2.1 aio_cancel64 F
GLIBC_2.1 aio_error F
GLIBC_2.1 aio_error64 F
GLIBC_2.1 aio_fsync F
@@ -19,8 +17,7 @@ GLIBC_2.2 timer_delete F
GLIBC_2.2 timer_getoverrun F
GLIBC_2.2 timer_gettime F
GLIBC_2.2 timer_settime F
GLIBC_2.3 aio_cancel F
GLIBC_2.3 aio_cancel64 F
GLIBC_2.3 __librt_version_placeholder F
GLIBC_2.3.3 timer_create F
GLIBC_2.3.3 timer_delete F
GLIBC_2.3.3 timer_getoverrun F