From patchwork Thu Jun 12 17:37:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 359229 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 6548F14009E for ; Fri, 13 Jun 2014 03:37:35 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; q= dns; s=default; b=GuhCeGxG0yYCeIiNAW2D6yW5cNhpa4xuqFcjN08JlXxFEr XigGL+6ywv5y0xXuol/pau/BsOpKAH2ySaXvbLYyBJtQYvlQ2ThVWaWThkVVaGWe aDkBbwvp5XiPo9jmc2cSK1D4e7stbl4lS/5cwfFetVU5w4UC7+58lTBL3zbvg= 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:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; s= default; bh=A3KstIwqo62lszPo5emB034+QM0=; b=thHXC7IcP/nSF2so92qf 96240dMsyKOqMLDUQFGoWX2tGMOmgbFRUqdebZzHDOexusCJSUBSX3IPSEMDvMcA PdbETMupEsrmIu2XH6VEMpGcrzJVtEhVxaTOEHc3tEUUAiAZbx1OcjkBC2xjKQII F0pQQkIylcBEmfSafng8xug= Received: (qmail 4487 invoked by alias); 12 Jun 2014 17:37:29 -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 4469 invoked by uid 89); 12 Jun 2014 17:37:28 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: topped-with-meat.com MIME-Version: 1.0 From: Roland McGrath To: "GNU C. Library" Subject: [COMMITTED PATCH] Consolidate NPTL sigprocmask. Message-Id: <20140612173725.208222C39C1@topped-with-meat.com> Date: Thu, 12 Jun 2014 10:37:25 -0700 (PDT) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=SvUDtp+0 c=1 sm=1 tr=0 a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=14aYLaW8_QMA:10 a=Z6MIti7PxpgA:10 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=mDV3o1hIAAAA:8 a=_D9-8nNi9WL9t8xkAtIA:9 a=CjuIK1q_8ugA:10 Verified no code changes on x86_64-linux-gnu. Thanks, Roland * sysdeps/unix/sysv/linux/sigprocmask.c: Include . * nptl/sysdeps/pthread/sigprocmask.c: File removed. --- a/nptl/sysdeps/pthread/sigprocmask.c +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright (C) 1997-2014 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include -#include --- a/sysdeps/unix/sysv/linux/sigprocmask.c +++ b/sysdeps/unix/sysv/linux/sigprocmask.c @@ -17,12 +17,13 @@ #include #include -#include /* Neede for string function builtin redirection. */ +#include /* Needed for string function builtin redirection. */ #include #include #include +#include /* SIGCANCEL, SIGSETXID */ #include