From patchwork Thu Sep 21 16:56:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 817040 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-84819-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="JN3m9uXh"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xyjSN6dMVz9s7c for ; Fri, 22 Sep 2017 02:56:36 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; q=dns; s=default; b=Umz+iYU2IEOV5YWI8c3jYLXHDy1R0 +smZQMDMRWI/KfCkaKe1zlkfEAg/7YFXA6SZwa4crmG9/AGk0CMu/vToFlEISI6J OkWv8hAdFwjvWkM6Njd81G9P6JnPxbQlw+IODM04ESYZ+FmnYWaMosqz3rupbXAI tpOsDG/gM4dlqc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; s=default; bh=fwAwulL79f35afNxPz2qP+CARo0=; b=JN3 m9uXhzrqVqLXmX5LMliE8EnYm4khislSCZ+8aWfnyA+yW1/lP8PcX+yIc4XIjUq3 J8uymMvGkwYTeFk55Fax51xrcVtrjMS5Owpk58VEgQduqVB/sneeyQR+GejzIoRv i/snt06nPi/PHkeuPpEgdjYOY6M9u5PYhe6RAKp4= Received: (qmail 22608 invoked by alias); 21 Sep 2017 16:56:30 -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 22598 invoked by uid 89); 21 Sep 2017 16:56:30 -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=Equipment, Alpha, addon, crypt X-HELO: relay1.mentorg.com Date: Thu, 21 Sep 2017 16:56:20 +0000 From: Joseph Myers To: Subject: Remove non-add-on Banner files 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) 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. I think it also makes sense to remove the libidn Banner file and the whole Banner mechanism (there are plenty of configuration choices not mentioned in the libc.so.6 output, why should this one be special?), and, independently, to remove the whole add-ons mechanism and just build libidn via Subdirs. 2017-09-21 Joseph Myers * 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. Reviewed-by: Carlos O'Donll Reviewed-by: Carlos O'Donell diff --git a/crypt/Banner b/crypt/Banner deleted file mode 100644 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 fff45b9..62798b0 100644 --- 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 index 8c88d52..0000000 --- a/nptl/Banner +++ /dev/null @@ -1 +0,0 @@ -Native POSIX Threads Library diff --git a/nptl/Makefile b/nptl/Makefile index 9925f0f..d819349 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 d9513fb..313eb0c 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" diff --git a/resolv/Banner b/resolv/Banner deleted file mode 100644 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 index 940395c..0000000 --- a/soft-fp/Banner +++ /dev/null @@ -1 +0,0 @@ -software FPU emulation by Richard Henderson, Jakub Jelinek and others