Update.

1999-12-18  Ulrich Drepper  <drepper@cygnus.com>

	* include/unistd.h: Declare __libc_open64, __libc_lseek64,
	__libc_pread, __libc_pread64, __libc_pwrite, and __libc_pwrite64.
	* io/Versions: Export __libc_open64 and __libc_lseek64.
	* posix/Versions: Export __libc_pread, __libc_pread64, __libc_pwrite,
	and __libc_pwrite64.
	* sysdeps/generic/open64.c: Define __libc_* variant for cancelation
	wrapper.
	* sysdeps/generic/pread.c: Likewise.
	* sysdeps/generic/pread64.c: Likewise.
	* sysdeps/generic/pwrite.c: Likewise.
	* sysdeps/generic/pwrite64.c: Likewise.
	* sysdeps/posix/open64.c: Likewise.
	* sysdeps/posix/pread.c: Likewise.
	* sysdeps/posix/pread64.c: Likewise.
	* sysdeps/posix/pwrite.c: Likewise.
	* sysdeps/posix/pwrite64.c: Likewise.
	* sysdeps/unix/sysv/linux/llseek.c: Likewise.
	* 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/i386/pread.c: Likewise.
	* sysdeps/unix/sysv/linux/i386/pread64.c: Likewise.
	* sysdeps/unix/sysv/linux/i386/pwrite.c: Likewise.
	* sysdeps/unix/sysv/linux/i386/pwrite64.c: Likewise.

	* sysdeps/posix/open64.c: Help gcc generating better code.

	* sysdeps/generic/libc-start.c (check_one_fd): Use __libc_open
	instead of __open.

9 files changed, 33 insertions, 24 deletions

diff --git a/sysdeps/unix/sysv/linux/i386/pread.c b/sysdeps/unix/sysv/linux/i386/pread.c
index 5745648..2932e57 100644
--- a/sysdeps/unix/sysv/linux/i386/pread.c
+++ b/sysdeps/unix/sysv/linux/i386/pread.c
@@ -34,7 +34,7 @@ static ssize_t __emulate_pread (int fd, void *buf, size_t count,
 
 
 ssize_t
-__pread (fd, buf, count, offset)
+__libc_pread (fd, buf, count, offset)
      int fd;
      void *buf;
      size_t count;
@@ -53,9 +53,10 @@ __pread (fd, buf, count, offset)
   return result;
 }
 
-weak_alias (__pread, pread)
+strong_alias (__libc_pread, __pread)
+weak_alias (__libc_pread, pread)
 
-# define __pread(fd, buf, count, offset) \
+# define __libc_pread(fd, buf, count, offset) \
      static internal_function __emulate_pread (fd, buf, count, offset)
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/i386/pread64.c b/sysdeps/unix/sysv/linux/i386/pread64.c
index aa0c54d..737ff25 100644
--- a/sysdeps/unix/sysv/linux/i386/pread64.c
+++ b/sysdeps/unix/sysv/linux/i386/pread64.c
@@ -34,7 +34,7 @@ static ssize_t __emulate_pread64 (int fd, void *buf, size_t count,
 
 
 ssize_t
-__pread64 (fd, buf, count, offset)
+__libc_pread64 (fd, buf, count, offset)
      int fd;
      void *buf;
      size_t count;
@@ -55,9 +55,10 @@ __pread64 (fd, buf, count, offset)
   return result;
 }
 
-weak_alias (__pread64, pread64)
+strong_alias (__libc_pread64, __pread64)
+weak_alias (__libc_pread64, pread64)
 
-# define __pread64(fd, buf, count, offset) \
+# define __libc_pread64(fd, buf, count, offset) \
      static internal_function __emulate_pread64 (fd, buf, count, offset)
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/i386/pwrite.c b/sysdeps/unix/sysv/linux/i386/pwrite.c
index 90eee5b..114144c 100644
--- a/sysdeps/unix/sysv/linux/i386/pwrite.c
+++ b/sysdeps/unix/sysv/linux/i386/pwrite.c
@@ -34,7 +34,7 @@ static ssize_t __emulate_pwrite (int fd, const void *buf, size_t count,
 
 
 ssize_t
-__pwrite (fd, buf, count, offset)
+__libc_pwrite (fd, buf, count, offset)
      int fd;
      const void *buf;
      size_t count;
@@ -53,9 +53,10 @@ __pwrite (fd, buf, count, offset)
   return result;
 }
 
-weak_alias (__pwrite, pwrite)
+strong_alias (__libc_pwrite, __pwrite)
+weak_alias (__libc_pwrite, pwrite)
 
-# define __pwrite(fd, buf, count, offset) \
+# define __libc_pwrite(fd, buf, count, offset) \
      static internal_function __emulate_pwrite (fd, buf, count, offset)
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/i386/pwrite64.c b/sysdeps/unix/sysv/linux/i386/pwrite64.c
index 500cd7c..9dc4afb 100644
--- a/sysdeps/unix/sysv/linux/i386/pwrite64.c
+++ b/sysdeps/unix/sysv/linux/i386/pwrite64.c
@@ -34,7 +34,7 @@ static ssize_t __emulate_pwrite64 (int fd, const void *buf, size_t count,
 
 
 ssize_t
-__pwrite64 (fd, buf, count, offset)
+__libc_pwrite64 (fd, buf, count, offset)
      int fd;
      const void *buf;
      size_t count;
@@ -55,9 +55,10 @@ __pwrite64 (fd, buf, count, offset)
   return result;
 }
 
