Wed May 8 20:04:29 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>

	* Rules (subdir_install): Depend on $(common-objpfx)sor-$(subdir).
	[! libc.so-version]: Clear static-only-routines.
	($(common-objpfx)sor-$(subdir)): New target.
	[static-only-routines]: New static pattern rule for these .so's.
	* Makerules [libc.so-version] ($(slibdir)/libc.so): Target removed.
	[libc.so-version] ($(libdir)/libc.so, $(common-objpfx)libc-syms.so):
	New targets replace it.
	(install) [libc.so-version]: Depend on $(libdir)/libc.so instead of
	$(slibdir)/libc.so.
	* io/Makefile (static-only-routines): New variable.
	* configure.in: Check for tools objdump and objcopy, and for awk.
	* config.make.in (OBJDUMP, OBJCOPY, AWK): New variables.

Thu May  9 01:24:00 1996  Ulrich Drepper  <drepper@cygnus.com>

	* locale/programs/config.h: Remove definition of wint_t.

	* locale/programs/ld-collate.c: Include <wchar.h> instead of
	<wcstr.h>.

	* manual/time.texi: Add some more description for %U and %W
	format of strftime.  Describe new format %V of strftime.

	* resolv/gethnamaddr.c: Prevent warning by preventing variable
	definition.
	* stdio-common/_itoa.c: Ditto.

Tue May  7 23:43:07 1996  Ulrich Drepper  <drepper@cygnus.com>

	* libio/clearerr.c, libio/feof.c, libio/ferror.c, libio/fgetc.c,
	libio/fileno.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
	libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
	libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
	libio/iofputs.c, libio/iofread.c, libio/iofsetpos.c,
	libio/ioftell.c, libio/iofwrite.c, libio/iogetdelim.c,
	libio/iogets.c, libio/ioputs.c, libio/iosetbuffer.c,
	libio/iosetvbuf.c, libio/ioungetc.c, libio/iovsprintf.c,
	libio/libio.h, libio/putc.c, libio/putchar.c, libio/rewind.c,
	libio/stdio.h, stdio-common/printf_fp.c, stdio-common/vfprintf.c,
	stdio-common/vfscanf.c: Prepare for reentrent libio.

	* libio/clearerr_u.c, libio/feof_u.c, libio/ferror_u.c,
	libio/fputc_u.c, libio/getc_u.c, libio/getchar_u.c,
	libio/iofflush_u.c, libio/putc_u.c, libio/putchar_u.c: New files.
	Used in reentrent libio.

	* misc/getusershell.c: Prevent warnings.

56 files changed, 866 insertions, 146 deletions

