Remove non-add-on Banner files.

Various subdirectories of glibc include Banner files to put some text
in the output of executing libc.so.6, under "Available extensions".

Some of those subdirectories (e.g. crypt) may originally have been
add-ons (and so optional, so a particular glibc build might or might
not have included them), but except for libidn they aren't now (or if
only included in some builds, in the case of soft-fp, the inclusion
depends on the architecture for which glibc is configured rather than
having any glibc configuration for which it's an optional feature),
and it doesn't seem useful for the libc.so.6 output to call out a few
features like that.

This patch removes the non-add-on Banner files, updating contrib.texi
where they noted contributions not otherwise mentioned there.

Tested for x86_64.

	* crypt/Banner: Remove file.
	* nptl/Banner: Likewise.
	* resolv/Banner: Likewise.
	* soft-fp/Banner: Likewise.
	* nptl/Makefile ($(objpfx)banner.h): Remove rule.
	($(objpfx)version.d): Remove dependency on banner.h.
	($(objpfx)version.os): Likewise.
	* nptl/version.c (banner): Do not include banner.h.
	* manual/contrib.texi: Update entries for Richard Henderson, Jakub
	Jelinek and BIND code.

diff --git a/ChangeLog b/ChangeLog
index d7eb7549b33e7c96bce2f1ae049d55c61ce0d938..399f30d95674815eb22d743952c40726b0a85ff4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2017-09-21  Joseph Myers  <joseph@codesourcery.com>
+
+       * crypt/Banner: Remove file.
+       * nptl/Banner: Likewise.
+       * resolv/Banner: Likewise.
+       * soft-fp/Banner: Likewise.
+       * nptl/Makefile ($(objpfx)banner.h): Remove rule.
+       ($(objpfx)version.d): Remove dependency on banner.h.
+       ($(objpfx)version.os): Likewise.
+       * nptl/version.c (banner): Do not include banner.h.
+       * manual/contrib.texi: Update entries for Richard Henderson, Jakub
+       Jelinek and BIND code.
+
 2017-09-20  Paul Pluzhnikov  <ppluzhnikov@google.com>
            Carlos O'Donell  <carlos@redhat.com>
 

diff --git a/crypt/Banner b/crypt/Banner
deleted file mode 100644 (file)
index 9cb25bd..0000000
--- a/crypt/Banner
+++ /dev/null
@@ -1 +0,0 @@
-crypt add-on version 2.1 by Michael Glad and others

diff --git a/manual/contrib.texi b/manual/contrib.texi
index fff45b92b9aa08e56764585309e1629e163b1a8d..62798b091c6af0bb6b6a9ee5b261f36017aa305e 100644 (file)
--- a/manual/contrib.texi
+++ b/manual/contrib.texi
@@ -149,7 +149,7 @@ implementations.
 
 @item
 Richard Henderson for the port to Linux on Alpha
-(@code{alpha-@var{anything}-linux}).
+(@code{alpha-@var{anything}-linux}) and software floating-point support.
 
 @item
 David Holsgrove for the port to Linux on MicroBlaze.
@@ -171,7 +171,8 @@ Aurelien Jarno for various fixes.
 Rical Jasan for contributing various fixes in @theglibc{} manual.
 
 @item
-Jakub Jelinek for implementing a number of checking functions and for
+Jakub Jelinek for implementing a number of checking functions,
+software floating-point support and for
 his direction as part of @theglibc{} steering committee.
 
 @item
@@ -450,7 +451,7 @@ code were written by Craig Metz; see the file @file{LICENSES} for
 details on their licensing.
 
 @item
-The DNS resolver code is taken directly from BIND 4.9.5, which
+The DNS resolver code is taken directly from BIND 8.2.3-T5B, which
 includes copyrighted code from UC Berkeley and from Digital Equipment
 Corporation.  See the file @file{LICENSES} for the text of the DEC license.
 

diff --git a/nptl/Banner b/nptl/Banner
deleted file mode 100644 (file)
index 8c88d52..0000000
--- a/nptl/Banner
+++ /dev/null
@@ -1 +0,0 @@
-Native POSIX Threads Library

diff --git a/nptl/Makefile b/nptl/Makefile
index 9925f0f7458f54c9b9da4e9fcf0c5350514cc7ce..d819349f43e20260596cafe95a37e13607229880 100644 (file)
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -677,11 +677,6 @@ generated += libpthread_nonshared.a \
 generated += $(objpfx)tst-atfork2.mtrace \
             $(addsuffix .so,$(strip $(modules-names)))
 
-$(objpfx)version.d: $(objpfx)banner.h
-$(objpfx)version.os: $(objpfx)banner.h
-$(objpfx)banner.h: Banner
-       sed 's/\(.*\)/"\1\\n"/' $< > $@
-generated += banner.h
 # Give libpthread.so an entry point and make it directly runnable itself.
 LDFLAGS-pthread.so += -e __nptl_main
 # pt-interp.c exists just to get the runtime linker path into libpthread.so.

diff --git a/nptl/version.c b/nptl/version.c
index d9513fb84f04e40eba6da5fb8cb73a8de9c329d2..313eb0cd7f2bf61f3e499cf84a1b5aa158f70643 100644 (file)
--- a/nptl/version.c
+++ b/nptl/version.c
@@ -22,8 +22,8 @@
 
 
 static const char banner[] =
-#include "banner.h"
-"Copyright (C) 2017 Free Software Foundation, Inc.\n\
+"Native POSIX Threads Library\n\
+Copyright (C) 2017 Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
 PARTICULAR PURPOSE.\n"

diff --git a/resolv/Banner b/resolv/Banner
deleted file mode 100644 (file)
index e585ed8..0000000
--- a/resolv/Banner
+++ /dev/null
@@ -1 +0,0 @@
-BIND-8.2.3-T5B

diff --git a/soft-fp/Banner b/soft-fp/Banner
deleted file mode 100644 (file)
index 940395c..0000000
--- a/soft-fp/Banner
+++ /dev/null
@@ -1 +0,0 @@
-software FPU emulation by Richard Henderson, Jakub Jelinek and others