-weak_alias (__pwrite64, pwrite64)
+strong_alias (__libc_pwrite64, __pwrite64)
+weak_alias (__libc_pwrite64, pwrite64)
 
-# define __pwrite64(fd, buf, count, offset) \
+# define __libc_pwrite64(fd, buf, count, offset) \
      static internal_function __emulate_pwrite64 (fd, buf, count, offset)
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/llseek.c b/sysdeps/unix/sysv/linux/llseek.c
index a266a79..67b3435 100644
--- a/sysdeps/unix/sysv/linux/llseek.c
+++ b/sysdeps/unix/sysv/linux/llseek.c
@@ -37,5 +37,6 @@ __llseek (int fd, loff_t offset, int whence)
 				   &result, whence) ?: result);
 }
 weak_alias (__llseek, llseek)
+strong_alias (__llseek, __libc_lseek64)
 strong_alias (__llseek, __lseek64)
 weak_alias (__llseek, lseek64)
diff --git a/sysdeps/unix/sysv/linux/pread.c b/sysdeps/unix/sysv/linux/pread.c
index cae3d62..86c6dd1 100644
--- a/sysdeps/unix/sysv/linux/pread.c
+++ b/sysdeps/unix/sysv/linux/pread.c
@@ -37,7 +37,7 @@ static ssize_t __emulate_pread (int fd, void *buf, size_t count,
 
 
 ssize_t
-__pread (fd, buf, count, offset)
+__libc_pread (fd, buf, count, offset)
      int fd;
      void *buf;
      size_t count;
@@ -56,9 +56,10 @@ __pread (fd, buf, count, offset)
   return result;
 }
 
-weak_alias (__pread, pread)
+strong_alias (__libc_pread, pread)
+weak_alias (__libc_pread, pread)
 
-# define __pread(fd, buf, count, offset) \
+# define __libc_pread(fd, buf, count, offset) \
      static internal_function __emulate_pread (fd, buf, count, offset)
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/pread64.c b/sysdeps/unix/sysv/linux/pread64.c
index fc4f7f2..ec93e45 100644
--- a/sysdeps/unix/sysv/linux/pread64.c
+++ b/sysdeps/unix/sysv/linux/pread64.c
@@ -37,7 +37,7 @@ static ssize_t __emulate_pread64 (int fd, void *buf, size_t count,
 
 
 ssize_t
-__pread64 (fd, buf, count, offset)
+__libc_pread64 (fd, buf, count, offset)
      int fd;
      void *buf;
      size_t count;
@@ -57,9 +57,10 @@ __pread64 (fd, buf, count, offset)
   return result;
 }
 
-weak_alias (__pread64, pread64)
+strong_alias (__libc_pread64, __pread64)
+weak_alias (__libc_pread64, pread64)
 
-# define __pread64(fd, buf, count, offset) \
+# define __libc_pread64(fd, buf, count, offset) \
      static internal_function __emulate_pread64 (fd, buf, count, offset)
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/pwrite.c b/sysdeps/unix/sysv/linux/pwrite.c
index fd4ec88..9857678 100644
--- a/sysdeps/unix/sysv/linux/pwrite.c
+++ b/sysdeps/unix/sysv/linux/pwrite.c
@@ -37,7 +37,7 @@ static ssize_t __emulate_pwrite (int fd, const void *buf, size_t count,
 
 
 ssize_t
-__pwrite (fd, buf, count, offset)
+__libc_pwrite (fd, buf, count, offset)
      int fd;
      const void *buf;
      size_t count;
@@ -56,9 +56,10 @@ __pwrite (fd, buf, count, offset)
   return result;
 }
 
-weak_alias (__pwrite, pwrite)
+strong_alias (__libc_pwrite, __pwrite)
+weak_alias (__libc_pwrite, pwrite)
 
-# define __pwrite(fd, buf, count, offset) \
+# define __libc_pwrite(fd, buf, count, offset) \
      static internal_function __emulate_pwrite (fd, buf, count, offset)
 #endif
 
diff --git a/sysdeps/unix/sysv/linux/pwrite64.c b/sysdeps/unix/sysv/linux/pwrite64.c
index cc92de1..236cbd7 100644
--- a/sysdeps/unix/sysv/linux/pwrite64.c
+++ b/sysdeps/unix/sysv/linux/pwrite64.c
@@ -37,7 +37,7 @@ static ssize_t __emulate_pwrite64 (int fd, const void *buf, size_t count,
 
 
 ssize_t
-__pwrite64 (fd, buf, count, offset)
+__libc_pwrite64 (fd, buf, count, offset)
      int fd;
      const void *buf;
      size_t count;
@@ -57,9 +57,10 @@ __pwrite64 (fd, buf, count, offset)
   return result;
 }
 
-weak_alias (__pwrite64, pwrite64)
+strong_alias (__libc_pwrite64, __pwrite64)
+weak_alias (__libc_pwrite64, pwrite64)
 
-# define __pwrite64(fd, buf, count, offset) \
+# define __libc_pwrite64(fd, buf, count, offset) \
      static internal_function __emulate_pwrite64 (fd, buf, count, offset)
 #endif