From patchwork Fri Sep 22 17:15:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 23081 Received: (qmail 49121 invoked by alias); 22 Sep 2017 17:15:26 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 44732 invoked by uid 89); 22 Sep 2017 17:15:16 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy=U*$, csu, credit, t X-HELO: relay1.mentorg.com Date: Fri, 22 Sep 2017 17:15:02 +0000 From: Joseph Myers To: Subject: Remove Banner mechanism Message-ID: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) This patch removes the Banner mechanism, with the last remaining Banner file replaced by a contrib.texi entry. This accords with the principle that the output of running libc.so.6 is not the place to credit particular contributions (the manual is), and with all other configuration options not mentioned there, it doesn't seem appropriate to focus there on the one question of whether the one remaining piece configured as an add-on was enabled or not. Tested for x86_64. 2017-09-22 Joseph Myers * csu/Makefile (generated): Do not add version-info.h. (before-compile): Likewise. (all-Banner-files): Remove variable. ($(objpfx)version-info.h): Remove rule. * csu/version.c (banner): Do not include "version-info.h". * libidn/Banner: Remove. * manual/contrib.texi (Simon Josefsson): New entry. Reviewed-by: Carlos O'Donell diff --git a/csu/Makefile b/csu/Makefile index 490d0b0..fd668a5 100644 --- a/csu/Makefile +++ b/csu/Makefile @@ -39,8 +39,6 @@ omit-deps = $(patsubst %.o,%,$(start-installed-name) g$(start-installed-name) \ b$(start-installed-name) $(csu-dummies) \ S$(start-installed-name)) install-lib = $(start-installed-name) g$(start-installed-name) $(csu-dummies) -generated += version-info.h -before-compile += $(objpfx)version-info.h # No tests are allowed in the csu/ subdirectory because the startup # code is compiled with special flags. @@ -149,16 +147,3 @@ $(objpfx)abi-tag.h: $(..)abi-tags done if test -r $@.new; then mv -f $@.new $@; \ else echo >&2 'This configuration not matched in $<'; exit 1; fi - -all-Banner-files = $(wildcard $(addsuffix /Banner,\ - $(sort $(subdir-srcdirs) \ - $(sysdeps-srcdirs)))) -$(objpfx)version-info.h: $(common-objpfx)config.make $(all-Banner-files) - $(make-target-directory) - (files="$(all-Banner-files)"; \ - if test -n "$$files"; then \ - printf '"Available extensions:\\n"\n'; \ - sed -e '/^#/d' -e 's/^[[:space:]]*/ /' \ - -e 's/^\(.*\)$$/\"\1\\n\"/' $$files; \ - fi) > $@T - mv -f $@T $@ diff --git a/csu/version.c b/csu/version.c index f3992ab..8e86d49 100644 --- a/csu/version.c +++ b/csu/version.c @@ -30,7 +30,6 @@ 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\ Compiled by GNU CC version "__VERSION__".\n" -#include "version-info.h" #ifdef LIBC_ABIS_STRING LIBC_ABIS_STRING #endif diff --git a/libidn/Banner b/libidn/Banner deleted file mode 100644 index c31e757..0000000 --- a/libidn/Banner +++ /dev/null @@ -1 +0,0 @@ -GNU Libidn by Simon Josefsson diff --git a/manual/contrib.texi b/manual/contrib.texi index 62798b0..fbf42db 100644 --- a/manual/contrib.texi +++ b/manual/contrib.texi @@ -176,6 +176,9 @@ software floating-point support and for his direction as part of @theglibc{} steering committee. @item +Simon Josefsson for the @code{libidn} add-on. + +@item Geoffrey Keating for the port to Linux on PowerPC (@code{powerpc-@var{anything}-linux}).