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 Netto X-Patchwork-Id: 1216444 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-108361-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="O2RcHHj8"; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="T80PeKeE"; 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 47mfVM5Sm6z9sPc for ; Tue, 31 Dec 2019 01:11:07 +1100 (AEDT) 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=QhlD+CMonQZNQ/U6ASbPGZiULUjp1uzznuAC5ik6vxmddwz4dFY05 4kngk5ORapoQPCKgQJQZqz8yPhg7/Wxif0OsRq1g+d/X+sfYY21z4mBAWAU3BT0r efQhuDklyuv6pAZsUMSQvoYwkMvfdvYYKUyzKNwnctl5eFxfWHEJ2k= 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=O2RcHHj8x4OFhjLO4WGXJyFk3Ukf oOco9NaUgnRzbNysospgQMdDuZ4v7okgcZP8XVXpdi8S0YqcgI6bsC74eJ9ZT+Gv adpIkqHWWv5Ebz/ejaizRVwmIv2zX3+oN5TyjtAHCCZvvoZFUXoq+qqClkpaS3sN dPvY/Q7Ftz/2wAs= 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== 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 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. */