Update.

1998-07-20 17:09  Ulrich Drepper  <drepper@cygnus.com>

	* shlib-versions: Remove definition for libSegFault.

	* memory.texi: Comment out the relocating allocator description.
	* manual/signal.texi: Remove reference to relocating allocator.
	* manual/top-menu.texi: Regenerated.

	* posix/fnmatch.c: Implement [: :] and change to recognize
	^ as negation only when not _POSIXLY_CORRECT.

	* sysdeps/generic/glob.c: Add several optimizations.

	* posix/glob.h: Undefine __PMT to prevent warnings.
	Reported by Roland McGrath.

	* posix/regex.c: Define namespace macros only for _LIBC.

	* sysdeps/arm/dl-machine.h: Fix typo.

	* sysdeps/unix/sysv/sysv4/solaris2/sigpending.c: New file.
	* sysdeps/unix/sysv/sysv4/solaris2/sigstack.c: New file.
	* sysdeps/unix/sysv/sysv4/solaris2/sigwaitinfo.c: New file.
	* sysdeps/unix/sysv/sysv4/solaris2/syscalls.list: Add sigaltstack,
	sigpending, sigqueue, and sigtimedwait.
	* sysdeps/unix/sysv/sysv4/solaris2/sparc/sparc32/syscall.S: New file.

	* timezone/leapseconds: Update from tzdata1998f.

1998-07-18  Mark Kettenis  <kettenis@phys.uva.nl>

	* stdio/stdio.h [__USE_GNU]: Add prototype for fputs_unlocked.
	* stdio/Versions [GLIBC_2.1]: Add fputs_unlocked.
	* libio/stdio.h: Fix typo.

1998-07-19  Roland McGrath  <roland@baalperazim.frob.com>

	* sysdeps/mach/hurd/dl-sysdep.c (_dl_sysdep_start): #if 0 out the
	magic memobj port arg parsing stuff.  Fix it someday when we are ready
	to really use it.
	(_dl_sysdep_output): New function, modified from _dl_sysdep_error.
	(_dl_sysdep_error, _dl_sysdep_message, _dl_sysdep_fatal): Removed.

1998-07-19  Roland McGrath  <roland@baalperazim.frob.com>

	* stdio/fputs.c: Add fputs_unlocked as weak alias for fputs.

1998-07-19  Roland McGrath  <roland@baalperazim.frob.com>

	* sysdeps/posix/sigsuspend.c: Define __sigsuspend with sigsuspend as
	a weak alias.
	* sysdeps/mach/hurd/sigsuspend.c: Likewise.
	* sysdeps/generic/sigsuspend.c: Likewise.

1998-07-19  Roland McGrath  <roland@baalperazim.frob.com>

	* sysdeps/mach/hurd/i386/sigcontextinfo.h: New file.

1998-07-19  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* Makerules (map-file): Don't use $(wildcard) to find the
	generated version script, instead look in $(version-maps).
	($(common-objpfx)libc.so): Only depend on libc.map if versioning
	is used.
	* extra-lib.mk ($(objpfx)$(lib).so): Only depend on version script
	if versioning is used.  Don't use $(wildcard) to find the
	generated version script, instead look in $(verson-maps).

1998-07-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/generic/segfault.c: Rename GET_EIP to GET_PC.  Remove
	unused function handle.
	* sysdeps/generic/sigcontextinfo.h: Rename GET_EIP to GET_PC.
	* sysdeps/unix/sysv/linux/i386/sigcontextinfo.h: Likewise.
	* debug/catchsegv.sh: Fix argument processing, quoting and various
	typos.  Put the crash info always in the current directory.  Find
	program in $PATH if it contains no directory component.
	* Makerules (install-lib.so-versioned,
	install-lib.so-unversioned): New variables.
	(install-lib-nosubdir): Depend on unversioned libs in
	slibdir, not libdir.

1998-07-19  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* Make-dist (+tsrcs): Remove references to %-map variables and
	*.map files.  Add Versions in subdirs.
	* Makerules (distinfo-vars): Don't write out %-map variables.

1998-07-20 13:55  Ulrich Drepper  <drepper@cygnus.com>

	* inet/protocols/rwhod.h: Remove definition of _PATH_RWHODIR.
	Include <paths.h> instead.
	* sysdeps/generic/paths.h: Define _PATH_RWHODIR.
	* sysdeps/unix/sysv/linux/paths.h: Likewise.
	Reported by Dale Scheetz <dwarf@polaris.net>.

