diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2003-03-20 20:58:02 +0000 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@redhat.com> | 2003-03-20 20:58:02 +0000 |
| commit | 4b5e1c5f0ef986ccf8a67ed44d701dc18f7d7a44 (patch) | |
| tree | e66dc15c14e2988554edffbce0d95ee6f7f667cd /sysdeps/unix/sysv/linux/mips/pread64.c | |
| parent | 6848aba6c3bf14ba5ed39a6edb1187c831d19fff (diff) | |
| download | glibc-4b5e1c5f0ef986ccf8a67ed44d701dc18f7d7a44.zip glibc-4b5e1c5f0ef986ccf8a67ed44d701dc18f7d7a44.tar.gz glibc-4b5e1c5f0ef986ccf8a67ed44d701dc18f7d7a44.tar.bz2 | |
* sysdeps/unix/sysv/linux/mips/pread.c: Don't break up offset into high and low halves on n64. * sysdeps/unix/sysv/linux/mips/pread64.c: Likewise. * sysdeps/unix/sysv/linux/mips/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/mips/pwrite64.c: Likewise.
2003-03-20 Alexandre Oliva <aoliva@redhat.com>
* sysdeps/unix/sysv/linux/mips/pread.c: Don't break up offset
into high and low halves on n64.
* sysdeps/unix/sysv/linux/mips/pread64.c: Likewise.
* sysdeps/unix/sysv/linux/mips/pwrite.c: Likewise.
* sysdeps/unix/sysv/linux/mips/pwrite64.c: Likewise.
Diffstat (limited to 'sysdeps/unix/sysv/linux/mips/pread64.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/pread64.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/mips/pread64.c b/sysdeps/unix/sysv/linux/mips/pread64.c index 36ec100..12c9cc0 100644 --- a/sysdeps/unix/sysv/linux/mips/pread64.c +++ b/sysdeps/unix/sysv/linux/mips/pread64.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -42,7 +42,13 @@ static ssize_t __emulate_pread64 (int fd, void *buf, size_t count, # endif extern ssize_t __syscall_pread (int fd, void *__unbounded buf, size_t count, - int dummy, off_t offset_hi, off_t offset_lo); + int dummy, +#if defined _ABI64 && _MIPS_SIM == _ABI64 + off_t offset +#else + off_t offset_hi, off_t offset_lo +#endif + ); @@ -59,9 +65,14 @@ __libc_pread64 (fd, buf, count, offset) if (SINGLE_THREAD_P) { /* First try the syscall. */ +#if defined _ABI64 && _MIPS_SIM == _ABI64 + result = INLINE_SYSCALL (pread, 6, fd, CHECK_N (buf, count), count, 0, + offset); +#else result = INLINE_SYSCALL (pread, 6, fd, CHECK_N (buf, count), count, 0, __LONG_LONG_PAIR ((off_t) (offset >> 32), (off_t) (offset & 0xffffffff))); +#endif # if __ASSUME_PREAD_SYSCALL == 0 if (result == -1 && errno == ENOSYS) /* No system call available. Use the emulation. */ @@ -73,9 +84,14 @@ __libc_pread64 (fd, buf, count, offset) int oldtype = LIBC_CANCEL_ASYNC (); /* First try the syscall. */ +#if defined _ABI64 && _MIPS_SIM == _ABI64 + result = INLINE_SYSCALL (pread, 6, fd, CHECK_N (buf, count), count, 0, + offset); +#else result = INLINE_SYSCALL (pread, 6, fd, CHECK_N (buf, count), count, 0, __LONG_LONG_PAIR ((off_t) (offset >> 32), (off_t) (offset & 0xffffffff))); +#endif # if __ASSUME_PREAD_SYSCALL == 0 if (result == -1 && errno == ENOSYS) /* No system call available. Use the emulation. */ |