This is the mail archive of the
libc-hacker@sourceware.cygnus.com
mailing list for the glibc project.
Re: glibc-2.0.99 build problems
> From: Ulrich Drepper <drepper@cygnus.com>
> Date: 25 Oct 1998 20:33:07 -0800
>
> Geoff Keating <geoffk@ozemail.com.au> writes:
>
> > There's a bug in the way libc calls pread()/pwrite(). I sent a patch
> > in last Thursday, it's probably still in the queue.
>
> Could you please update it for the current glibc?
This is a multiple-choice patch. Please choose one of the two below.
I think the first is the more correct choice, because this is how the
functions are declared in the kernel source.
You can use Andreas' suggestion to use __builtin_classify_type to
implement INLINE_SYSCALL under these circumstances, or just special-
case __NR_p{read,write} (actually, for i386, it might work without any
special cases). It would be easier to change INLINE_SYSCALL, though.
--
Geoffrey Keating <geoffk@ozemail.com.au>
===File ~/patches/pwrite-1.patch============================
Index: pread.c
===================================================================
RCS file: /glibc/cvsfiles/libc/sysdeps/unix/sysv/linux/pread.c,v
retrieving revision 1.5
diff -u -r1.5 pread.c
--- pread.c 1998/10/26 11:07:21 1.5
+++ pread.c 1998/10/27 19:55:20
@@ -26,7 +26,7 @@
#ifdef __NR_pread
extern ssize_t __syscall_pread (int fd, void *buf, size_t count,
- off_t offset_hi, off_t offset_lo);
+ off64_t offset);
static ssize_t __emulate_pread (int fd, void *buf, size_t count,
off_t offset) internal_function;
@@ -42,7 +42,7 @@
ssize_t result;
/* First try the syscall. */
- result = INLINE_SYSCALL (pread, 5, fd, buf, count, 0, offset);
+ result = INLINE_SYSCALL (pread, 4, fd, buf, count, (off64_t)offset);
if (result == -1 && errno == ENOSYS)
/* No system call available. Use the emulation. */
result = __emulate_pread (fd, buf, count, offset);
Index: pread64.c
===================================================================
RCS file: /glibc/cvsfiles/libc/sysdeps/unix/sysv/linux/pread64.c,v
retrieving revision 1.4
diff -u -r1.4 pread64.c
--- pread64.c 1998/10/26 11:07:24 1.4
+++ pread64.c 1998/10/27 19:55:20
@@ -26,7 +26,7 @@
#ifdef __NR_pread
extern ssize_t __syscall_pread (int fd, void *buf, size_t count,
- off_t offset_hi, off_t offset_lo);
+ off64_t offset);
static ssize_t __emulate_pread64 (int fd, void *buf, size_t count,
off64_t offset) internal_function;
@@ -42,8 +42,7 @@
ssize_t result;
/* First try the syscall. */
- result = INLINE_SYSCALL (pread, 5, fd, buf, count, (off_t) (offset >> 32),
- (off_t) (offset & 0xffffffff));
+ result = INLINE_SYSCALL (pread, 4, fd, buf, count, offset);
if (result == -1 && errno == ENOSYS)
/* No system call available. Use the emulation. */
result = __emulate_pread64 (fd, buf, count, offset);
Index: pwrite.c
===================================================================
RCS file: /glibc/cvsfiles/libc/sysdeps/unix/sysv/linux/pwrite.c,v
retrieving revision 1.4
diff -u -r1.4 pwrite.c
--- pwrite.c 1998/10/21 15:11:04 1.4
+++ pwrite.c 1998/10/27 19:55:20
@@ -26,7 +26,7 @@
#ifdef __NR_pwrite
extern ssize_t __syscall_pwrite64 (int fd, const void *buf, size_t count,
- off_t offset_hi, off_t offset_lo);
+ off64_t offset);
static ssize_t __emulate_pwrite (int fd, const void *buf, size_t count,
off_t offset) internal_function;
@@ -42,7 +42,7 @@
ssize_t result;
/* First try the syscall. */
- result = INLINE_SYSCALL (pwrite, 5, fd, buf, count, 0, offset);
+ result = INLINE_SYSCALL (pwrite, 4, fd, buf, count, (off64_t)offset);
if (result == -1 && errno == ENOSYS)
/* No system call available. Use the emulation. */
result = __emulate_pwrite (fd, buf, count, offset);
Index: pwrite64.c
===================================================================
RCS file: /glibc/cvsfiles/libc/sysdeps/unix/sysv/linux/pwrite64.c,v
retrieving revision 1.3
diff -u -r1.3 pwrite64.c
--- pwrite64.c 1998/10/21 15:11:05 1.3
+++ pwrite64.c 1998/10/27 19:55:20
@@ -26,7 +26,7 @@
#ifdef __NR_pwrite
extern ssize_t __syscall_pwrite64 (int fd, const void *buf, size_t count,
- off_t offset_hi, off_t offset_lo);
+ off64_t offset);
static ssize_t __emulate_pwrite64 (int fd, const void *buf, size_t count,
off64_t offset) internal_function;
@@ -42,8 +42,7 @@
ssize_t result;
/* First try the syscall. */
- result = INLINE_SYSCALL (pwrite, 5, fd, buf, count, (off_t) (offset >> 32),
- (off_t) (offset & 0xffffffff));
+ result = INLINE_SYSCALL (pwrite, 4, fd, buf, count, offset);
if (result == -1 && errno == ENOSYS)
/* No system call available. Use the emulation. */
result = __emulate_pwrite64 (fd, buf, count, offset);
============================================================
===File ~/patches/pwrite-2.patch============================
Index: pread.c
===================================================================
RCS file: /glibc/cvsfiles/libc/sysdeps/unix/sysv/linux/powerpc/pread.c,v
retrieving revision 1.1
diff -u -r1.1 pread.c
--- pread.c 1998/10/20 23:55:36 1.1
+++ pread.c 1998/10/27 19:57:15
@@ -1 +1,58 @@
-#include <sysdeps/unix/sysv/linux/i386/pread.c>
+/* Copyright (C) 1997, 1998 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>
+
+#ifdef __NR_pread
+
+extern ssize_t __syscall_pread (int fd, void *buf, size_t count,
+ off64_t offset);
+
+static ssize_t __emulate_pread (int fd, void *buf, size_t count,
+ off_t offset) internal_function;
+
+
+ssize_t
+__pread (fd, buf, count, offset)
+ int fd;
+ void *buf;
+ size_t count;
+ off_t offset;
+{
+ ssize_t result;
+
+ /* First try the syscall. */
+ result = INLINE_SYSCALL (pread, 4, fd, buf, count, (off64_t)offset);
+ if (result == -1 && errno == ENOSYS)
+ /* No system call available. Use the emulation. */
+ result = __emulate_pread (fd, buf, count, offset);
+
+ return result;
+}
+
+weak_alias (__pread, pread)
+
+#define __pread(fd, buf, count, offset) \
+ static internal_function __emulate_pread (fd, buf, count, offset)
+#endif
+#include <sysdeps/posix/pread.c>
Index: pread64.c
===================================================================
RCS file: /glibc/cvsfiles/libc/sysdeps/unix/sysv/linux/powerpc/pread64.c,v
retrieving revision 1.1
diff -u -r1.1 pread64.c
--- pread64.c 1998/10/20 23:55:42 1.1
+++ pread64.c 1998/10/27 19:57:15
@@ -1 +1,58 @@
-#include <sysdeps/unix/sysv/linux/i386/pread64.c>
+/* Copyright (C) 1997, 1998 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>
+
+#ifdef __NR_pread
+
+extern ssize_t __syscall_pread (int fd, void *buf, size_t count,
+ off64_t offset);
+
+static ssize_t __emulate_pread64 (int fd, void *buf, size_t count,
+ off64_t offset) internal_function;
+
+
+ssize_t
+__pread64 (fd, buf, count, offset)
+ int fd;
+ void *buf;
+ size_t count;
+ off64_t offset;
+{
+ ssize_t result;
+
+ /* First try the syscall. */
+ result = INLINE_SYSCALL (pread, 4, fd, buf, count, offset);
+ if (result == -1 && errno == ENOSYS)
+ /* No system call available. Use the emulation. */
+ result = __emulate_pread64 (fd, buf, count, offset);
+
+ return result;
+}
+
+weak_alias (__pread64, pread64)
+
+#define __pread64(fd, buf, count, offset) \
+ static internal_function __emulate_pread64 (fd, buf, count, offset)
+#endif
+#include <sysdeps/posix/pread64.c>
Index: pwrite.c
===================================================================
RCS file: /glibc/cvsfiles/libc/sysdeps/unix/sysv/linux/powerpc/pwrite.c,v
retrieving revision 1.1
diff -u -r1.1 pwrite.c
--- pwrite.c 1998/10/20 23:56:01 1.1
+++ pwrite.c 1998/10/27 19:57:15
@@ -1 +1,58 @@
-#include <sysdeps/unix/sysv/linux/i386/pwrite.c>
+/* Copyright (C) 1997, 1998 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>
+
+#ifdef __NR_pwrite
+
+extern ssize_t __syscall_pwrite64 (int fd, const void *buf, size_t count,
+ off64_t offset);
+
+static ssize_t __emulate_pwrite (int fd, const void *buf, size_t count,
+ off_t offset) internal_function;
+
+
+ssize_t
+__pwrite (fd, buf, count, offset)
+ int fd;
+ const void *buf;
+ size_t count;
+ off_t offset;
+{
+ ssize_t result;
+
+ /* First try the syscall. */
+ result = INLINE_SYSCALL (pwrite, 4, fd, buf, count, (off64_t)offset);
+ if (result == -1 && errno == ENOSYS)
+ /* No system call available. Use the emulation. */
+ result = __emulate_pwrite (fd, buf, count, offset);
+
+ return result;
+}
+
+weak_alias (__pwrite, pwrite)
+
+#define __pwrite(fd, buf, count, offset) \
+ static internal_function __emulate_pwrite (fd, buf, count, offset)
+#endif
+#include <sysdeps/posix/pwrite.c>
Index: pwrite64.c
===================================================================
RCS file: /glibc/cvsfiles/libc/sysdeps/unix/sysv/linux/powerpc/pwrite64.c,v
retrieving revision 1.1
diff -u -r1.1 pwrite64.c
--- pwrite64.c 1998/10/20 23:55:54 1.1
+++ pwrite64.c 1998/10/27 19:57:16
@@ -1 +1,58 @@
-#include <sysdeps/unix/sysv/linux/i386/pwrite64.c>
+/* Copyright (C) 1997, 1998 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>
+
+#ifdef __NR_pwrite
+
+extern ssize_t __syscall_pwrite64 (int fd, const void *buf, size_t count,
+ off64_t offset);
+
+static ssize_t __emulate_pwrite64 (int fd, const void *buf, size_t count,
+ off64_t offset) internal_function;
+
+
+ssize_t
+__pwrite64 (fd, buf, count, offset)
+ int fd;
+ const void *buf;
+ size_t count;
+ off64_t offset;
+{
+ ssize_t result;
+
+ /* First try the syscall. */
+ result = INLINE_SYSCALL (pwrite, 4, fd, buf, count, offset);
+ if (result == -1 && errno == ENOSYS)
+ /* No system call available. Use the emulation. */
+ result = __emulate_pwrite64 (fd, buf, count, offset);
+
+ return result;
+}
+
+weak_alias (__pwrite64, pwrite64)
+
+#define __pwrite64(fd, buf, count, offset) \
+ static internal_function __emulate_pwrite64 (fd, buf, count, offset)
+#endif
+#include <sysdeps/posix/pwrite64.c>
============================================================