1998-07-17 21:44  Ulrich Drepper  <drepper@cygnus.com>

	* catgets/open_catalog.c: Strictly check whether catalog file is
	larger enough for the data.  Reported by Andries.Brouwer@cwi.nl.

1 files changed, 19 insertions, 12 deletions

diff --git a/Makerules b/Makerules
index 9bf62c6..ec6b12c 100644
--- a/Makerules
+++ b/Makerules
@@ -350,8 +350,9 @@ ifeq (yes,$(build-shared))
 # Reference map file only when versioning is selected and a map file name
 # is given.
 ifeq ($(versioning),yes)
-map-file = $(firstword $(wildcard $($(@F:.so=-map)) \
-				  $(common-objpfx)$(@F:.so=.map)))
+map-file = $(firstword $($(@F:.so=-map)) \
+		       $(addprefix $(common-objpfx), \
+				   $(filter $(@F:.so=.map),$(version-maps))))
 load-map-file = $(map-file:%=-Wl,--version-script=%)
 endif
 
@@ -370,8 +371,7 @@ $(LINK.o) -shared -o $@ $(sysdep-LDFLAGS) $(config-LDFLAGS)  \
 	  $(LDFLAGS.so) $(LDFLAGS-$(@F:lib%.so=%).so) \
 	  -L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link) \
 	  -Wl,--whole-archive \
-	  $(filter-out $(map-file) $(common-objpfx)$(@F:.so=.map) \
-		       $(+preinit) $(+postinit),$^) \
+	  $(filter-out $(map-file) $(+preinit) $(+postinit),$^) \
 	  $(no-whole-archive) $(LDLIBS-$(@F:lib%.so=%).so)
 endef
 
@@ -411,9 +411,11 @@ $(common-objpfx)libc_pic.os: $(common-objpfx)libc_pic.a
 $(common-objpfx)libc.so: $(elfobjdir)/soinit.os \
 			 $(common-objpfx)libc_pic.os \
 			 $(elfobjdir)/sofini.os \
-			 $(elfobjdir)/interp.os $(elfobjdir)/ld.so \
-			 $(common-objpfx)libc.map
+			 $(elfobjdir)/interp.os $(elfobjdir)/ld.so
 	$(build-shlib)
+ifeq ($(versioning),yes)
+$(common-objpfx)libc.so: $(common-objpfx)libc.map
+endif
 common-generated += libc.so libc_pic.os
 ifdef libc.so-version
 $(common-objpfx)libc.so$(libc.so-version): $(common-objpfx)libc.so
@@ -615,17 +617,22 @@ endef
 
 install-lib.so := $(filter %.so,$(install-lib:%_pic.a=%.so))
 install-lib := $(filter-out %.so %_pic.a,$(install-lib))
-ifeq (yes,$(build-shared))
-
-install-lib-nosubdir: $(install-lib.so:%=$(inst_libdir)/%)
 
+ifeq (yes,$(build-shared))
 # Find which .so's have versions.
 versioned := $(strip $(foreach so,$(install-lib.so),\
 			       $(patsubst %,$(so),$($(so)-version))))
 
+install-lib.so-versioned := $(filter $(versioned), $(install-lib.so))
+install-lib.so-unversioned := $(filter-out $(versioned), $(install-lib.so))
+
+install-lib-nosubdir: $(install-lib.so-versioned:%=$(inst_libdir)/%) \
+		      $(install-lib.so-unversioned:%=$(inst_slibdir)/%)
+
 # Install all the unversioned shared libraries.
-$(addprefix $(inst_slibdir)/, $(filter-out $(versioned),$(install-lib.so))): \
-	$(inst_slibdir)/%.so: $(objpfx)%.so $(+force); $(do-install-program)
+$(install-lib.so-unversioned:%=$(inst_slibdir)/%): $(inst_slibdir)/%.so: \
+    $(objpfx)%.so $(+force)
+	$(do-install-program)
 
 ifneq ($(findstring -s,$(LN_S)),)
 define make-link
@@ -954,7 +961,7 @@ echo > $@.new 'subdir := $(subdir)'
 $(foreach var,subdir-dirs sources elided-routines sysdep_routines \
 	      headers sysdep_headers distribute dont_distribute generated \
 	      others tests test-srcs extra-libs $(extra-libs:%=%-routines) \
-	      tests-static $(extra-libs:%=%-map) versioned \
+	      tests-static versioned \
 	      $(addprefix install-,lib lib.so data bin sbin others),
 echo >> $@.new '$(subdir)-$(var) := $($(var))'
 echo >> $@.new '$(var) = $$($(subdir)-$(var))')