diff --git a/ChangeLog b/ChangeLog
index 2e42e869e6..1609c71eed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,53 @@
+Wed May  8 20:04:29 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
+
+	* Rules (subdir_install): Depend on $(common-objpfx)sor-$(subdir).
+	[! libc.so-version]: Clear static-only-routines.
+	($(common-objpfx)sor-$(subdir)): New target.
+	[static-only-routines]: New static pattern rule for these .so's.
+	* Makerules [libc.so-version] ($(slibdir)/libc.so): Target removed.
+	[libc.so-version] ($(libdir)/libc.so, $(common-objpfx)libc-syms.so):
+	New targets replace it.
+	(install) [libc.so-version]: Depend on $(libdir)/libc.so instead of
+	$(slibdir)/libc.so.
+	* io/Makefile (static-only-routines): New variable.
+	* configure.in: Check for tools objdump and objcopy, and for awk.
+	* config.make.in (OBJDUMP, OBJCOPY, AWK): New variables.
+
+Thu May  9 01:24:00 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* locale/programs/config.h: Remove definition of wint_t.
+
+	* locale/programs/ld-collate.c: Include <wchar.h> instead of
+	<wcstr.h>.
+
+	* manual/time.texi: Add some more description for %U and %W
+	format of strftime.  Describe new format %V of strftime.
+
+	* resolv/gethnamaddr.c: Prevent warning by preventing variable
+	definition.
+	* stdio-common/_itoa.c: Ditto.
+
+Tue May  7 23:43:07 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* libio/clearerr.c, libio/feof.c, libio/ferror.c, libio/fgetc.c,
+	libio/fileno.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
+	libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
+	libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
+	libio/iofputs.c, libio/iofread.c, libio/iofsetpos.c,
+	libio/ioftell.c, libio/iofwrite.c, libio/iogetdelim.c,
+	libio/iogets.c, libio/ioputs.c, libio/iosetbuffer.c,
+	libio/iosetvbuf.c, libio/ioungetc.c, libio/iovsprintf.c,
+	libio/libio.h, libio/putc.c, libio/putchar.c, libio/rewind.c,
+	libio/stdio.h, stdio-common/printf_fp.c, stdio-common/vfprintf.c,
+	stdio-common/vfscanf.c: Prepare for reentrent libio.
+
+	* libio/clearerr_u.c, libio/feof_u.c, libio/ferror_u.c,
+	libio/fputc_u.c, libio/getc_u.c, libio/getchar_u.c,
+	libio/iofflush_u.c, libio/putc_u.c, libio/putchar_u.c: New files.
+	Used in reentrent libio.
+
+	* misc/getusershell.c: Prevent warnings.
+
 Wed May  8 12:08:35 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
 
 	* Makerules (install-lib.so rules): Undouble $s in target and dep
diff --git a/Makerules b/Makerules
index d206a6edca..6305ad753b 100644
--- a/Makerules
+++ b/Makerules
@@ -550,7 +550,6 @@ install-lib := $(filter-out %.so %_pic.a,$(install-lib))
 ifeq (yes,$(build-shared))
 
 install-lib-nosubdir: $(install-lib.so:%=$(libdir)/%)
