diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2017-09-21 17:49:51 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2017-09-21 17:49:51 +0000 |
| commit | c10c5267a8c95ffea1fad70e2bf047c1dd3dfd48 (patch) | |
| tree | d1a53447bd42e2b84b73412391e9f569c96ef64a /nptl | |
| parent | 1cc9e59a93636be6772ad423f7895e7ab52e4be7 (diff) | |
| download | glibc-c10c5267a8c95ffea1fad70e2bf047c1dd3dfd48.tar.gz glibc-c10c5267a8c95ffea1fad70e2bf047c1dd3dfd48.tar.xz glibc-c10c5267a8c95ffea1fad70e2bf047c1dd3dfd48.zip | |
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.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Banner | 1 | ||||
| -rw-r--r-- | nptl/Makefile | 5 | ||||
| -rw-r--r-- | nptl/version.c | 4 |
3 files changed, 2 insertions, 8 deletions
diff --git a/nptl/Banner b/nptl/Banner deleted file mode 100644 index 8c88d52fdf..0000000000 --- a/nptl/Banner +++ /dev/null @@ -1 +0,0 @@ -Native POSIX Threads Library diff --git a/nptl/Makefile b/nptl/Makefile index 9925f0f745..d819349f43 100644 --- 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 d9513fb84f..313eb0cd7f 100644 --- 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" |