From patchwork Mon Dec 30 14:10:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 182613 Delivered-To: patch@linaro.org Received: by 2002:a92:815a:0:0:0:0:0 with SMTP id e87csp6386465ild; Mon, 30 Dec 2019 06:11:10 -0800 (PST) X-Google-Smtp-Source: APXvYqyuHDi/vzA701uM41+3Uck4MKv3bC/gDDmlmuDsI12Y9RqdfOGOt3ZTnzMkIda9TcuF8mIq X-Received: by 2002:aca:50cd:: with SMTP id e196mr5235426oib.178.1577715070176; Mon, 30 Dec 2019 06:11:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577715070; cv=none; d=google.com; s=arc-20160816; b=q1y+NrWJvetX4tkli2C6wVaMViUBKblxXkgpqjDuYDH7o5lkKMWXBYEt3liBM8tHEz wddxov6vJO0y229CoXU9x+7BHtTeJsAdKWMAGP/bdPyiV+3qdqmVhsG4cBuyjIymY027 jXcIs98hxaSxgtdvR6S4NLhh9rhXBlmrRxrFnDuSU7SCoxpO4RfcBhpXm5Z/1SuDvevB ebwah5KXM+bO+SkaHasjUeXQYDKJup+UZoDFHncergJJGcdlwykTiROYSIQ7KdYGiuue k0cBIokuIiTB7xU7hnP80GNmjWTAjJ+GwQo6mMMieuhR9u7cl9Y3DBCOd4lcS3kJS4Ii SNlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:to:from:dkim-signature:delivered-to:sender :list-help:list-post:list-archive:list-subscribe:list-unsubscribe :list-id:precedence:mailing-list:dkim-signature:domainkey-signature; bh=UAMPMFHr9uACvZSEOHn2DYOBrkSez6dyPFJIjtSk74s=; b=KM/5PkoO5984+TxipKU06opBNSOxpD+DHRSUSXj6Wwwc9odP4+CLsTCc/Op5g2rFQn VL6URp90f15oWTDBrJ6TwWsjA8ALizx6i0aQwK0wuTw5O8QMys+xWxy56mn4ehq/V+rv JrlXKEtMvoya5nbI1YjpFKS9zR+GxMoAOuWteQBxtZu7kqPovLd7I3befkXg+TRc+24T OvSNrsPnCA96HBvC5AI0z/enZMZWtSEGfes/+38CRpuzwgjBLUm2A+t06wOjaoLVIKki zsyuaEyvWK7QoENan62NCNW3l8sTW5Ol+id4dLI9GXpcbUrMvv2Si2QYs9jPY8tD1d2o ZkXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=T+p4iMI1; dkim=pass header.i=@linaro.org header.s=google header.b=T80PeKeE; spf=pass (google.com: domain of libc-alpha-return-108361-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-108361-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id n139si21873668oig.121.2019.12.30.06.11.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Dec 2019 06:11:10 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-108361-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=T+p4iMI1; dkim=pass header.i=@linaro.org header.s=google header.b=T80PeKeE; spf=pass (google.com: domain of libc-alpha-return-108361-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-108361-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id; q=dns; s= default; b=mRws6c2hL/Iu1IFElEJCXvAP822SZCW7PtnsdKvlsDgTEsis4hygK 76PQ1Jz2xtmfhQdvXsg50tpqvjWAuECR+IYOI/1BDeJuNsH3lRb3oMEV2drfm9p8 9YR0S3pLZANEZWzla1Ih7fduPgfb7XfFA5jipWYJ6RES/XsJTNM8Ro= 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:from:to:subject:date:message-id; s=default; bh=6BG+y5f2BiN38znr7+EnWLeWgUs=; b=T+p4iMI1wZ57yqFBLuj17Y1WBxu7 LOCI0zMKk98/5eMD9OwsUBUE/0dyqWIn2k9QAT8uCUpXa0Gr5hCJcVf1PjLw5dOD vefYbCEN+pJ763vYLBd33Py1qwC1QnypW103U4kyuFIPHzB7F1WNEx+ppvI1A5jD Sw+3iTSS2xWoptE= Received: (qmail 84056 invoked by alias); 30 Dec 2019 14:11:01 -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 84048 invoked by uid 89); 30 Dec 2019 14:11:01 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-pl1-f179.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id; bh=UAMPMFHr9uACvZSEOHn2DYOBrkSez6dyPFJIjtSk74s=; b=T80PeKeEYlG9qim8LXf1yeHGCJnaovFQJMsC7crXWSMj6DhdCJEz7W8wTonGyvImuv zBGNu4tL7ZxPZVauUXiy+uY0k+tWOHVGIoE/ti4X5n9iWlDQT20hEIUK0m0lNYFW2xR7 C+eUVCKWrpAWx+XSRhYBAypYZ5dhdc1P2NhiD1PTuZ22/h4HbmGPKqWp049b5TaE6JXw HXvELA7qj+Vec1mqUkkb0WvABO6vMBGaR2cT/XfMTcu6J4IBUGTY07HYu9+Wv/5zGZyp GxUpgaRgGc2EZvn81UKCYv1BXIo9GSNCq2kdDGoxylYW39CIGIm9/3AwRohw5HAwO4TO sf8w== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [COMMITTED] alpha: Set wait4 as cancellation entrypoint Date: Mon, 30 Dec 2019 11:10:51 -0300 Message-Id: <20191230141051.25795-1-adhemerval.zanella@linaro.org> Since both wait and waitpid are implemented on top of wait4. It fixes nptl/tst-cancel{x}{4,5,7}. Checked on alpha-linux-gnu. --- sysdeps/unix/sysv/linux/alpha/syscalls.list | 1 - sysdeps/unix/sysv/linux/alpha/wait4.c | 26 +++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 sysdeps/unix/sysv/linux/alpha/wait4.c -- 2.17.1 diff --git a/sysdeps/unix/sysv/linux/alpha/syscalls.list b/sysdeps/unix/sysv/linux/alpha/syscalls.list index 95a27e18e8..caf45ea359 100644 --- a/sysdeps/unix/sysv/linux/alpha/syscalls.list +++ b/sysdeps/unix/sysv/linux/alpha/syscalls.list @@ -28,7 +28,6 @@ getitimer - getitimer i:ip __getitimer getitimer@@GLIBC_2.1 setitimer - setitimer i:ipP __setitimer setitimer@@GLIBC_2.1 utimes - utimes i:sp __utimes utimes@@GLIBC_2.1 getrusage - getrusage i:ip __getrusage getrusage@@GLIBC_2.1 -wait4 - wait4 i:iWiP __wait4 wait4@@GLIBC_2.1 # avoid 64-bit aliases on 32-bit statfs syscalls fstatfs - fstatfs i:ip __fstatfs fstatfs diff --git a/sysdeps/unix/sysv/linux/alpha/wait4.c b/sysdeps/unix/sysv/linux/alpha/wait4.c new file mode 100644 index 0000000000..0c86306a5a --- /dev/null +++ b/sysdeps/unix/sysv/linux/alpha/wait4.c @@ -0,0 +1,26 @@ +/* wait4 -- wait for process to change state. Linux/Alpha version. + Copyright (C) 2019 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 + +#undef weak_alias +#define weak_alias(a, b) +#include +versioned_symbol (libc, __wait4, wait4, GLIBC_2_1); + +/* GLIBC_2_0 version is implemented at osf_wait4.c. */