>From b9047ae239b359a3dc368ac17551b01f027f0ccb Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Thu, 4 Sep 2014 22:01:36 +0200 Subject: [PATCH 1/2] add missing legacy LFS *64 symbol aliases versionsort64, aio*64 and lio*64 symbols were missing, they are only needed for glibc ABI compatibility, on the source level dirent.h and aio.h already redirect them. --- src/aio/aio_cancel.c | 3 +++ src/aio/aio_error.c | 3 +++ src/aio/aio_fsync.c | 3 +++ src/aio/aio_readwrite.c | 3 +++ src/aio/aio_return.c | 3 +++ src/aio/aio_suspend.c | 3 +++ src/aio/lio_listio.c | 1 + src/dirent/versionsort.c | 4 ++++ 8 files changed, 23 insertions(+) diff --git a/src/aio/aio_cancel.c b/src/aio/aio_cancel.c index 5a753b1..16fc431 100644 --- a/src/aio/aio_cancel.c +++ b/src/aio/aio_cancel.c @@ -1,6 +1,7 @@ #include #include #include +#include "libc.h" int aio_cancel(int fd, struct aiocb *cb) { @@ -14,3 +15,5 @@ int aio_cancel(int fd, struct aiocb *cb) } return cb->__err==EINPROGRESS ? AIO_NOTCANCELED : AIO_ALLDONE; } + +LFS64(aio_cancel); diff --git a/src/aio/aio_error.c b/src/aio/aio_error.c index a780fd3..fd42ea1 100644 --- a/src/aio/aio_error.c +++ b/src/aio/aio_error.c @@ -1,6 +1,9 @@ #include +#include "libc.h" int aio_error(const struct aiocb *cb) { return cb->__err; } + +LFS64(aio_error); diff --git a/src/aio/aio_fsync.c b/src/aio/aio_fsync.c index 0ac6ea8..6e1a70a 100644 --- a/src/aio/aio_fsync.c +++ b/src/aio/aio_fsync.c @@ -1,5 +1,6 @@ #include #include +#include "libc.h" int aio_fsync(int op, struct aiocb *cb) { @@ -7,3 +8,5 @@ int aio_fsync(int op, struct aiocb *cb) errno = EINVAL; return -1; } + +LFS64(aio_fsync); diff --git a/src/aio/aio_readwrite.c b/src/aio/aio_readwrite.c index 2278226..8753ffd 100644 --- a/src/aio/aio_readwrite.c +++ b/src/aio/aio_readwrite.c @@ -105,3 +105,6 @@ int aio_write(struct aiocb *cb) cb->aio_lio_opcode = LIO_WRITE; return new_req(cb); } + +LFS64(aio_read); +LFS64(aio_write); diff --git a/src/aio/aio_return.c b/src/aio/aio_return.c index df10bdb..c1ce450 100644 --- a/src/aio/aio_return.c +++ b/src/aio/aio_return.c @@ -1,6 +1,9 @@ #include +#include "libc.h" ssize_t aio_return(struct aiocb *cb) { return cb->__ret; } + +LFS64(aio_return); diff --git a/src/aio/aio_suspend.c b/src/aio/aio_suspend.c index 39a1d3a..dcdf601 100644 --- a/src/aio/aio_suspend.c +++ b/src/aio/aio_suspend.c @@ -1,6 +1,7 @@ #include #include #include "pthread_impl.h" +#include "libc.h" /* Due to the requirement that aio_suspend be async-signal-safe, we cannot * use any locks, wait queues, etc. that would make it more efficient. The @@ -55,3 +56,5 @@ int aio_suspend(const struct aiocb *const cbs[], int cnt, const struct timespec } } } + +LFS64(aio_suspend); diff --git a/src/aio/lio_listio.c b/src/aio/lio_listio.c index 75ed225..bd37767 100644 --- a/src/aio/lio_listio.c +++ b/src/aio/lio_listio.c @@ -141,3 +141,4 @@ int lio_listio(int mode, struct aiocb *restrict const *restrict cbs, int cnt, st return 0; } +LFS64(lio_listio); diff --git a/src/dirent/versionsort.c b/src/dirent/versionsort.c index 9769610..410cb70 100644 --- a/src/dirent/versionsort.c +++ b/src/dirent/versionsort.c @@ -1,8 +1,12 @@ #define _GNU_SOURCE #include #include +#include "libc.h" int versionsort(const struct dirent **a, const struct dirent **b) { return strverscmp((*a)->d_name, (*b)->d_name); } + +#undef versionsort64 +LFS64(versionsort); -- 1.7.10.4