-install: $(slibdir)/libc.so
 
 # Find which .so's have versions.
 versioned := $(foreach so,$(install-lib.so),\
@@ -567,12 +566,29 @@ ifdef libc.so-version
 # libc.so	->	libc.so.N	(e.g. libc.so.6)
 # libc.so.6	->	libc-VERSION.so	(e.g. libc-1.10.so)
 
-$(slibdir)/libc.so: $(slibdir)/libc.so$(libc.so-version)
-	$(make-link)
 $(slibdir)/libc.so$(libc.so-version): $(slibdir)/libc-$(version).so
 	$(make-link)
 $(slibdir)/libc-$(version).so: $(common-objpfx)libc.so; $(do-install-program)
+
+# What we install as libc.so for programs to link against is in fact an
+# archive.  It contains the various $(static-only-routines) objects, and
+# the special object libc-syms.so that contains just the dynamic symbol
+# table of the shared libc object.
+install: $(libdir)/libc.so
+$(libdir)/libc.so: $(common-objpfx)libc-syms.so subdir_install
+	$(AR) crvs $@ $< `cat $(addprefix $(common-objpfx)sor-,$(subdirs))`
+
+# Extract from the shared object file just the dynamic symbol table
+# needed to link against the shared library.
+$(common-objpfx)libc-syms.so: $(common-objpfx)libc.so
+	AWK='$(AWK)' OBJCOPY='$(OBJCOPY)' OBJDUMP='$(OBJDUMP)' \
+	./extract-dynsym $< $@
+ifndef subdir
+generated += libc-syms.so
+endif
+
 else
+install: $(slibdir)/libc.so
 $(slibdir)/libc.so: $(common-objpfx)libc.so; $(do-install-program)
 endif
 
diff --git a/Rules b/Rules
index 8d9d0a4695..9a7a505a30 100644
--- a/Rules
+++ b/Rules
@@ -122,7 +122,33 @@ subdir_echo-distinfo:
 # our portions of the library because the parent make will install it later
 # (likewise the stubs file).
 .PHONY: subdir_install
-subdir_install: install-no-libc.a lib-noranlib stubs
+subdir_install: install-no-libc.a lib-noranlib stubs \
+		$(common-objpfx)sor-$(subdir)
+
+ifdef objpfx
+sor-objpfx = $(objpfx:../%=%)
+else
+sor-objpfx = $(subdir)
+endif
+
+ifndef libc.so-version
+# Undefine this because it can't work when we libc.so is unversioned.
+static-only-routines =
+endif
+
+# This communicates to the parent during install the set of routines that
+# need to be put into the special libc.so archive.
+$(common-objpfx)sor-$(subdir): Makefile
+	echo $(static-only-routines:%=$(sor-objpfx)%.o) > $@T
+	mv -f $@T $@
+
+ifdef static-only-routines
+# These routines are to be omitted from the shared library object,
+# so we replace the PIC objects for them with the dummy object file.
+$(static-only-routines:%=$(objpfx)%.so): %.so: $(common-objpfx) dummy.so
+	rm -f $@
+	ln $< $@
+endif
 
 .PHONY: subdir_TAGS subdir_dist
 subdir_TAGS: TAGS
diff --git a/config.make.in b/config.make.in
index 644e5edde5..a443050902 100644
--- a/config.make.in
+++ b/config.make.in
@@ -33,6 +33,9 @@ CC = @CC@
 AR = @AR@
 RANLIB = @RANLIB@
 AS = $(CC) -c
+OBJDUMP = @OBJDUMP@
+OBJCOPY = @OBJCOPY@
+AWK = @AWK@
 
 # Installation tools.
 INSTALL = @INSTALL@
diff --git a/configure.in b/configure.in
index ed288db410..d37e4d1c5b 100644
--- a/configure.in
+++ b/configure.in
@@ -301,9 +301,12 @@ AC_PROG_LN_S
 AC_CHECK_PROGS(MSGFMT, msgfmt gmsgfmt, :)
 
 AC_CHECK_TOOL(CC, gcc)
+AC_PROG_CPP
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_PROG_CPP
+AC_CHECK_TOOL(OBJDUMP, objdump)
+AC_CHECK_TOOL(OBJCOPY, objcopy)
+AC_PROG_AWK
 
 AC_CACHE_CHECK(for signed size_t type, libc_cv_signed_size_t, [dnl
 echo '#include <stddef.h>
diff --git a/io/Makefile b/io/Makefile
index 691ac03041..ce8708c7ba 100644
--- a/io/Makefile
+++ b/io/Makefile
@@ -45,6 +45,11 @@ routines :=							      \
 	unlink rmdir						      \
 	ftw fts poll
 
+# These routines will be omitted from the libc shared object.
+# Instead the static object files will be included in a special archive
+# linked against when the shared library will be used.
+static-only-routines = stat fstat lstat mknod
+
 others		:= pwd
 tests		:= test-utime
 
diff --git a/libio/clearerr.c b/libio/clearerr.c
index ee9780bdaf..669a9b0d74 100644
--- a/libio/clearerr.c
+++ b/libio/clearerr.c
@@ -1,10 +1,34 @@
+/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+
+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 "libioP.h"
 #include "stdio.h"
 
 void
-clearerr(fp)
-     FILE* fp;
+clearerr (fp)
+     FILE *fp;
 {
-  CHECK_FILE(fp, /*nothing*/);
-  _IO_clearerr(fp);
+  CHECK_FILE (fp, /*nothing*/);
+  flockfile (fp);
+  _IO_clearerr (fp);
+  funlockfile (fp);
 }
+
+#ifdef _IO_MTSAFE_IO
+weak_alias (clearerr, clearerr_locked)
+#endif
diff --git a/libio/clearerr_u.c b/libio/clearerr_u.c
new file mode 100644
index 0000000000..83ed65d8b1
--- /dev/null
+++ b/libio/clearerr_u.c
@@ -0,0 +1,30 @@
+/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+
+The GNU C Library is free software; you can redistribute it and/or
+m