* string/endian.h (__LONG_LONG_PAIR): New macro.

* sysdeps/unix/sysv/linux/ftruncate64.c: Use it.
	* sysdeps/unix/sysv/linux/pread.c: Likewise.
	* sysdeps/unix/sysv/linux/pread64.c: Likewise.
	* sysdeps/unix/sysv/linux/pwrite.c: Likewise.
	* sysdeps/unix/sysv/linux/pwrite64.c: Likewise.
	* sysdeps/unix/sysv/linux/truncate64.c: Likewise.
	* sysdeps/unix/sysv/linux/mips/ftruncate64.c: Likewise.
	* sysdeps/unix/sysv/linux/mips/pread.c: Likewise.
	* sysdeps/unix/sysv/linux/mips/pread64.c: Likewise.
	* sysdeps/unix/sysv/linux/mips/pwrite.c: Likewise.
	* sysdeps/unix/sysv/linux/mips/pwrite64.c: Likewise.
	* sysdeps/unix/sysv/linux/mips/truncate64.c: Likewise.
This commit is contained in:
Greg McGary 2000-07-06 23:42:33 +00:00
parent 573d31d4d3
commit 6f5d6cb60d
6 changed files with 16 additions and 40 deletions

View File

@ -50,13 +50,8 @@ ftruncate64 (int fd, off64_t length)
#ifndef __ASSUME_TRUNCATE64_SYSCALL #ifndef __ASSUME_TRUNCATE64_SYSCALL
int saved_errno = errno; int saved_errno = errno;
#endif #endif
#if __BYTE_ORDER == __LITTLE_ENDIAN int result = INLINE_SYSCALL (ftruncate64, 3, fd, 0,
/* Use a fill argument to pass low, high in an aligned pair of __LONG_LONG_PAIR (high, low));
arguments (here 2/3). */
int result = INLINE_SYSCALL (ftruncate64, 3, fd, 0, low, high);
#elif __BYTE_ORDER == __BIG_ENDIAN
int result = INLINE_SYSCALL (ftruncate64, 3, fd, 0, high, low);
#endif
#ifndef __ASSUME_TRUNCATE64_SYSCALL #ifndef __ASSUME_TRUNCATE64_SYSCALL
if (result != -1 || errno != ENOSYS) if (result != -1 || errno != ENOSYS)
#endif #endif

View File

@ -19,6 +19,7 @@
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <endian.h>
#include <sysdep.h> #include <sysdep.h>
#include <sys/syscall.h> #include <sys/syscall.h>
@ -46,11 +47,8 @@ __libc_pread (fd, buf, count, offset)
ssize_t result; ssize_t result;
/* First try the syscall. */ /* First try the syscall. */
# if defined(__MIPSEB__) result = INLINE_SYSCALL (pread, 6, fd, buf, count, 0,
result = INLINE_SYSCALL (pread, 6, fd, buf, count, 0, 0, offset); __LONG_LONG_PAIR (0, offset));
# elif defined(__MIPSEL__)
result = INLINE_SYSCALL (pread, 6, fd, buf, count, 0, offset, 0);
# endif
# if __ASSUME_PREAD_SYSCALL == 0 # if __ASSUME_PREAD_SYSCALL == 0
if (result == -1 && errno == ENOSYS) if (result == -1 && errno == ENOSYS)
/* No system call available. Use the emulation. */ /* No system call available. Use the emulation. */

View File

@ -19,6 +19,7 @@
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <endian.h>
#include <sysdep.h> #include <sysdep.h>
#include <sys/syscall.h> #include <sys/syscall.h>
@ -47,14 +48,9 @@ __libc_pread64 (fd, buf, count, offset)
ssize_t result; ssize_t result;
/* First try the syscall. */ /* First try the syscall. */
# if defined(__MIPSEB__)
result = INLINE_SYSCALL (pread, 6, fd, buf, count, 0, (off_t) (offset >> 32),
(off_t) (offset & 0xffffffff));
# elif defined(__MIPSEL__)
result = INLINE_SYSCALL (pread, 6, fd, buf, count, 0, result = INLINE_SYSCALL (pread, 6, fd, buf, count, 0,
(off_t) (offset & 0xffffffff), __LONG_LONG_PAIR ((off_t) (offset >> 32),
(off_t) (offset >> 32)); (off_t) (offset & 0xffffffff)));
# endif
# if __ASSUME_PREAD_SYSCALL == 0 # if __ASSUME_PREAD_SYSCALL == 0
if (result == -1 && errno == ENOSYS) if (result == -1 && errno == ENOSYS)
/* No system call available. Use the emulation. */ /* No system call available. Use the emulation. */

