2002-07-17 Jeff Johnston <jjohnstn@redhat.com>

        * configure.host(stdio64_dir): New setting that is used to
        enable building of new stdio64 directory.
        * libc/Makefile.am[HAVE_STDIO64_DIR]: Add support for
        large files.
        (stmp-stdio64,stdio64.texi): New targets to optionally add in
        stdio64 info to info files.
        * libc/Makefile.in: Regenerated.
        * libc/configure: Ditto.
        * libc/configure.in: Add configuration variables that are set
        when stdio64 is selected as subdir in configure.host.
        * libc/libc.texinfo: Add optional menu item for Stdio64, based
        on whether STDIO64 flag is set or not.
        * libc/sys.tex: Add optional stdio64 syscalls based on whether
        STDIO64 flag is set or not.
        * libc/include/reent.h[__LARGE64_FILES]: Add new stdio64
        _r sycall routines.
        * libc/include/stdio.h[__LARGE64_FILES]: Add new stdio64 prototypes.
        (FILE): Typedef'd to __FILE instead of struct __sFILE directly.
        (__SL64): New file flag indicating file is opened via fopen64.
        * libc/include/sys/_types.h(_off64_t): Added.
        * libc/include/sys/config.h: For x86-linux, define __LARGE64_FILES.
        * libc/include/sys/reent.h(struct __sFILE64): New file structure
        for 64-bit offset large file support.
        (__FILE): New intermediate type either set to struct __sFILE64 or
        struct __sFILE, depending on whether __LARGE64_FILES is set or not.
        * libc/reent/Makefile.am[HAVE_STDIO64_DIR]: Add new files.
        * libc/reent/Makefile.in: Regenerated.
        * libc/reent/fstat64r.c: New file.
        * libc/reent/lseek64r.c: Ditto.
        * libc/reent/open64r.c: Ditto.
        * libc/reent/reent.tex: Optionally add stdio64 reentrant syscalls
        based on whether STDIO64 flag is set.
        * libc/stdio/stdio.tex: Add blank line.
        * libc/stdio64/Makefile.am: New file.
        * libc/stdio64/Makefile.in: Ditto.
        * libc/stdio64/fgetpos64.c: Ditto.
        * libc/stdio64/fopen64.: Ditto.
        * libc/stdio64/freopen64.c: Ditto.
        * libc/stdio64/fseeko64.c: Ditto.
        * libc/stdio64/fsetpos64.c: Ditto.
        * libc/stdio64/ftello64.c: Ditto.
        * libc/stdio64/local64.h: Ditto.
        * libc/stdio64/stdio64.c: Ditto.
        * libc/stdio64/stdio64.tex: Ditto.
        * libc/stdio64/tmpfile64.c: Ditto.
        * libc/sys/linux/io64.c: Add weak aliases for lseek64, fstat64, and
        open64.

6 files changed, 248 insertions, 2 deletions

diff --git a/newlib/libc/reent/Makefile.am b/newlib/libc/reent/Makefile.am
index 0333eff03..0504158d4 100644
--- a/newlib/libc/reent/Makefile.am
+++ b/newlib/libc/reent/Makefile.am
@@ -4,6 +4,18 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
+if HAVE_STDIO64_DIR
+STDIO64_OBJECTS = \
+	fstat64r.$(oext) \
+	lseek64r.$(oext) \
+	open64r.$(oext)
+
+STDIO64_DEFS = \
+	fstat64r.def \
+	lseek64r.def \
+	open64r.def
+endif
+
 LIB_SOURCES = \
 	closer.c \
 	reent.c \
@@ -28,10 +40,14 @@ libreent_la_LDFLAGS = -Xcompiler -nostdlib
 if USE_LIBTOOL
 noinst_LTLIBRARIES = libreent.la
 libreent_la_SOURCES = $(LIB_SOURCES)
+libreent_la_LIBADD = $(STDIO64_OBJECTS)
+libreent_la_DEPENDENCIES = $(STDIO64_OBJECTS)
 noinst_DATA = objectlist.awk.in
 else
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = $(LIB_SOURCES)
+lib_a_LIBADD = $(STDIO64_OBJECTS)
+lib_a_DEPENDENCIES = $(STDIO64_OBJECTS)
 noinst_DATA =
 endif # USE_LIBTOOL
 
@@ -51,6 +67,7 @@ CHEWOUT_FILES = \
 	statr.def \
 	timer.def \
 	unlinkr.def \
+	$(STDIO64_DEFS) \
 	writer.def
 
 SUFFIXES = .def .h
