2002-10-05 Roland McGrath <roland@redhat.com>

	* include/stubs-prologue.h: New file.  Give #error under #ifdef _LIBC.
	* Makefile ($(inst_includedir)/gnu/stubs.h): Depend on it.
	Use that file's contents instead of literal echo's for the prologue.
	* include/features.h: Include <gnu/stubs.h> unconditionally.
	* include/gnu/stubs.h: New file.

2 files changed, 5 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 36ba5d60fe..942b28518b 100644
--- a/Makefile
+++ b/Makefile
@@ -163,14 +163,10 @@ subdir-stubs := $(foreach dir,$(subdirs),$(common-objpfx)$(dir)/stubs)
 # iterates over all the subdirs; subdir_install in each subdir depends on
 # the subdir's stubs file.  Having more direct dependencies would result in
 # extra iterations over the list for subdirs and many recursive makes.
-$(inst_includedir)/gnu/stubs.h: subdir_install
+$(inst_includedir)/gnu/stubs.h: include/stubs-prologue.h subdir_install
 	$(make-target-directory)
 	@rm -f $(objpfx)stubs.h
-	(echo '/* This file is automatically generated.';\
-	 echo '   It defines a symbol `__stub_FUNCTION'\'' for each function';\
-	 echo '   in the C library which is a stub, meaning it will fail';\
-	 echo '   every time called, usually setting errno to ENOSYS.  */';\
-	 LC_ALL=C sort $(subdir-stubs)) > $(objpfx)stubs.h
+	(sed '/^@/d' $<; LC_ALL=C sort $(subdir-stubs)) > $(objpfx)stubs.h
 	if test -r $@ && cmp -s $(objpfx)stubs.h $@; \
 	then echo 'stubs.h unchanged'; \
 	else $(INSTALL_DATA) $(objpfx)stubs.h $@; fi
diff --git a/NEWS b/NEWS
index 7d80d1ab45..f8550a15ab 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,9 @@ Version 2.3.2
   and are now also available on the Hurd.
 
 * ELF thread-local storage support (TLS) now works on x86-64.
+
+* The new dynamic string token $LIB is expanded in shared library names.
+  This normally expands to lib, but on some 64-bit platforms to lib64 instead.
 
 Version 2.3