+2000-05-27 Andreas Jaeger <aj@suse.de>
+
+ * sysdeps/unix/sysv/linux/i386/pread.c: Removed, we can use the
+ normal version now.
+ * sysdeps/unix/sysv/linux/i386/pwrite.c: Likewise.
+ * sysdeps/unix/sysv/linux/i386/pwrite64.c: Likewise.
+ * sysdeps/unix/sysv/linux/mips/pread.c: Likewise.
+ * sysdeps/unix/sysv/linux/mips/pwrite.c: Likewise.
+ * sysdeps/unix/sysv/linux/arm/pread.c: Likewise.
+ * sysdeps/unix/sysv/linux/arm/pwrite.c: Likewise.
+
+ * sysdeps/unix/sysv/linux/pread.c (__libc_pread): Check
+ endianness to decide how to pass arguments.
+ * sysdeps/unix/sysv/linux/pwrite.c (__libc_pwrite): Likewise.
+
+ * elf/vismain.c: Use test-skeleton interface.
+ (TEST_FUNCTION): New macro.
+ (do_test): Renamed from main.
+
2000-05-27 Ulrich Drepper <drepper@redhat.com>
* sysdeps/posix/getaddrinfo.c (gaih_inet): If req->ai_family ==
#include <stdlib.h>
#include <string.h>
+/* Prototype for our test function. */
+extern int do_test (void);
+
+#define TEST_FUNCTION do_test ()
+
+/* This defines the `main' function and some more. */
+#include <test-skeleton.c>
+
/* Prototypes for the functions in the DSOs. */
extern int calllocal1 (void);
extern int (*getlocal1 (void)) (void);
extern const char *protvaritcpt;
int
-main (void)
+do_test (void)
{
int res = 0;
int val;
+++ /dev/null
-#include <sysdeps/unix/sysv/linux/i386/pread.c>
+++ /dev/null
-#include <sysdeps/unix/sysv/linux/i386/pwrite.c>
+++ /dev/null
-/* Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-#include <errno.h>
-#include <unistd.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#include <kernel-features.h>
-
-#if defined __NR_pread || __ASSUME_PREAD_SYSCALL > 0
-
-# if __ASSUME_PREAD_SYSCALL == 0
-static ssize_t __emulate_pread (int fd, void *buf, size_t count,
- off_t offset) internal_function;
-# endif
-extern ssize_t __syscall_pread (int fd, void *buf, size_t count, int dummy,
- off_t offset_hi, off_t offset_lo);
-
-
-
-ssize_t
-__libc_pread (fd, buf, count, offset)
- int fd;
- void *buf;
- size_t count;
- off_t 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
-# if __ASSUME_PREAD_SYSCALL == 0
- if (result == -1 && errno == ENOSYS)
- /* No system call available. Use the emulation. */
- result = __emulate_pread (fd, buf, count, offset);
-# endif
- return result;
-}
-
-strong_alias (__libc_pread, __pread)
-weak_alias (__libc_pread, pread)
-
-# define __libc_pread(fd, buf, count, offset) \
- static internal_function __emulate_pread (fd, buf, count, offset)
-#endif
-
-#if __ASSUME_PREAD_SYSCALL == 0
-# include <sysdeps/posix/pread.c>
-#endif
+++ /dev/null
-/* Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-#include <errno.h>
-#include <unistd.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#include <kernel-features.h>
-
-#if defined __NR_pwrite || __ASSUME_PWRITE_SYSCALL > 0
-
-extern ssize_t __syscall_pwrite (int fd, const void *buf, size_t count,
- int dummy, off_t offset_hi, off_t offset_lo);
-
-# if __ASSUME_PWRITE_SYSCALL == 0
-static ssize_t __emulate_pwrite (int fd, const void *buf, size_t count,
- off_t offset) internal_function;
-# endif
-
-ssize_t
-__libc_pwrite (fd, buf, count, offset)
- int fd;
- const void *buf;
- size_t count;
- off_t 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
-# if __ASSUME_PWRITE_SYSCALL == 0
- if (result == -1 && errno == ENOSYS)
- /* No system call available. Use the emulation. */
- result = __emulate_pwrite (fd, buf, count, offset);
-# endif
-
- return result;
-}
-
-strong_alias (__libc_pwrite, __pwrite)
-weak_alias (__libc_pwrite, pwrite)
-
-# define __libc_pwrite(fd, buf, count, offset) \
- static internal_function __emulate_pwrite (fd, buf, count, offset)
-#endif
-
-#if __ASSUME_PWRITE_SYSCALL == 0
-# include <sysdeps/posix/pwrite.c>
-#endif
-/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
Boston, MA 02111-1307, USA. */
#include <errno.h>
+#include <endian.h>
#include <unistd.h>
#include <sysdep.h>
#if defined __NR_pread || __ASSUME_PREAD_SYSCALL > 0
+/* The order of hi, lo depends on endianness. */
extern ssize_t __syscall_pread (int fd, void *buf, size_t count,
off_t offset_hi, off_t offset_lo);
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
+
# if __ASSUME_PREAD_SYSCALL == 0
if (result == -1 && errno == ENOSYS)
/* No system call available. Use the emulation. */
-/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
Boston, MA 02111-1307, USA. */
#include <errno.h>
+#include <endian.h>
#include <unistd.h>
#include <sysdep.h>
#if defined __NR_pwrite || __ASSUME_PWRITE_SYSCALL > 0
+/* The order of hi, lo depends on endianness. */
extern ssize_t __syscall_pwrite (int fd, const void *buf, size_t count,
off_t offset_hi, off_t offset_lo);
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
# if __ASSUME_PWRITE_SYSCALL == 0
if (result == -1 && errno == ENOSYS)
/* No system call available. Use the emulation. */
projects / thirdparty / glibc.git / commitdiff
