diff options
| author | Andreas Jaeger <aj@suse.de> | 2004-07-20 16:39:51 +0000 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2004-07-20 16:39:51 +0000 |
| commit | 918f187fcf2a559a0fc284b085560442e16f6c75 (patch) | |
| tree | e2ec6a0c731c52e608af49316e2295741b6227f2 /sysdeps/unix/sysv/linux/mips/pread.c | |
| parent | 1346854bae1694e0bd9e2c61f52764f3f97cfc40 (diff) | |
| download | glibc-918f187fcf2a559a0fc284b085560442e16f6c75.tar.gz glibc-918f187fcf2a559a0fc284b085560442e16f6c75.tar.xz glibc-918f187fcf2a559a0fc284b085560442e16f6c75.zip | |
UPdate.
* sysdeps/unix/sysv/linux/mips/Makefile ($(objpfx)syscall-%.h): Sort by syscalls. Make sure we get headers such as sgidefs.h from the build tree before just-installed ones. * sysdeps/mips/atomicity.h, sysdeps/mips/dl-machine.h, sysdeps/mips/machine-gmon.h, sysdeps/mips/bits/setjmp.h, sysdeps/mips/fpu/bits/mathdef.h, sysdeps/mips/mips64/__longjmp.c, sysdeps/mips/mips64/setjmp_aux.c, sysdeps/unix/sysv/linux/mips/kernel_stat.h, sysdeps/unix/sysv/linux/mips/pread.c, sysdeps/unix/sysv/linux/mips/pread64.c, sysdeps/unix/sysv/linux/mips/ptrace.c, sysdeps/unix/sysv/linux/mips/pwrite.c, sysdeps/unix/sysv/linux/mips/pwrite64.c, sysdeps/unix/sysv/linux/mips/sigaction.c, sysdeps/unix/sysv/linux/mips/sigcontextinfo.h, sysdeps/unix/sysv/linux/mips/bits/fcntl.h, sysdeps/unix/sysv/linux/mips/bits/sigcontext.h, sysdeps/unix/sysv/linux/mips/bits/stat.h, sysdeps/unix/sysv/linux/mips/sys/procfs.h, sysdeps/unix/sysv/linux/mips/sys/ptrace.h, sysdeps/unix/sysv/linux/mips/sys/tas.h, sysdeps/unix/sysv/linux/mips/sys/ucontext.h, sysdeps/unix/sysv/linux/mips/sys/user.h: Use standard names for ABI macros, include sgidefs.h where appropriate. sysdeps/unix/sysv/linux/mips/Makefile ($(objpfx)syscall-%.h): Likewise. sysdeps/unix/sysv/linux/mips/configure.in (asm-unistd.h): Likewise. sysdeps/unix/sysv/linux/mips/configure: Rebuilt.
Diffstat (limited to 'sysdeps/unix/sysv/linux/mips/pread.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/pread.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/mips/pread.c b/sysdeps/unix/sysv/linux/mips/pread.c index 7a9b0860ba..d2a6c69db5 100644 --- a/sysdeps/unix/sysv/linux/mips/pread.c +++ b/sysdeps/unix/sysv/linux/mips/pread.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1997, 1998, 2000, 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 2000, 2002, 2003, 2004 + Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -27,6 +28,7 @@ #include <bp-checks.h> #include <kernel-features.h> +#include <sgidefs.h> #ifdef __NR_pread64 /* Newer kernels renamed but it's the same. */ # ifdef __NR_pread @@ -51,14 +53,14 @@ __libc_pread (fd, buf, count, offset) { ssize_t result; -#if (defined _ABI64 && _MIPS_SIM != _ABI64) +#if _MIPS_SIM != _MIPS_SIM_ABI64 assert (sizeof (offset) == 4); #endif if (SINGLE_THREAD_P) { /* First try the syscall. */ -#if (defined _ABIN32 && _MIPS_SIM == _ABIN32) || (defined _ABI64 && _MIPS_SIM == _ABI64) +#if _MIPS_SIM == _MIPS_SIM_NABI32 || _MIPS_SIM == _MIPS_SIM_ABI64 result = INLINE_SYSCALL (pread, 4, fd, CHECK_N (buf, count), count, offset); #else @@ -76,7 +78,7 @@ __libc_pread (fd, buf, count, offset) int oldtype = LIBC_CANCEL_ASYNC (); /* First try the syscall. */ -#if (defined _ABIN32 && _MIPS_SIM == _ABIN32) || (defined _ABI64 && _MIPS_SIM == _ABI64) +#if _MIPS_SIM == _MIPS_SIM_NABI32 || _MIPS_SIM_ABI64 result = INLINE_SYSCALL (pread, 4, fd, CHECK_N (buf, count), count, offset); #else result = INLINE_SYSCALL (pread, 6, fd, CHECK_N (buf, count), count, 0, |