From 22fdfe080822178e87f890f71df9248624bc27e7 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Tue, 12 Dec 2006 06:02:05 +0000 Subject: sort out a few issues that show up on mips --- libc/sysdeps/linux/mips/pread_write.c | 52 ++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 22 deletions(-) (limited to 'libc/sysdeps/linux/mips/pread_write.c') diff --git a/libc/sysdeps/linux/mips/pread_write.c b/libc/sysdeps/linux/mips/pread_write.c index 0267c720b..364d7852d 100644 --- a/libc/sysdeps/linux/mips/pread_write.c +++ b/libc/sysdeps/linux/mips/pread_write.c @@ -1,12 +1,13 @@ -/* vi: set sw=4 ts=4: - * +/* vi: set sw=4 ts=4: */ +/* * Copyright (C) 2000-2006 Erik Andersen * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ -/* Based in part on the files +/* + * Based in part on the files * ./sysdeps/unix/sysv/linux/pwrite.c, - * ./sysdeps/unix/sysv/linux/pread.c, + * ./sysdeps/unix/sysv/linux/pread.c, * sysdeps/posix/pread.c * sysdeps/posix/pwrite.c * from GNU libc 2.2.5, but reworked considerably... @@ -15,6 +16,7 @@ #include #include #include +#include #include #ifdef __NR_pread64 /* Newer kernels renamed but it's the same. */ @@ -24,31 +26,39 @@ # define __NR_pread __NR_pread64 #endif -#ifdef __NR_pread extern __typeof(pread) __libc_pread; +extern __typeof(pwrite) __libc_pwrite; +#ifdef __UCLIBC_HAS_LFS__ +extern __typeof(pread64) __libc_pread64; +extern __typeof(pwrite64) __libc_pwrite64; +#endif + +#include + + +#ifdef __NR_pread # if _MIPS_SIM == _MIPS_SIM_ABI64 -# define __NR___libc_pread __NR_pread +# define __NR___libc_pread __NR_pread _syscall4(ssize_t, __libc_pread, int, fd, void *, buf, size_t, count, off_t, offset); weak_alias (__libc_pread, pread) -# define __NR___libc_pread64 __NR_pread +# define __NR___libc_pread64 __NR_pread _syscall4(ssize_t, __libc_pread64, int, fd, void *, buf, size_t, count, off64_t, offset); weak_alias (__libc_pread64, pread64) # else /* O32 || N32 */ -# define __NR___syscall_pread __NR_pread -static inline _syscall6(ssize_t, __syscall_pread, int, fd, void *, buf, +# define __NR___syscall_pread __NR_pread +static inline _syscall6(ssize_t, __syscall_pread, int, fd, void *, buf, size_t, count, int, dummy, off_t, offset_hi, off_t, offset_lo); ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset) -{ +{ return(__syscall_pread(fd,buf,count,0,__LONG_LONG_PAIR(offset>>31,offset))); } weak_alias(__libc_pread,pread) -# ifdef __UCLIBC_HAS_LFS__ -extern __typeof(pread64) __libc_pread64; +# ifdef __UCLIBC_HAS_LFS__ ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset) -{ +{ uint32_t low = offset & 0xffffffff; uint32_t high = offset >> 32; return(__syscall_pread(fd, buf, count, 0, __LONG_LONG_PAIR (high, low))); @@ -69,30 +79,28 @@ weak_alias(__libc_pread64,pread64) #endif #ifdef __NR_pwrite -extern __typeof(pwrite) __libc_pwrite; # if _MIPS_SIM == _MIPS_SIM_ABI64 -# define __NR___libc_pwrite __NR_pwrite +# define __NR___libc_pwrite __NR_pwrite _syscall4(ssize_t, __libc_pwrite, int, fd, const void *, buf, size_t, count, off_t, offset); weak_alias (__libc_pwrite, pwrite) -# define __NR___libc_pwrite64 __NR_pwrite +# define __NR___libc_pwrite64 __NR_pwrite _syscall4(ssize_t, __libc_pwrite64, int, fd, const void *, buf, size_t, count, off64_t, offset); weak_alias (__libc_pwrite64, pwrite64) # else /* O32 || N32 */ -# define __NR___syscall_pwrite __NR_pwrite -static inline _syscall6(ssize_t, __syscall_pwrite, int, fd, const void *, buf, +# define __NR___syscall_pwrite __NR_pwrite +static inline _syscall6(ssize_t, __syscall_pwrite, int, fd, const void *, buf, size_t, count, int, dummy, off_t, offset_hi, off_t, offset_lo); ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset) -{ +{ return(__syscall_pwrite(fd,buf,count,0,__LONG_LONG_PAIR(offset>>31,offset))); } weak_alias(__libc_pwrite,pwrite) -# ifdef __UCLIBC_HAS_LFS__ -extern __typeof(pwrite64) __libc_pwrite64; +# ifdef __UCLIBC_HAS_LFS__ ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset) -{ +{ uint32_t low = offset & 0xffffffff; uint32_t high = offset >> 32; return(__syscall_pwrite(fd, buf, count, 0, __LONG_LONG_PAIR (high, low))); -- cgit v1.2.3