diff --git a/newlib/libc/reent/Makefile.in b/newlib/libc/reent/Makefile.in
index dd08deca6..91d0bce7a 100644
--- a/newlib/libc/reent/Makefile.in
+++ b/newlib/libc/reent/Makefile.in
@@ -82,6 +82,8 @@ LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
+LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
+LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
@@ -108,6 +110,16 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
+@HAVE_STDIO64_DIR_TRUE@STDIO64_OBJECTS = @HAVE_STDIO64_DIR_TRUE@\
+@HAVE_STDIO64_DIR_TRUE@	fstat64r.$(oext) \
+@HAVE_STDIO64_DIR_TRUE@	lseek64r.$(oext) \
+@HAVE_STDIO64_DIR_TRUE@	open64r.$(oext)
+
+@HAVE_STDIO64_DIR_TRUE@STDIO64_DEFS = @HAVE_STDIO64_DIR_TRUE@\
+@HAVE_STDIO64_DIR_TRUE@	fstat64r.def \
+@HAVE_STDIO64_DIR_TRUE@	lseek64r.def \
+@HAVE_STDIO64_DIR_TRUE@	open64r.def
+
 LIB_SOURCES = \
 	closer.c \
 	reent.c \
@@ -132,10 +144,14 @@ libreent_la_LDFLAGS = -Xcompiler -nostdlib
 
 @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libreent.la
 @USE_LIBTOOL_TRUE@libreent_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES)
+@USE_LIBTOOL_TRUE@libreent_la_LIBADD = @USE_LIBTOOL_TRUE@$(STDIO64_OBJECTS)
+@USE_LIBTOOL_TRUE@libreent_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@$(STDIO64_OBJECTS)
 @USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in
 @USE_LIBTOOL_FALSE@noinst_DATA = 
 @USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
 @USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES)
+@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(STDIO64_OBJECTS)
+@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = @USE_LIBTOOL_FALSE@$(STDIO64_OBJECTS)
 
 CHEWOUT_FILES = \
 	closer.def \
@@ -151,6 +167,7 @@ CHEWOUT_FILES = \
 	statr.def \
 	timer.def \
 	unlinkr.def \
+	$(STDIO64_DEFS) \
 	writer.def
 
 
@@ -169,7 +186,6 @@ LIBRARIES =  $(noinst_LIBRARIES)
 DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
-lib_a_LIBADD = 
 @USE_LIBTOOL_FALSE@lib_a_OBJECTS =  closer.$(OBJEXT) reent.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@impure.$(OBJEXT) execr.$(OBJEXT) fstatr.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@getreent.$(OBJEXT) linkr.$(OBJEXT) lseekr.$(OBJEXT) \
@@ -178,7 +194,6 @@ lib_a_LIBADD =
 @USE_LIBTOOL_FALSE@timer.$(OBJEXT) unlinkr.$(OBJEXT) writer.$(OBJEXT)
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
-libreent_la_LIBADD = 
 @USE_LIBTOOL_TRUE@libreent_la_OBJECTS =  closer.lo reent.lo impure.lo \
 @USE_LIBTOOL_TRUE@execr.lo fstatr.lo getreent.lo linkr.lo lseekr.lo \
 @USE_LIBTOOL_TRUE@openr.lo readr.lo signalr.lo signgam.lo sbrkr.lo \
