aboutsummaryrefslogtreecommitdiff
path: root/rt
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-06-25 10:30:36 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-06-25 11:53:37 +0200
commit7ad553b96e2d5b88b79506b9a60c21415072ccaf (patch)
treec6161840bb127fc2977a681d22b5e3fa1dad0023 /rt
parent1f3a8e716d44d1307fe057a5b9f542108e4fbd55 (diff)
downloadglibc-7ad553b96e2d5b88b79506b9a60c21415072ccaf.zip
glibc-7ad553b96e2d5b88b79506b9a60c21415072ccaf.tar.gz
glibc-7ad553b96e2d5b88b79506b9a60c21415072ccaf.tar.bz2
Linux: Move aio_read, aio_read64 into libc
Both symbols have to be moved at the same time because they are intertwined for __WORDSIZE == 64. The treatment of this case is also changed to match more closely how the other files suppress the declaration of the *64 identifier. The symbols were moved using scripts/move-symbol-to-libc.py. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'rt')
-rw-r--r--rt/Makefile4
-rw-r--r--rt/Versions6
-rw-r--r--rt/aio_read.c32
-rw-r--r--rt/aio_read64.c20
4 files changed, 52 insertions, 10 deletions
diff --git a/rt/Makefile b/rt/Makefile
index 119b757..ec2aff9 100644
--- a/rt/Makefile
+++ b/rt/Makefile
@@ -29,8 +29,6 @@ routines = \
shm_unlink \
librt-routines = \
- aio_read \
- aio_read64 \
aio_return \
aio_suspend \
aio_write \
@@ -62,6 +60,8 @@ $(librt-routines-var) += \
aio_fsync \
aio_misc \
aio_notify \
+ aio_read \
+ aio_read64 \
aio_sigqueue \
tests := tst-shm tst-timer tst-timer2 \
diff --git a/rt/Versions b/rt/Versions
index 1a0aa77..6db40be 100644
--- a/rt/Versions
+++ b/rt/Versions
@@ -8,6 +8,8 @@ libc {
aio_error64;
aio_fsync;
aio_fsync64;
+ aio_read;
+ aio_read64;
%endif
}
GLIBC_2.2 {
@@ -23,6 +25,8 @@ libc {
aio_error64;
aio_fsync;
aio_fsync64;
+ aio_read;
+ aio_read64;
%endif
shm_open;
shm_unlink;
@@ -51,9 +55,9 @@ librt {
aio_fsync;
aio_fsync64;
aio_init;
-%endif
aio_read;
aio_read64;
+%endif
aio_return;
aio_return64;
aio_suspend;
diff --git a/rt/aio_read.c b/rt/aio_read.c
index 4698e48..61cf8bc 100644
--- a/rt/aio_read.c
+++ b/rt/aio_read.c
@@ -17,14 +17,40 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <aio.h>
+#include <bits/wordsize.h>
+#if __WORDSIZE == 64
+# define aio_read64 XXX
+# include <aio.h>
+/* And undo the hack. */
+# undef aio_read64
+#else
+# include <aio.h>
+#endif
#include <aio_misc.h>
-
+#include <shlib-compat.h>
int
-aio_read (struct aiocb *aiocbp)
+__aio_read (struct aiocb *aiocbp)
{
return (__aio_enqueue_request ((aiocb_union *) aiocbp, LIO_READ) == NULL
? -1 : 0);
}
+
+#if PTHREAD_IN_LIBC
+versioned_symbol (libc, __aio_read, aio_read, GLIBC_2_34);
+# if __WORDSIZE == 64
+versioned_symbol (libc, __aio_read, aio_read64, GLIBC_2_34);
+# endif
+# if OTHER_SHLIB_COMPAT (librt, GLIBC_2_1, GLIBC_2_34)
+compat_symbol (librt, __aio_read, aio_read, GLIBC_2_1);
+# if __WORDSIZE == 64
+compat_symbol (librt, __aio_read, aio_read64, GLIBC_2_1);
+# endif
+# endif
+#else /* !PTHREAD_IN_LIBC */
+strong_alias (__aio_read, aio_read)
+# if __WORDSIZE == 64
+weak_alias (__aio_read, aio_read64)
+#endif
+#endif /* !PTHREAD_IN_LIBC */
diff --git a/rt/aio_read64.c b/rt/aio_read64.c
index 26b9b0b..3aa169f 100644
--- a/rt/aio_read64.c
+++ b/rt/aio_read64.c
@@ -17,14 +17,26 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <aio.h>
-
-#include <aio_misc.h>
+#include <bits/wordsize.h>
+#if __WORDSIZE != 64
+# include <aio.h>
+# include <aio_misc.h>
+# include <shlib-compat.h>
int
-aio_read64 (struct aiocb64 *aiocbp)
+__aio_read64 (struct aiocb64 *aiocbp)
{
return (__aio_enqueue_request ((aiocb_union *) aiocbp, LIO_READ64) == NULL
? -1 : 0);
}
+
+# if PTHREAD_IN_LIBC
+versioned_symbol (libc, __aio_read64, aio_read64, GLIBC_2_34);
+# if OTHER_SHLIB_COMPAT (librt, GLIBC_2_1, GLIBC_2_34)
+compat_symbol (librt, __aio_read64, aio_read64, GLIBC_2_1);
+# endif
+# else /* !PTHREAD_IN_LIBC */
+strong_alias (__aio_read64, aio_read64)
+# endif
+#endif /* __WORDSIZE != 64 */