Update.

1998-03-27 22:46  Ulrich Drepper  <drepper@cygnus.com>

	* Rules: Allow Makefiles to specify test-static for tests which
	cannot be linked dynamically.
	* math/Makefile: Move atest-exp, atest-sincos, atest-exp2 to
	tests-static.

	* libc.map: Add __nss_passwd_lookup, __nss_group_lookup, __nss_next.

	* misc/error.c: Pretty print.

1998-03-27  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* Makerules (libc_nonshared-name): Remove variable.
	(installed-libcs): Use libc-name instead.
	($(inst_libdir)/libc.so): Likewise.  Remove explicit reference to
	dynamic linker.

	* Makeconfig (link-libc): Link against libc_nonshared.a instead of
	libc.a.  Remove explicit reference to dynamic linker.

1998-03-27  Ulrich Drepper  <drepper@cygnus.com>

	* iconvdata/iso8859-1.c (gconv): Add cast to assignment from char
	to wchar_t.
	* iconv/iconv_prog.c: Correctly test for write failure.
	* iconvdata/Makefile: Add rules for EUC-KR, UHC, and JOHAB conversions.
	* iconvdata/gconv-modules: Likewise.
	* iconvdata/euckr.c: New file.
	* iconvdata/johab.c: New file.
	* iconvdata/ksc5601.c: New file.
	* iconvdata/ksc5601.h: New file.
	* iconvdata/uhc.c: New file.
	Contributed by Jungshik Shin <jshin@pantheon.yale.edu>.

	* libio/fileops.c (_IO_file_fopen): Interpret x flag to fopen.
	* stdio/fopen.c: Correct handling of 'x' flag.
	Reported by Jason M. Petry <jason@ps.ohio-state.edu>.

1998-03-27  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* sunrpc/rpc/key_prot.h: Prevent warning by unknown pragma ident.
	* sunrpc/rpcsvc/key_prot.x: Likewise.
	* sunrpc/key_prot.c: Likewise.

1998-03-27 13:49  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/i386/bits/string.h: Correct things which never worked.
	* sysdeps/i386/i486/bits/string.h: Add clobber marks.
	Patches by Bernd Schmidt <crux@Pool.Informatik.RWTH-Aachen.DE>.

1998-03-27  Ulrich Drepper  <drepper@cygnus.com>

	* intl/textdomain.c [_LIBC]: Define strdup only if not yet
	defined.  Reported by Thorsten Kukuk.

1 files changed, 7 insertions, 13 deletions

diff --git a/Makerules b/Makerules
index 780c4b90d2..26f8398041 100644
--- a/Makerules
+++ b/Makerules
@@ -602,9 +602,6 @@ endef
 ifndef libc-name
 libc-name := c
 endif
-ifndef libc_nonshared-name
-libc_nonshared-name := $(libc-name)_nonshared
-endif
 
 define do-install
 $(make-target-directory)
@@ -628,7 +625,7 @@ installed-libcs := $(foreach o,$(object-suffixes),\
 installed-libcs := $(filter-out %_pic.a,$(installed-libcs))
 ifdef libc.so-version
 installed-libcs += $(inst_libdir)/$(patsubst %,$(libtype.oS),\
-					     $(libprefix)$(libc_nonshared-name))
+					     $(libprefix)$(libc-name))
 endif
 install: $(installed-libcs)
 $(installed-libcs): $(inst_libdir)/lib$(libprefix)%: lib
@@ -706,18 +703,15 @@ ifndef subdir
 # in libc.a and the dynamic linker is an extra object.
 install: $(inst_libdir)/libc.so
 $(inst_libdir)/libc.so: $(common-objpfx)libc.so$(libc.so-version) \
-			$(elfobjdir)/$(rtld-installed-name) \
-			$(inst_libdir)/lib$(libc_nonshared-name).a
+			$(inst_libdir)/$(patsubst %,$(libtype.oS),\
+						  $(libprefix)$(libc-name))
 	(echo '/* GNU ld script';\
 	 echo '   Use the shared library, but some functions are only in';\
-	 echo '   the static library, so try that secondarily.'; \
-	 echo '   The dynamic linker defines some functions used by $(<F),';\
-	 echo '	  but ld uses definitions from libc.a before examining the';\
-	 echo '   dependencies of $(<F) to find $(rtld-installed-name).  */';\
+	 echo '   the static library, so try that secondarily.  */';\
 	 echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \
-	      '$(slibdir)/$(rtld-installed-name)' \
-	      '$(libdir)/lib$(libc_nonshared-name).a )' \
-	      ) > $@.new
+	      '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
+	      ')' \
+	) > $@.new
 	mv -f $@.new $@
 
 endif