Browse Source

* 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.
	* 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.
cvs/glibc-2-2-branch
Greg McGary 26 years ago
parent
commit
ca1cde9e3e
  1. 14
      ChangeLog
  2. 8
      string/endian.h
  3. 7
      sysdeps/unix/sysv/linux/ftruncate64.c
  4. 9
      sysdeps/unix/sysv/linux/mips/ftruncate64.c
  5. 8
      sysdeps/unix/sysv/linux/mips/pread.c
  6. 10
      sysdeps/unix/sysv/linux/mips/pread64.c
  7. 8
      sysdeps/unix/sysv/linux/mips/pwrite.c
  8. 11
      sysdeps/unix/sysv/linux/mips/pwrite64.c
  9. 10
      sysdeps/unix/sysv/linux/mips/truncate64.c
  10. 7
      sysdeps/unix/sysv/linux/pread.c
  11. 10
      sysdeps/unix/sysv/linux/pread64.c
  12. 7
      sysdeps/unix/sysv/linux/pwrite.c
  13. 10
      sysdeps/unix/sysv/linux/pwrite64.c
  14. 7
      sysdeps/unix/sysv/linux/truncate64.c

14
ChangeLog

@ -8,6 +8,20 @@
2000-07-06 Greg McGary <greg@mcgary.org>
* 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.
* sysdeps/unix/sysv/linux/sys/ptrace.h (PT_SYSCALL): Fix LHS.
2000-07-06 Andreas Jaeger <aj@suse.de>

8
string/endian.h

@ -1,4 +1,4 @@
/* Copyright (C) 1992, 1996, 1997 Free Software Foundation, Inc.
/* Copyright (C) 1992, 1996, 1997, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -47,4 +47,10 @@
# define BYTE_ORDER __BYTE_ORDER
#endif
#if __BYTE_ORDER == __LITTLE_ENDIAN
# define __LONG_LONG_PAIR(HI, LO) LO, HI
#elif __BYTE_ORDER == __BIG_ENDIAN
# define __LONG_LONG_PAIR(HI, LO) HI, LO
#endif
#endif /* endian.h */

7
sysdeps/unix/sysv/linux/ftruncate64.c

@ -49,11 +49,8 @@ ftruncate64 (int fd, off64_t length)
#ifndef __ASSUME_TRUNCATE64_SYSCALL
int saved_errno = errno;
#endif
#if __BYTE_ORDER == __LITTLE_ENDIAN
int result = INLINE_SYSCALL (ftruncate64, 3, fd, low, high);
#elif __BYTE_ORDER == __BIG_ENDIAN
int result = INLINE_SYSCALL (ftruncate64, 3, fd, high, low);
#endif
int result = INLINE_SYSCALL (ftruncate64, 3, fd,
__LONG_LONG_PAIR (high, low));
#ifndef __ASSUME_TRUNCATE64_SYSCALL
if (result != -1 || errno != ENOSYS)
#endif

9
sysdeps/unix/sysv/linux/mips/ftruncate64.c

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

8
sysdeps/unix/sysv/linux/mips/pread.c

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

10
sysdeps/unix/sysv/linux/mips/pread64.c

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

8
sysdeps/unix/sysv/linux/mips/pwrite.c

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

11
sysdeps/unix/sysv/linux/mips/pwrite64.c

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

10
sysdeps/unix/sysv/linux/mips/truncate64.c

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

7
sysdeps/unix/sysv/linux/pread.c

@ -48,11 +48,8 @@ __libc_pread (fd, buf, count, offset)
ssize_t result;
/* First try the syscall. */
# if __BYTE_ORDER == __LITTLE_ENDIAN
result = INLINE_SYSCALL (pread, 5, fd, buf, count, offset, 0);
# elif __BYTE_ORDER == __BIG_ENDIAN
result = INLINE_SYSCALL (pread, 5, fd, buf, count, 0, offset);
# endif
result = INLINE_SYSCALL (pread, 5, fd, buf, count,
__LONG_LONG_PAIR (0, offset));
# if __ASSUME_PREAD_SYSCALL == 0
if (result == -1 && errno == ENOSYS)

10
sysdeps/unix/sysv/linux/pread64.c

@ -47,15 +47,9 @@ __libc_pread64 (fd, buf, count, offset)
ssize_t result;
/* First try the syscall. */
# if __BYTE_ORDER == __LITTLE_ENDIAN
result = INLINE_SYSCALL (pread, 5, fd, buf, count,
(off_t) (offset & 0xffffffff),
(off_t) (offset >> 32));
# elif __BYTE_ORDER == __BIG_ENDIAN
result = INLINE_SYSCALL (pread, 5, fd, buf, count,
(off_t) (offset >> 32),
(off_t) (offset & 0xffffffff));
# endif
__LONG_LONG_PAIR ((off_t) (offset >> 32),
(off_t) (offset & 0xffffffff)));
# if __ASSUME_PREAD_SYSCALL == 0
if (result == -1 && errno == ENOSYS)

7
sysdeps/unix/sysv/linux/pwrite.c

@ -48,11 +48,8 @@ __libc_pwrite (fd, buf, count, offset)
ssize_t result;
/* First try the syscall. */
# if __BYTE_ORDER == __LITTLE_ENDIAN
result = INLINE_SYSCALL (pwrite, 5, fd, buf, count, offset, 0);
# elif __BYTE_ORDER == __BIG_ENDIAN
result = INLINE_SYSCALL (pwrite, 5, fd, buf, count, 0, offset);
# endif
result = INLINE_SYSCALL (pwrite, 5, fd, buf, count,
__LONG_LONG_PAIR (0, offset));
# if __ASSUME_PWRITE_SYSCALL == 0
if (result == -1 && errno == ENOSYS)
/* No system call available. Use the emulation. */

10
sysdeps/unix/sysv/linux/pwrite64.c

@ -47,15 +47,9 @@ __libc_pwrite64 (fd, buf, count, offset)
ssize_t result;
/* First try the syscall. */
# if __BYTE_ORDER == __LITTLE_ENDIAN
result = INLINE_SYSCALL (pwrite, 5, fd, buf, count,
(off_t) (offset & 0xffffffff),
(off_t) (offset >> 32));
# elif __BYTE_ORDER == __BIG_ENDIAN
result = INLINE_SYSCALL (pwrite, 5, fd, buf, count,
(off_t) (offset >> 32),
(off_t) (offset & 0xffffffff));
# endif
__LONG_LONG_PAIR ((off_t) (offset >> 32),
(off_t) (offset & 0xffffffff)));
# if __ASSUME_PWRITE_SYSCALL == 0
if (result == -1 && errno == ENOSYS)
/* No system call available. Use the emulation. */

7
sysdeps/unix/sysv/linux/truncate64.c

@ -49,11 +49,8 @@ truncate64 (const char *path, off64_t length)
#ifndef __ASSUME_TRUNCATE64_SYSCALL
int saved_errno = errno;
#endif
#if __BYTE_ORDER == __LITTLE_ENDIAN
int result = INLINE_SYSCALL (truncate64, 3, path, low, high);
#elif __BYTE_ORDER == __BIG_ENDIAN
int result = INLINE_SYSCALL (truncate64, 3, path, high, low);
#endif
int result = INLINE_SYSCALL (truncate64, 3, path,
__LONG_LONG_PAIR (high, low));
#ifndef __ASSUME_TRUNCATE64_SYSCALL
if (result != -1 || errno != ENOSYS)

Loading…
Cancel
Save