diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-06-25 10:30:36 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-06-25 12:19:15 +0200 |
| commit | 496919b12f2dc0733e215cc2f08266474c87719e (patch) | |
| tree | be4b13d188f43171c767339865a5e56b1046257a /rt/aio_write.c | |
| parent | 32e750516c653bc3005aaef87124a587a7bef196 (diff) | |
| download | glibc-496919b12f2dc0733e215cc2f08266474c87719e.tar.gz glibc-496919b12f2dc0733e215cc2f08266474c87719e.tar.xz glibc-496919b12f2dc0733e215cc2f08266474c87719e.zip | |
Linux: Move aio_write, aio_write64 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: Adhemerva Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'rt/aio_write.c')
| -rw-r--r-- | rt/aio_write.c | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/rt/aio_write.c b/rt/aio_write.c index ea55f0dbbc..5cf7c67eab 100644 --- a/rt/aio_write.c +++ b/rt/aio_write.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_write64 XXX +# include <aio.h> +/* And undo the hack. */ +# undef aio_write64 +#else +# include <aio.h> +#endif #include <aio_misc.h> - +#include <shlib-compat.h> int -aio_write (struct aiocb *aiocbp) +__aio_write (struct aiocb *aiocbp) { return (__aio_enqueue_request ((aiocb_union *) aiocbp, LIO_WRITE) == NULL ? -1 : 0); } + +#if PTHREAD_IN_LIBC +versioned_symbol (libc, __aio_write, aio_write, GLIBC_2_34); +# if __WORDSIZE == 64 +versioned_symbol (libc, __aio_write, aio_write64, GLIBC_2_34); +# endif +# if OTHER_SHLIB_COMPAT (librt, GLIBC_2_1, GLIBC_2_34) +compat_symbol (librt, __aio_write, aio_write, GLIBC_2_1); +# if __WORDSIZE == 64 +compat_symbol (librt, __aio_write, aio_write64, GLIBC_2_1); +# endif +# endif +#else /* !PTHREAD_IN_LIBC */ +strong_alias (__aio_write, aio_write) +# if __WORDSIZE == 64 +weak_alias (__aio_write, aio_write64) +#endif +#endif /* !PTHREAD_IN_LIBC */ |