diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2011-04-06 15:36:54 +0200 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2012-06-15 14:00:35 +0200 |
| commit | 9e74047542cbe90bd63660638ceb30313327027f (patch) | |
| tree | fe918ecaf613ce9e660e8c971ff5dabf25a9b39f /libc/sysdeps/linux/mips | |
| parent | dd340d59c5bcca991047c9ef26147e5e5cbb659b (diff) | |
posix_fadvise: make posix_fadvise[64] similar on all archs
Remove all versions, that can be covered by the common one.
Drop incorrectly implemented fallback support, if __NR_fadvise64_64 is not available.
To support 64 bit ppc, move ppc support into common.
Cleanup including headers.
Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'libc/sysdeps/linux/mips')
| -rw-r--r-- | libc/sysdeps/linux/mips/posix_fadvise.c | 23 | ||||
| -rw-r--r-- | libc/sysdeps/linux/mips/posix_fadvise64.c | 32 |
2 files changed, 23 insertions, 32 deletions
diff --git a/libc/sysdeps/linux/mips/posix_fadvise.c b/libc/sysdeps/linux/mips/posix_fadvise.c index 8546d96ba..b0110bfb2 100644 --- a/libc/sysdeps/linux/mips/posix_fadvise.c +++ b/libc/sysdeps/linux/mips/posix_fadvise.c @@ -8,19 +8,16 @@ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ -#include <features.h> -#include <unistd.h> -#include <errno.h> -#include <endian.h> -#include <stdint.h> -#include <sys/types.h> #include <sys/syscall.h> -#include <fcntl.h> -int posix_fadvise(int fd, off_t offset, off_t len, int advice) -{ /* MIPS kernel only has NR_fadvise64 which acts as NR_fadvise64_64 */ #ifdef __NR_fadvise64 +# include <fcntl.h> +# include <endian.h> +# include <bits/wordsize.h> + +int posix_fadvise(int fd, off_t offset, off_t len, int advice) +{ INTERNAL_SYSCALL_DECL(err); # if _MIPS_SIM == _ABIO32 int ret = INTERNAL_SYSCALL(fadvise64, err, 7, fd, 0, @@ -33,7 +30,9 @@ int posix_fadvise(int fd, off_t offset, off_t len, int advice) if (INTERNAL_SYSCALL_ERROR_P (ret, err)) return INTERNAL_SYSCALL_ERRNO (ret, err); return 0; -#else - return ENOSYS; -#endif } +# if defined __UCLIBC_HAS_LFS__ && __WORDSIZE == 64 +strong_alias(posix_fadvise,posix_fadvise64) +# endif + +#endif diff --git a/libc/sysdeps/linux/mips/posix_fadvise64.c b/libc/sysdeps/linux/mips/posix_fadvise64.c index d9b89d123..f97dab97d 100644 --- a/libc/sysdeps/linux/mips/posix_fadvise64.c +++ b/libc/sysdeps/linux/mips/posix_fadvise64.c @@ -8,36 +8,28 @@ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ -#include <features.h> -#include <unistd.h> -#include <errno.h> -#include <endian.h> -#include <stdint.h> -#include <sys/types.h> +#include <_lfs_64.h> #include <sys/syscall.h> -#include <fcntl.h> +#include <bits/wordsize.h> -#ifdef __UCLIBC_HAS_LFS__ +/* MIPS kernel only has NR_fadvise64 which acts as NR_fadvise64_64 */ +#if defined __NR_fadvise64 && defined __UCLIBC_HAS_LFS__ && __WORDSIZE == 32 +# include <fcntl.h> +# include <endian.h> -int posix_fadvise64(int fd, __off64_t offset, __off64_t len, int advice) +int posix_fadvise64(int fd, off64_t offset, off64_t len, int advice) { -/* MIPS kernel only has NR_fadvise64 which acts as NR_fadvise64_64 */ -#ifdef __NR_fadvise64 INTERNAL_SYSCALL_DECL(err); -# if _MIPS_SIM == _MIPS_SIM_ABI32 +# if _MIPS_SIM == _ABIO32 int ret = INTERNAL_SYSCALL(fadvise64, err, 7, fd, 0, - __LONG_LONG_PAIR ((long) (offset >> 32), (long) offset), - __LONG_LONG_PAIR ((long) (len >> 32), (long) len), - advice); + __LONG_LONG_PAIR ((long) (offset >> 32), (long) offset), + __LONG_LONG_PAIR ((long) (len >> 32), (long) len), + advice); # else /* N32 || N64 */ int ret = INTERNAL_SYSCALL(fadvise64, err, 4, fd, offset, len, advice); # endif if (INTERNAL_SYSCALL_ERROR_P (ret, err)) return INTERNAL_SYSCALL_ERRNO (ret, err); return 0; -#else - return ENOSYS; -#endif } - -#endif /* __UCLIBC_HAS_LFS__ */ +#endif |