From cb76029b4d7a42e34ddbb4fdd7b2b7bbe69bed4f Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 30 May 2003 17:41:46 +0000 Subject: [PATCH] 2003-05-30 Guido Guenther * sysdeps/mips/mips64/bsd-_setjmp.S: Include for SETUP_GP64 and friends. * sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h: Fix register names in internal_syscall{6,7}. * sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/mips/pread.c [_MIPS_SIM == _ABI64]: Fix number of syscall arguments. * sysdeps/unix/sysv/linux/mips/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/mips/pread64.c: Likewise. * sysdeps/unix/sysv/linux/mips/pwrite64.c: Likewise. --- sysdeps/mips/mips64/bsd-_setjmp.S | 1 + sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h | 4 ++-- sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h | 4 ++-- sysdeps/unix/sysv/linux/mips/pread.c | 4 ++-- sysdeps/unix/sysv/linux/mips/pread64.c | 4 ++-- sysdeps/unix/sysv/linux/mips/pwrite.c | 4 ++-- sysdeps/unix/sysv/linux/mips/pwrite64.c | 4 ++-- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/sysdeps/mips/mips64/bsd-_setjmp.S b/sysdeps/mips/mips64/bsd-_setjmp.S index 9d79ab0..73f5cc2 100644 --- a/sysdeps/mips/mips64/bsd-_setjmp.S +++ b/sysdeps/mips/mips64/bsd-_setjmp.S @@ -22,6 +22,7 @@ in setjmp doesn't clobber the state restored by longjmp. */ #include +#include #ifdef __PIC__ .option pic2 diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h b/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h index 55a405c..7109971 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h @@ -220,7 +220,7 @@ ".set\treorder" \ : "=r" (__v0), "+r" (__a3) \ : "r" (__a0), "r" (__a1), "r" (__a2), "i" (SYS_ify(name)), \ - "r" (__a5), "r" (__a6) \ + "r" (__a4), "r" (__a5) \ : __SYSCALL_CLOBBERS); \ err = __a3; \ _sys_result = __v0; \ @@ -248,7 +248,7 @@ ".set\treorder" \ : "=r" (__v0), "+r" (__a3) \ : "r" (__a0), "r" (__a1), "r" (__a2), "i" (SYS_ify(name)), \ - "r" (__a5), "r" (__a6), "r" (__a7) \ + "r" (__a4), "r" (__a5), "r" (__a6) \ : __SYSCALL_CLOBBERS); \ err = __a3; \ _sys_result = __v0; \ diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h b/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h index 401470b..4341c18 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h @@ -220,7 +220,7 @@ ".set\treorder" \ : "=r" (__v0), "+r" (__a3) \ : "r" (__a0), "r" (__a1), "r" (__a2), "i" (SYS_ify(name)), \ - "r" (__a5), "r" (__a6) \ + "r" (__a4), "r" (__a5) \ : __SYSCALL_CLOBBERS); \ err = __a3; \ _sys_result = __v0; \ @@ -248,7 +248,7 @@ ".set\treorder" \ : "=r" (__v0), "+r" (__a3) \ : "r" (__a0), "r" (__a1), "r" (__a2), "i" (SYS_ify(name)), \ - "r" (__a5), "r" (__a6), "r" (__a7) \ + "r" (__a4), "r" (__a5), "r" (__a6) \ : __SYSCALL_CLOBBERS); \ err = __a3; \ _sys_result = __v0; \ diff --git a/sysdeps/unix/sysv/linux/mips/pread.c b/sysdeps/unix/sysv/linux/mips/pread.c index dc278d4..28fdca6 100644 --- a/sysdeps/unix/sysv/linux/mips/pread.c +++ b/sysdeps/unix/sysv/linux/mips/pread.c @@ -66,7 +66,7 @@ __libc_pread (fd, buf, count, offset) /* First try the syscall. */ assert (sizeof (offset) == 4); #if defined _ABI64 && _MIPS_SIM == _ABI64 - result = INLINE_SYSCALL (pread, 6, fd, CHECK_N (buf, count), count, 0, + result = INLINE_SYSCALL (pread, 5, fd, CHECK_N (buf, count), count, 0, offset); #else result = INLINE_SYSCALL (pread, 6, fd, CHECK_N (buf, count), count, 0, @@ -85,7 +85,7 @@ __libc_pread (fd, buf, count, offset) /* First try the syscall. */ assert (sizeof (offset) == 4); #if defined _ABI64 && _MIPS_SIM == _ABI64 - result = INLINE_SYSCALL (pread, 6, fd, CHECK_N (buf, count), count, 0, + result = INLINE_SYSCALL (pread, 5, fd, CHECK_N (buf, count), count, 0, offset); #else result = INLINE_SYSCALL (pread, 6, fd, CHECK_N (buf, count), count, 0, diff --git a/sysdeps/unix/sysv/linux/mips/pread64.c b/sysdeps/unix/sysv/linux/mips/pread64.c index 12c9cc0..7dcd008 100644 --- a/sysdeps/unix/sysv/linux/mips/pread64.c +++ b/sysdeps/unix/sysv/linux/mips/pread64.c @@ -66,7 +66,7 @@ __libc_pread64 (fd, buf, count, offset) { /* First try the syscall. */ #if defined _ABI64 && _MIPS_SIM == _ABI64 - result = INLINE_SYSCALL (pread, 6, fd, CHECK_N (buf, count), count, 0, + result = INLINE_SYSCALL (pread, 5, fd, CHECK_N (buf, count), count, 0, offset); #else result = INLINE_SYSCALL (pread, 6, fd, CHECK_N (buf, count), count, 0, @@ -85,7 +85,7 @@ __libc_pread64 (fd, buf, count, offset) /* First try the syscall. */ #if defined _ABI64 && _MIPS_SIM == _ABI64 - result = INLINE_SYSCALL (pread, 6, fd, CHECK_N (buf, count), count, 0, + result = INLINE_SYSCALL (pread, 5, fd, CHECK_N (buf, count), count, 0, offset); #else result = INLINE_SYSCALL (pread, 6, fd, CHECK_N (buf, count), count, 0, diff --git a/sysdeps/unix/sysv/linux/mips/pwrite.c b/sysdeps/unix/sysv/linux/mips/pwrite.c index 1778d07..fa3de15 100644 --- a/sysdeps/unix/sysv/linux/mips/pwrite.c +++ b/sysdeps/unix/sysv/linux/mips/pwrite.c @@ -65,7 +65,7 @@ __libc_pwrite (fd, buf, count, offset) /* First try the syscall. */ assert (sizeof (offset) == 4); #if defined _ABI64 && _MIPS_SIM == _ABI64 - result = INLINE_SYSCALL (pwrite, 6, fd, CHECK_N (buf, count), count, 0, + result = INLINE_SYSCALL (pwrite, 5, fd, CHECK_N (buf, count), count, 0, offset); #else result = INLINE_SYSCALL (pwrite, 6, fd, CHECK_N (buf, count), count, 0, @@ -85,7 +85,7 @@ __libc_pwrite (fd, buf, count, offset) /* First try the syscall. */ assert (sizeof (offset) == 4); #if defined _ABI64 && _MIPS_SIM == _ABI64 - result = INLINE_SYSCALL (pwrite, 6, fd, CHECK_N (buf, count), count, 0, + result = INLINE_SYSCALL (pwrite, 5, fd, CHECK_N (buf, count), count, 0, offset); #else result = INLINE_SYSCALL (pwrite, 6, fd, CHECK_N (buf, count), count, 0, diff --git a/sysdeps/unix/sysv/linux/mips/pwrite64.c b/sysdeps/unix/sysv/linux/mips/pwrite64.c index e43a378..5b481b2 100644 --- a/sysdeps/unix/sysv/linux/mips/pwrite64.c +++ b/sysdeps/unix/sysv/linux/mips/pwrite64.c @@ -63,7 +63,7 @@ __libc_pwrite64 (fd, buf, count, offset) { /* First try the syscall. */ #if defined _ABI64 && _MIPS_SIM == _ABI64 - result = INLINE_SYSCALL (pwrite, 6, fd, CHECK_N (buf, count), count, 0, + result = INLINE_SYSCALL (pwrite, 5, fd, CHECK_N (buf, count), count, 0, offset); #else result = INLINE_SYSCALL (pwrite, 6, fd, CHECK_N (buf, count), count, 0, @@ -83,7 +83,7 @@ __libc_pwrite64 (fd, buf, count, offset) /* First try the syscall. */ #if defined _ABI64 && _MIPS_SIM == _ABI64 - result = INLINE_SYSCALL (pwrite, 6, fd, CHECK_N (buf, count), count, 0, + result = INLINE_SYSCALL (pwrite, 5, fd, CHECK_N (buf, count), count, 0, offset); #else result = INLINE_SYSCALL (pwrite, 6, fd, CHECK_N (buf, count), count, 0, -- 2.7.4