diff --git a/newlib/libc/reent/fstat64r.c b/newlib/libc/reent/fstat64r.c
new file mode 100644
index 000000000..c74cf58d4
--- /dev/null
+++ b/newlib/libc/reent/fstat64r.c
@@ -0,0 +1,72 @@
+#ifdef __LARGE64_FILES
+
+/* Reentrant versions of fstat system call.  This implementation just
+   calls the fstat system call.  */
+
+#include <reent.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <_syslist.h>
+
+/* Some targets provides their own versions of these functions.  Those
+   targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS.  */
+
+#ifdef _REENT_ONLY
+#ifndef REENTRANT_SYSCALLS_PROVIDED
+#define REENTRANT_SYSCALLS_PROVIDED
+#endif
+#endif
+
+#ifdef REENTRANT_SYSCALLS_PROVIDED
+
+int _dummy_fstat_syscalls = 1;
+
+#else
+
+/* We use the errno variable used by the system dependent layer.  */
+#undef errno
+extern int errno;
+
+/*
+FUNCTION
+	<<_fstat64_r>>---Reentrant version of fstat64
+	
+INDEX
+	_fstat64_r
+
+ANSI_SYNOPSIS
+	#include <reent.h>
+	int _fstat64_r(struct _reent *<[ptr]>,
+		       int <[fd]>, struct stat64 *<[pstat]>);
+
+TRAD_SYNOPSIS
+	#include <reent.h>
+	int _fstat64_r(<[ptr]>, <[fd]>, <[pstat]>)
+	struct _reent *<[ptr]>;
+	int <[fd]>;
+	struct stat *<[pstat]>;
+
+DESCRIPTION
+	This is a reentrant version of <<fstat64>>.  It
+	takes a pointer to the global data block, which holds
+	<<errno>>.  This function is only enabled on systems
+	that define __LARGE64_FILES.
+*/
+
+int
+_fstat64_r (ptr, fd, pstat)
+     struct _reent *ptr;
+     int fd;
+     struct stat64 *pstat;
+{
+  int ret;
+
+  errno = 0;
+  if ((ret = _fstat64 (fd, pstat)) == -1 && errno != 0)
+    ptr->_errno = errno;
+  return ret;
+}
+
+#endif /* ! defined (REENTRANT_SYSCALLS_PROVIDED) */
+
+#endif /* __LARGE64_FILES */
diff --git a/newlib/libc/reent/lseek64r.c b/newlib/libc/reent/lseek64r.c
new file mode 100644
index 000000000..c760a5b5d
--- /dev/null
+++ b/newlib/libc/reent/lseek64r.c
@@ -0,0 +1,68 @@
+#ifdef __LARGE64_FILES
+
+/* Reentrant versions of lseek system call. */
+
+#include <reent.h>
+#include <unistd.h>
+#include <_syslist.h>
+
+/* Some targets provides their own versions of this functions.  Those
+   targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS.  */
+
+#ifdef _REENT_ONLY
+#ifndef REENTRANT_SYSCALLS_PROVIDED
+#define REENTRANT_SYSCALLS_PROVIDED
+#endif
+#endif
+
+#ifndef REENTRANT_SYSCALLS_PROVIDED
+
+/* We use the errno variable used by the system dependent layer.  */
+#undef errno
+extern int errno;
+
+/*
+FUNCTION
+	<<_lseek64_r>>---Reentrant version of lseek
+	
+INDEX
+	_lseek64_r
+
+ANSI_SYNOPSIS
+	#include <reent.h>
+	off64_t _lseek64_r(struct _reent *<[ptr]>,
+		           int <[fd]>, off64_t <[pos]>, int <[whence]>);
+
+TRAD_SYNOPSIS
+	#include <reent.h>
+	off64_t _lseek64_r(<[ptr]>, <[fd]>, <[pos]>, <[whence]>)
+	struct _reent *<[ptr]>;
+	int <[fd]>;
+	off64_t <[pos]>;
+	int <[whence]>;
+
+DESCRIPTION
+	This is a reentrant version of <<lseek64>>.  It
+	takes a pointer to the global data block, which holds
+	<<errno>>.  This function only exists on a system
+        with large file support.
+*/
+
+off64_t
+_lseek64_r (ptr, fd, pos, whence)
+     struct _reent *ptr;
+     int fd;
+     off64_t pos;
+     int whence;
+{
+  off64_t ret;
+
+  errno = 0;
+  if ((ret = _lseek64 (fd, pos, whence)) == (off64_t) -1 && errno != 0)
+    ptr->_errno = errno;
+  return ret;
+}
+
+#endif /* ! defined (REENTRANT_SYSCALLS_PROVIDED) */
+
+#endif /* __LARGE64_FILES */
diff --git a/newlib/libc/reent/open64r.c b/newlib/libc/reent/open64r.c
new file mode 100644
index 000000000..d5ec7bcc5
--- /dev/null
+++ b/newlib/libc/reent/open64r.c
@@ -0,0 +1,69 @@
+#ifdef __LARGE64_FILES
+
+/* Reentrant versions of open system call. */
+
+#include <reent.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <_syslist.h>
+
+/* Some targets provides their own versions of this functions.  Those
+   targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS.  */
+
+#ifdef _REENT_ONLY
+#ifndef REENTRANT_SYSCALLS_PROVIDED
+#define REENTRANT_SYSCALLS_PROVIDED
+#endif
+#endif
+
+#ifndef REENTRANT_SYSCALLS_PROVIDED
+
+/* We use the errno variable used by the system dependent layer.  */
+#undef errno
+extern int errno;
+
+/*
+FUNCTION
+	<<_open64_r>>---Reentrant version of open64
+	
+INDEX
+	_open64_r
+
+ANSI_SYNOPSIS
+	#include <reent.h>
+	int _open64_r(struct _reent *<[ptr]>,
+  		      const char *<[file]>, int <[flags]>, int <[mode]>);
+
+TRAD_SYNOPSIS
+	#include <reent.h>
+	int _open64_r(<[ptr]>, <[file]>, <[flags]>, <[mode]>)
+	struct _reent *<[ptr]>;
+	char *<[file]>;
+	int <[flags]>;
+	int <[mode]>;
+
+DESCRIPTION
+	This is a reentrant version of <<open64>>.  It
+	takes a pointer to the global data block, which holds
+	<<errno>>.  This function only exists on systems with
+        large file support.
+*/
+
+int
+_open64_r (ptr, file, flags, mode)
+     struct _reent *ptr;
+     _CONST char *file;
+     int flags;
+     int mode;
+{
+  int ret;
+
+  errno = 0;
+  if ((ret = _open64 (file, flags, mode)) == -1 && errno != 0)
+    ptr->_errno = errno;
+  return ret;
+}
+
+#endif /* ! defined (REENTRANT_SYSCALLS_PROVIDED) */
+
+#endif /* __LARGE64_FILES */
diff --git a/newlib/libc/reent/reent.tex b/newlib/libc/reent/reent.tex
index 545624ca9..e76330b32 100644
--- a/newlib/libc/reent/reent.tex
+++ b/newlib/libc/reent/reent.tex
@@ -107,6 +107,11 @@ _fstat_r        _sbrk_r
 _gettimeofday_r _stat_r
 _getpid_r       _times_r
 
+@ifset STDIO64
+@exdent @emph{Additional 64-bit I/O System functions:}
+_fstat64_r	_lseek64_r	_open64_r
+@end ifset
+
 @exdent @emph{Time function:}
 _asctime_r
 @end example