Update.

1998-02-09  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/unix/sysv/linux/syscalls.list: Don't mark lchown as
	extra syscall.

	* grp/Makefile: Fix logic when checking for thread package.
	* pwd/Makefile: Likewise.

1998-02-11 08:23  H.J. Lu  <hjl@gnu.org>

	* elf/Makefile (rtld-map): Replaced by libc-map.

	* elf/rtld.map: Removed.

	* libc.map (__libc_enable_secure, _dl_catch_error,
	_dl_check_all_versions, _dl_debug_initialize, _dl_debug_state,
	_dl_default_scope, _dl_global_scope_end, _dl_init_next,
	_dl_lookup_symbol, _dl_map_object, _dl_map_object_deps,
	_dl_object_relocation_scope, _dl_relocate_object,
	_dl_signal_error, _dl_starting_up, _dl_sysdep_start,
	_r_debug): Added for ld.so.

1998-02-10 08:38  H.J. Lu  <hjl@gnu.org>

	* libio/iofclose.c: Check PIC && DO_VERSIONING instead of
	DO_VERSIONING.
	* libio/iofdopen.c: Ditto.
	* libio/iofopen.c: Ditto.
	* libio/oldfileops.c: Ditto.

	* libc.map (sys_nerr, _sys_errlist, sys_errlist): Added for
	version GLIBC_2.1.

	* sysdeps/unix/sysv/linux/Makefile (stdio-common): Removed
	oldsiglist from sysdep_routines and shared-only-routines.

	* sysdeps/unix/sysv/linux/errlist.c: New.
	* sysdeps/unix/sysv/linux/errlist.h: New.
	* sysdeps/unix/sysv/linux/sizes.h: New.
	* sysdeps/unix/sysv/linux/alpha/sizes.h: New.
	* sysdeps/unix/sysv/linux/sparc64/sizes.h: New.

	* sysdeps/unix/sysv/linux/oldsiglist.c: Removed.

	* sysdeps/unix/sysv/linux/siglist.c: Include <sizes.h>.
	(__old_sys_siglist, __old_sys_sigabbrev): Use ELF .size
	directive.

	* sysdeps/unix/sysv/linux/siglist.h (OLD_SIGLIST_SIZE_STR): New.

	* sysdeps/unix/sysv/linux/Dist (errlist.h, sizes.h.): Added.
	(oldsiglist.c): Removed.

	* sysdeps/gnu/errlist.awk (SYS_SIGLIST, SYS_NERR): New.
	(_sys_siglist): Use SYS_SIGLIST instead.
	(_sys_nerr): Use SYS_NERR instead.

	* sysdeps/gnu/errlist.c: Rebuilt.

1998-02-11 08:35  H.J. Lu  <hjl@gnu.org>

	* elf/Makefile (others-static): New, set to ldconfig.
	($(objpfx)ldconfig): Removed.

	* Rules (binaries-all, binaries-static, binaries-shared): New.
	Create targets for $(binaries-static) and $(binaries-shared).

	* Makeconfig (+link-static, link-libc-static,
	link-extra-libs-static): New for static linking.

2 files changed, 3 insertions, 22 deletions

diff --git a/elf/Makefile b/elf/Makefile
index eb3ff48caf..85dba53f99 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -35,7 +35,6 @@ elide-routines.os = $(dl-routines) dl-support enbl-secure
 # ld.so uses those routines, plus some special stuff for being the program
 # interpreter and operating independent of libc.
 rtld-routines	:= rtld $(dl-routines) dl-sysdep dl-minimal
-rtld-map	:= rtld.map
 distribute	= $(rtld-routines:=.c) dynamic-link.h do-rel.h dl-machine.h \
 		  dl-hash.h soinit.c sofini.c ldd.sh.in ldd.bash.in eval.c \
 		  genrtldtbl.awk atomicity.h dl-procinfo.h
@@ -61,15 +60,9 @@ generated      += ldd
 endif
 
 ifeq (yes,$(has-ldconfig))
+others-static	+= ldconfig
 others		+= ldconfig
 install-rootsbin = ldconfig
-
-$(objpfx)ldconfig: $(objpfx)ldconfig.o
-	$(CC) -nostdlib -nostartfiles -o $@ $(sysdep-LDFLAGS) -static	      \
-	      $(addprefix $(csu-objpfx),start.o) $(+preinit)		      \
-	      $(filter-out $(addprefix $(csu-objpfx),start.o) $(+preinit)     \
-		$(link-extra-libs) $(common-objpfx)libc% $(+postinit),$^)     \
-	      $(link-extra-libs) $(common-objpfx)libc.a $(gnulib) $(+postinit)
 endif
 
 include ../Rules
@@ -114,7 +107,7 @@ define rtld-link
 $(LINK.o) -nostdlib -nostartfiles -shared -o $@ \
 	  -Wl,-rpath=$(default-rpath) $(LDFLAGS-rtld) \
 	  $(filter-out $(objpfx)rtld-ldscript,$^) \
-	  -Wl,--version-script=$(rtld-map)
+	  -Wl,--version-script=$(libc-map)
 endef
 else
 $(objpfx)ld.so: $(objpfx)librtld.os
@@ -123,7 +116,7 @@ $(objpfx)ld.so: $(objpfx)librtld.os
 define rtld-link
 $(LINK.o) -nostdlib -nostartfiles -shared -o $@ \
 	  -Wl,-rpath=$(default-rpath) $^ \
-	  -Wl,--version-script=$(rtld-map)
+	  -Wl,--version-script=$(libc-map)
 endef
 endif
 
diff --git a/elf/rtld.map b/elf/rtld.map
deleted file mode 100644
index 8daf2aa97a..0000000000
--- a/elf/rtld.map
+++ /dev/null
@@ -1,12 +0,0 @@
-GLIBC_2.0 {
-  global:
-    # Not right, but I'll figure it out.
-    *;
-
-#  local:
-#    *;
-};
-
-GLIBC_2.1 {
-
-} GLIBC_2.0;