View File

@ -19,6 +19,7 @@
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <endian.h>
#include <sysdep.h> #include <sysdep.h>
#include <sys/syscall.h> #include <sys/syscall.h>
@ -45,11 +46,8 @@ __libc_pwrite (fd, buf, count, offset)
ssize_t result; ssize_t result;
/* First try the syscall. */ /* First try the syscall. */
# if defined(__MIPSEB__) result = INLINE_SYSCALL (pwrite, 6, fd, buf, count, 0,
result = INLINE_SYSCALL (pwrite, 6, fd, buf, count, 0, 0, offset); __LONG_LONG_PAIR (0, offset));
# elif defined(__MIPSEL__)
result = INLINE_SYSCALL (pwrite, 6, fd, buf, count, 0, offset, 0);
# endif
# if __ASSUME_PWRITE_SYSCALL == 0 # if __ASSUME_PWRITE_SYSCALL == 0
if (result == -1 && errno == ENOSYS) if (result == -1 && errno == ENOSYS)
/* No system call available. Use the emulation. */ /* No system call available. Use the emulation. */

View File

@ -19,6 +19,7 @@
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <endian.h>
#include <sysdep.h> #include <sysdep.h>
#include <sys/syscall.h> #include <sys/syscall.h>
@ -45,15 +46,9 @@ __libc_pwrite64 (fd, buf, count, offset)
ssize_t result; ssize_t result;
/* First try the syscall. */ /* First try the syscall. */
# if defined(__MIPSEB__)
result = INLINE_SYSCALL (pwrite, 6, fd, buf, count, 0, (off_t) (offset >> 32),
(off_t) (offset & 0xffffffff));
# elif defined(__MIPSEL__)
result = INLINE_SYSCALL (pwrite, 6, fd, buf, count, 0, result = INLINE_SYSCALL (pwrite, 6, fd, buf, count, 0,
(off_t) (offset & 0xffffffff), __LONG_LONG_PAIR ((off_t) (offset >> 32),
(off_t) (offset >> 32)); (off_t) (offset & 0xffffffff)));
# endif
# if __ASSUME_PWRITE_SYSCALL == 0 # if __ASSUME_PWRITE_SYSCALL == 0
if (result == -1 && errno == ENOSYS) if (result == -1 && errno == ENOSYS)
/* No system call available. Use the emulation. */ /* No system call available. Use the emulation. */

View File

@ -50,14 +50,8 @@ truncate64 (const char *path, off64_t length)
#ifndef __ASSUME_TRUNCATE64_SYSCALL #ifndef __ASSUME_TRUNCATE64_SYSCALL
int saved_errno = errno; int saved_errno = errno;
#endif #endif
#if __BYTE_ORDER == __LITTLE_ENDIAN int result = INLINE_SYSCALL (truncate64, 3, path, 0,
/* Use a fill argument to pass low, high in an aligned pair of __LONG_LONG_PAIR (high, low));
arguments (here 2/3). */
int result = INLINE_SYSCALL (truncate64, 3, path, 0, low, high);
#elif __BYTE_ORDER == __BIG_ENDIAN
int result = INLINE_SYSCALL (truncate64, 3, path, 0, high, low);
#endif
#ifndef __ASSUME_TRUNCATE64_SYSCALL #ifndef __ASSUME_TRUNCATE64_SYSCALL
if (result != -1 || errno != ENOSYS) if (result != -1 || errno != ENOSYS)
#endif #endif