From patchwork Thu Nov 14 14:46:58 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: 179436 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp11155244ilf; Thu, 14 Nov 2019 06:47:25 -0800 (PST) X-Google-Smtp-Source: APXvYqyJtC1Uy/0ruNYhI6e31hyrk7zhZK9yYyOO8NGRcrbrdKLi2mpw3IVJycCu4XJHF18GjDEy X-Received: by 2002:a05:6402:b2d:: with SMTP id bo13mr1593684edb.125.1573742845434; Thu, 14 Nov 2019 06:47:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573742845; cv=none; d=google.com; s=arc-20160816; b=Hwpjoue7Ovdd2RggmpTyfgQcJNHOAdQuuFNinBgImQlHuDTOJOa9DUxX5Se2onFZre 1SN+P+oWk46rgaEjcdkgC/vngEcILQaQWKOtcXi6ruwQrtAZ61Dvt3p04aj2MbTh5gWw UF44JwuSWMDmsrUUjxUimUYf/4An39D8NWNjbooz3VS4kZpdGRtsYJuEaD809O4xTUGF TRO35tp5TV1aqUjonwepmxIZ2Fu4QHPntw8b3IdlMlxOUGvRAwRv93fric00QDejPYnR KUdBTwxSdgmtaouFcyko2w3/QoSKUPTxAHErsBJyiwZHLko7XoSjAPL2lxGT67v2bhUs a4SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc: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=s67mveFj3RgNUr+tNCaJCoDmwPM9abKG9Xh9e8y8Tzo=; b=bWWbw4B29vNOsBW1yAbvhd0VoYTWaCcjLe/kuSj6HEseyRaIBZVzaj9JwYRXVJULkr JRpF3M9F7Dt4AIxER5gNcbWxCsdNenGZNWDyLnXSSjguwr80XnuPoHcrA/iWx7+H8sG4 RACbyj9+PRcX8uw5Pj/0xfiiwVVcaADrNBvZMLkiBI0i6a2OvBitRBzXNsjTV4ALNC3s CD3DIAmD782bIZqBfYB1KE/Yk6vvMmTtwliZ5mFXI7+68w2DPvN/tUnHF+AY8VbKmf/n 5Tg6LdCufwpdrevIf7TAT78zpzWDhpkC+dRAhBerTocHWtU5arFoiIh4I65civHPbckt 6S2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=DDpKc7kD; dkim=pass header.i=@linaro.org header.s=google header.b=tsgsDQ+r; spf=pass (google.com: domain of libc-alpha-return-107080-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-107080-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 be24si1504463edb.156.2019.11.14.06.47.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Nov 2019 06:47:25 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-107080-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=DDpKc7kD; dkim=pass header.i=@linaro.org header.s=google header.b=tsgsDQ+r; spf=pass (google.com: domain of libc-alpha-return-107080-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-107080-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:cc:subject:date:message-id; q=dns; s= default; b=yHXDNsAXEXRRP64DLo/8wWr2xzDtvqzSS87LOkWdIuLUVX/knl9Jy nVMw77CU3YxjR8+d/W+MzLLxK61Nu4ihyOuUBNdO21UU0QJzt1vchsOOHT1icbI9 ZT+V3bryAiWPBs5hlt7NhMoVAomt+1NGl4eh1wFcwPYKtm/MzGFdvk= 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:cc:subject:date:message-id; s=default; bh=4fZsRYJVBBZO+eH7Qfvd+Tdf9Mo=; b=DDpKc7kDTcJPfmRwuet5HWHdcMNl IePdINcgM22gvDhFjWUrIqUdk+DRIfLAx4yT1t6uRURVa+gCKjGK0JazYmBCUdeU tyl02rQ2DJgJ7C+FobJGnkDlZrdGqAmuV8tItuycFcFy/Tgw5dv0bzmVWnIjUf1n 45n6i1T5c6AFKNM= Received: (qmail 28842 invoked by alias); 14 Nov 2019 14:47:14 -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 28834 invoked by uid 89); 14 Nov 2019 14:47:13 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, SPF_PASS autolearn=ham version=3.3.1 spammy=sk:INTERNA X-HELO: mail-qv1-f67.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=s67mveFj3RgNUr+tNCaJCoDmwPM9abKG9Xh9e8y8Tzo=; b=tsgsDQ+rEXk6Bx8D4aYgQAmRBcmOZXdyxYfKWkcdfEyZKlWPNeO0Z6oXBXTgstkCnN G0jvqr9XX0MRPKaHbWYeqtyBh7njhS9y0HsWjxZAINKcx+u8E4UYWrl3DrrHkk5kdqHS BzgdvYd4+yVD9GwAKYqHZOzp/Mge61lBNgVO5JcaL4r0I0eMPhAZ+8Tc257AzsYWkWmz njBc1xtgw/ShysDqsuJgT9EZEhQ77HTB3ySFgvlqqiG1EKGzdWTvftAF5ZVUtzpBmCpr XG6YtaPKwxSxPoWyzaeb7nCF8/CD+hYP9ov15lkNEpb4gyflKLLmRFaxASGy9M65hYtt OBVA== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: Alistair Francis , alistair23@gmail.com Subject: [PATCH 1/7] Remove __waitpid_nocancel Date: Thu, 14 Nov 2019 11:46:58 -0300 Message-Id: <20191114144704.19002-1-adhemerval.zanella@linaro.org> It enables and disable cancellation with pthread_setcancelstate prior calling the waitpid. It simplifies the waitpid implementation for architectures that does not provide either __NR_waitpid or __NR_wait4. Checked on x86_64-linux-gnu. --- libio/iopopen.c | 6 +++- sysdeps/generic/not-cancel.h | 2 -- sysdeps/posix/system.c | 6 +++- sysdeps/unix/sysv/linux/Makefile | 2 +- sysdeps/unix/sysv/linux/not-cancel.h | 4 --- sysdeps/unix/sysv/linux/waitpid_nocancel.c | 34 ---------------------- 6 files changed, 11 insertions(+), 43 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/waitpid_nocancel.c -- 2.17.1 diff --git a/libio/iopopen.c b/libio/iopopen.c index 22d53a88ef..a15d3bf4b6 100644 --- a/libio/iopopen.c +++ b/libio/iopopen.c @@ -281,7 +281,11 @@ _IO_new_proc_close (FILE *fp) described in POSIX.2, such implementations are not conforming." */ do { - wait_pid = __waitpid_nocancel (((_IO_proc_file *) fp)->pid, &wstatus, 0); + int state; + __libc_ptf_call (__pthread_setcancelstate, + (PTHREAD_CANCEL_DISABLE, &state), 0); + wait_pid = __waitpid (((_IO_proc_file *) fp)->pid, &wstatus, 0); + __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); } while (wait_pid == -1 && errno == EINTR); if (wait_pid == -1) diff --git a/sysdeps/generic/not-cancel.h b/sysdeps/generic/not-cancel.h index d3b53e48cf..e0729bb1db 100644 --- a/sysdeps/generic/not-cancel.h +++ b/sysdeps/generic/not-cancel.h @@ -47,8 +47,6 @@ __write (fd, buf, n) #define __writev_nocancel_nostatus(fd, iov, n) \ (void) __writev (fd, iov, n) -# define __waitpid_nocancel(pid, stat_loc, options) \ - __waitpid (pid, stat_loc, options) #define __fcntl64_nocancel(fd, cmd, ...) \ __fcntl64 (fd, cmd, __VA_ARGS__) diff --git a/sysdeps/posix/system.c b/sysdeps/posix/system.c index d8c6cb8e1c..6de85bd3e4 100644 --- a/sysdeps/posix/system.c +++ b/sysdeps/posix/system.c @@ -81,7 +81,11 @@ cancel_handler (void *arg) __kill_noerrno (args->pid, SIGKILL); - TEMP_FAILURE_RETRY (__waitpid_nocancel (args->pid, NULL, 0)); + int state; + __libc_ptf_call (__pthread_setcancelstate, + (PTHREAD_CANCEL_DISABLE, &state), 0); + TEMP_FAILURE_RETRY (__waitpid (args->pid, NULL, 0)); + __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); DO_LOCK (); if (SUB_REF () == 0) diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 07776d28ea..8735092c12 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -216,7 +216,7 @@ sysdep_routines += xstatconv internal_statvfs internal_statvfs64 \ open_nocancel open64_nocancel \ openat_nocancel openat64_nocancel \ read_nocancel pread64_nocancel \ - waitpid_nocancel write_nocancel statx_cp + write_nocancel statx_cp sysdep_headers += bits/fcntl-linux.h diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h index 192a0a5195..49e4e0249a 100644 --- a/sysdeps/unix/sysv/linux/not-cancel.h +++ b/sysdeps/unix/sysv/linux/not-cancel.h @@ -69,9 +69,6 @@ __writev_nocancel_nostatus (int fd, const struct iovec *iov, int iovcnt) INTERNAL_SYSCALL_CALL (writev, err, fd, iov, iovcnt); } -/* Uncancelable waitpid. */ -__typeof (waitpid) __waitpid_nocancel; - /* Uncancelable fcntl. */ __typeof (__fcntl) __fcntl64_nocancel; @@ -84,7 +81,6 @@ hidden_proto (__read_nocancel) hidden_proto (__pread64_nocancel) hidden_proto (__write_nocancel) hidden_proto (__close_nocancel) -hidden_proto (__waitpid_nocancel) hidden_proto (__fcntl64_nocancel) #endif diff --git a/sysdeps/unix/sysv/linux/waitpid_nocancel.c b/sysdeps/unix/sysv/linux/waitpid_nocancel.c deleted file mode 100644 index 3697c6b938..0000000000 --- a/sysdeps/unix/sysv/linux/waitpid_nocancel.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Linux waitpid syscall implementation -- non-cancellable. - Copyright (C) 2018-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 -#include -#include -#include -#include - -__pid_t -__waitpid_nocancel (__pid_t pid, int *stat_loc, int options) -{ -#ifdef __NR_waitpid - return INLINE_SYSCALL_CALL (waitpid, pid, stat_loc, options); -#else - return INLINE_SYSCALL_CALL (wait4, pid, stat_loc, options, NULL); -#endif -} -libc_hidden_def (__waitpid_nocancel) From patchwork Thu Nov 14 14:46:59 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: 179437 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp11155493ilf; Thu, 14 Nov 2019 06:47:35 -0800 (PST) X-Google-Smtp-Source: APXvYqyd7OJqoB1o3toE5X1us/iv+525lJD8UeS2t3Dgq/HhZ/a5qsa4zDgboabuLWHLPEN/YrMa X-Received: by 2002:a17:906:5151:: with SMTP id s17mr8539607ejl.230.1573742855833; Thu, 14 Nov 2019 06:47:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573742855; cv=none; d=google.com; s=arc-20160816; b=wMFTTvh/zC+y72fH2Bq8WRKRPWtKjI6PPbfDNX8P/zNv357Oo77H3jVcrnwnuSeksJ Vb8YwPxLGgLyqqpyo+ruud3jgIl9ZnHi39U3k6D7qrQ1ltOnW1YF+3w2A2OZ+T14jBWb I2NJ7LH1FYxdHflXQiMQ8QwHDT6geqryMq4JAZq6xnKBPoAFn+ZLsCQYBiwU3CrvdctZ oN5rrwmT9/bjU07cXtJdgFT4yBVLuMN/7RGYcb+drTb7q8iREkldw+XiOjCUnOv88yRY W0qBtaqH6XjN110dhJYtag+7H9k+zN6lPkK4H4QW4rxWBYV2VPyKTSg1N206wD1fG6G7 UtYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc: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=2evQdZsreVYIwA1br+qfyJvuN/LxkUfIkRT3x+x1u8s=; b=K8H8+tDUYiNIit/7GQtA8xQMgMj3XdSGJ5qcJtvajToqc5PwM3wTlCFx1m06x0lMHc 4UtuttnZWdbBedVXfs9bBtOd9mx4Ojp17DseMkvdzPFZpNwfNTHdSmTpQzJKYNoVKPAK 47pbcPjdsY84U73sEyzRhJpxZz+pszfxS7JsviAQKYnbpiTakdi49ou2fXQT3UxmOKzN AZ3jT7lflxFJuqtDge34nsySmhC8+BzNfqyLFupc3bt9QEV5R2k7Se7MyZf5dwpMRbe0 duC6Dk5xpmfkDorvzk/qmyWmR0dcE/H8dLk+aiWyTnr8jUyEeNHbBrT52GvkJpvlB5OH JgHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=YQ5RGW07; dkim=pass header.i=@linaro.org header.s=google header.b=w8bIpQ7i; spf=pass (google.com: domain of libc-alpha-return-107081-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-107081-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 o25si3435480ejg.237.2019.11.14.06.47.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Nov 2019 06:47:35 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-107081-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=YQ5RGW07; dkim=pass header.i=@linaro.org header.s=google header.b=w8bIpQ7i; spf=pass (google.com: domain of libc-alpha-return-107081-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-107081-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:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=cqKUcbgZW8Hsf/d9JN+nYGTezRP+SSc A36xL5zDmAVu238zTl1Oyj2LSw9MW25JM1+w6W2LLNiqqY+9DYigwTsQI853hiQa hnsXdCJA6yJK+byywJ+WV7FTRukzoiHSzwJY3r3WcCIDYaWA1ZZLhwa5k4RGn8FN LvQT6/jhUC98= 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:cc:subject:date:message-id:in-reply-to :references; s=default; bh=T+lIeuh0WhDpHS9osxdwpp3mty0=; b=YQ5RG W07QVfAAuZ3W9G841fyTtQ4WxrYsrYZ3KLYlYBLsydkNXM6OiIETHYTPLCENKyLj tok0ydUfh/VlLPhgcnTuBrj+QFE4rgC3esxsk3mRLhHgT1h5Y+y+36jH+M72Mk4h I6s2E2uT/ZibweThXSpM+bOii4NlFfMOOBWPgQ= Received: (qmail 29466 invoked by alias); 14 Nov 2019 14:47:19 -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 29362 invoked by uid 89); 14 Nov 2019 14:47:18 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy=2026 X-HELO: mail-qv1-f65.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2evQdZsreVYIwA1br+qfyJvuN/LxkUfIkRT3x+x1u8s=; b=w8bIpQ7ivT+ckrdADuz2FrL52xBLvDWm4RbguvcKTYJ4eF5wXm6CVp+INEl7VwguBs 3Jzo+88g/Qrz3/bGqbR5cG8D6fW0EgEt+s62bwINVI7tNL6EiClX4HM1EybpnFmFTY/e ngDNW6XM26fVJDXpUEKIcMVBm1pZgRQh2SVlzEpfIbpfHHCwi07if5Yo5uoYUnWvlyad inEcZelWWK2cpQxKcepB0ucktLVd9M74Hhw3ckfXGf/MhSCrinlxuKlnuZC63uCNWlqw j2QFokyUeI6vSGHDCuwFgGcwyhbfPQXEbrv7gzcaAFqShiylesfwoXH15q/x+DwmLSHW YVKg== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: Alistair Francis , alistair23@gmail.com Subject: [PATCH 2/7] nptl: Move wait implementation to libc Date: Thu, 14 Nov 2019 11:46:59 -0300 Message-Id: <20191114144704.19002-2-adhemerval.zanella@linaro.org> In-Reply-To: <20191114144704.19002-1-adhemerval.zanella@linaro.org> References: <20191114144704.19002-1-adhemerval.zanella@linaro.org> Checked on x86_64-linux-gnu and powerpc64le-linux-gnu. --- nptl/Makefile | 3 +-- nptl/Versions | 2 +- nptl/libpthread-compat.c | 16 ++++++++++++++-- .../unix/sysv/linux/aarch64/libpthread.abilist | 2 -- sysdeps/unix/sysv/linux/alpha/libpthread.abilist | 2 -- .../unix/sysv/linux/arm/be/libpthread.abilist | 2 -- .../unix/sysv/linux/arm/le/libpthread.abilist | 2 -- sysdeps/unix/sysv/linux/csky/libpthread.abilist | 2 -- sysdeps/unix/sysv/linux/hppa/libpthread.abilist | 3 --- sysdeps/unix/sysv/linux/i386/libpthread.abilist | 2 -- sysdeps/unix/sysv/linux/ia64/libpthread.abilist | 3 --- .../sysv/linux/m68k/coldfire/libpthread.abilist | 2 -- .../sysv/linux/m68k/m680x0/libpthread.abilist | 2 -- .../sysv/linux/microblaze/be/libpthread.abilist | 2 -- .../sysv/linux/microblaze/le/libpthread.abilist | 2 -- .../sysv/linux/mips/mips32/libpthread.abilist | 3 --- .../sysv/linux/mips/mips64/libpthread.abilist | 3 --- sysdeps/unix/sysv/linux/nios2/libpthread.abilist | 2 -- .../linux/powerpc/powerpc32/libpthread.abilist | 2 -- .../powerpc/powerpc64/be/libpthread.abilist | 2 -- .../powerpc/powerpc64/le/libpthread.abilist | 2 -- .../sysv/linux/riscv/rv64/libpthread.abilist | 2 -- .../sysv/linux/s390/s390-32/libpthread.abilist | 2 -- .../sysv/linux/s390/s390-64/libpthread.abilist | 3 --- sysdeps/unix/sysv/linux/sh/be/libpthread.abilist | 3 --- sysdeps/unix/sysv/linux/sh/le/libpthread.abilist | 3 --- .../sysv/linux/sparc/sparc32/libpthread.abilist | 2 -- .../sysv/linux/sparc/sparc64/libpthread.abilist | 3 --- .../unix/sysv/linux/x86_64/64/libpthread.abilist | 3 --- .../sysv/linux/x86_64/x32/libpthread.abilist | 2 -- 30 files changed, 16 insertions(+), 68 deletions(-) -- 2.17.1 diff --git a/nptl/Makefile b/nptl/Makefile index f9aadfd644..f93d41176f 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -46,7 +46,7 @@ pthread-compat-wrappers = \ sendto fsync lseek lseek64 \ msync open open64 pause \ pread pread64 pwrite pwrite64 \ - tcdrain wait waitpid msgrcv msgsnd \ + tcdrain waitpid msgrcv msgsnd \ sigwait sigsuspend \ recvmsg sendmsg @@ -205,7 +205,6 @@ CFLAGS-pread.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-pread64.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-pwrite.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-pwrite64.c += -fexceptions -fasynchronous-unwind-tables -CFLAGS-wait.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-waitpid.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-sigwait.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-msgrcv.c += -fexceptions -fasynchronous-unwind-tables diff --git a/nptl/Versions b/nptl/Versions index 5d6aedb7de..1dda4b9064 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -99,7 +99,7 @@ libpthread { close; __close; fcntl; __fcntl; read; __read; write; __write; accept; connect; __connect; recv; recvfrom; recvmsg; send; __send; sendmsg; sendto; fsync; lseek; __lseek; msync; open; __open; pause; tcdrain; - system; wait; __wait; waitpid; + system; waitpid; # Hidden entry point (through macros). _pthread_cleanup_push; _pthread_cleanup_pop; diff --git a/nptl/libpthread-compat.c b/nptl/libpthread-compat.c index 7398f5e92d..e11505abfa 100644 --- a/nptl/libpthread-compat.c +++ b/nptl/libpthread-compat.c @@ -26,12 +26,24 @@ version or later, the placeholder symbol is not needed because there are plenty of other symbols which populate those later versions. */ -#if (SHLIB_COMPAT (libpthread, GLIBC_2_1_2, GLIBC_2_2_6)) +#if (SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1_2) \ + || SHLIB_COMPAT (libpthread, GLIBC_2_1_2, GLIBC_2_2)) void attribute_compat_text_section __libpthread_version_placeholder (void) { } -compat_symbol (libpthread, __libpthread_version_placeholder, +#endif + +#if (SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1_2)) +strong_alias (__libpthread_version_placeholder, + __libpthread_version_placeholder_20) +compat_symbol (libpthread, __libpthread_version_placeholder_20, + __libpthread_version_placeholder, GLIBC_2_0); +#endif +#if (SHLIB_COMPAT (libpthread, GLIBC_2_1_2, GLIBC_2_2)) +strong_alias (__libpthread_version_placeholder, + __libpthread_version_placeholder_212) +compat_symbol (libpthread, __libpthread_version_placeholder_212, __libpthread_version_placeholder, GLIBC_2_1_2); #endif diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist index 98a8473fcd..cfa71ef697 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist @@ -44,7 +44,6 @@ GLIBC_2.17 __read F GLIBC_2.17 __res_state F GLIBC_2.17 __send F GLIBC_2.17 __sigaction F -GLIBC_2.17 __wait F GLIBC_2.17 __write F GLIBC_2.17 _pthread_cleanup_pop F GLIBC_2.17 _pthread_cleanup_pop_restore F @@ -203,7 +202,6 @@ GLIBC_2.17 siglongjmp F GLIBC_2.17 sigwait F GLIBC_2.17 system F GLIBC_2.17 tcdrain F -GLIBC_2.17 wait F GLIBC_2.17 waitpid F GLIBC_2.17 write F GLIBC_2.18 pthread_getattr_default_np F diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist index f42bcffd1e..ddb500a9d7 100644 --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist @@ -24,7 +24,6 @@ GLIBC_2.0 __pthread_setspecific F GLIBC_2.0 __read F GLIBC_2.0 __send F GLIBC_2.0 __sigaction F -GLIBC_2.0 __wait F GLIBC_2.0 __write F GLIBC_2.0 _pthread_cleanup_pop F GLIBC_2.0 _pthread_cleanup_pop_restore F @@ -103,7 +102,6 @@ GLIBC_2.0 siglongjmp F GLIBC_2.0 sigwait F GLIBC_2.0 system F GLIBC_2.0 tcdrain F -GLIBC_2.0 wait F GLIBC_2.0 waitpid F GLIBC_2.0 write F GLIBC_2.1 __libc_allocate_rtsig F diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist index c5b7aeb7c4..428aac48e6 100644 --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist @@ -79,7 +79,6 @@ GLIBC_2.4 __read F GLIBC_2.4 __res_state F GLIBC_2.4 __send F GLIBC_2.4 __sigaction F -GLIBC_2.4 __wait F GLIBC_2.4 __write F GLIBC_2.4 _pthread_cleanup_pop F GLIBC_2.4 _pthread_cleanup_pop_restore F @@ -232,6 +231,5 @@ GLIBC_2.4 siglongjmp F GLIBC_2.4 sigwait F GLIBC_2.4 system F GLIBC_2.4 tcdrain F -GLIBC_2.4 wait F GLIBC_2.4 waitpid F GLIBC_2.4 write F diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist index c5b7aeb7c4..428aac48e6 100644 --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist @@ -79,7 +79,6 @@ GLIBC_2.4 __read F GLIBC_2.4 __res_state F GLIBC_2.4 __send F GLIBC_2.4 __sigaction F -GLIBC_2.4 __wait F GLIBC_2.4 __write F GLIBC_2.4 _pthread_cleanup_pop F GLIBC_2.4 _pthread_cleanup_pop_restore F @@ -232,6 +231,5 @@ GLIBC_2.4 siglongjmp F GLIBC_2.4 sigwait F GLIBC_2.4 system F GLIBC_2.4 tcdrain F -GLIBC_2.4 wait F GLIBC_2.4 waitpid F GLIBC_2.4 write F diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist index edbdea39cf..7c17230afd 100644 --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist @@ -42,7 +42,6 @@ GLIBC_2.29 __read F GLIBC_2.29 __res_state F GLIBC_2.29 __send F GLIBC_2.29 __sigaction F -GLIBC_2.29 __wait F GLIBC_2.29 __write F GLIBC_2.29 _pthread_cleanup_pop F GLIBC_2.29 _pthread_cleanup_pop_restore F @@ -219,7 +218,6 @@ GLIBC_2.29 tss_create F GLIBC_2.29 tss_delete F GLIBC_2.29 tss_get F GLIBC_2.29 tss_set F -GLIBC_2.29 wait F GLIBC_2.29 waitpid F GLIBC_2.29 write F GLIBC_2.30 pthread_cond_clockwait F diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist index d87fadf3d8..9b7c7dae3f 100644 --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist @@ -18,7 +18,6 @@ GLIBC_2.2 __h_errno_location F GLIBC_2.2 __libc_allocate_rtsig F GLIBC_2.2 __libc_current_sigrtmax F GLIBC_2.2 __libc_current_sigrtmin F -GLIBC_2.2 __libpthread_version_placeholder F GLIBC_2.2 __lseek F GLIBC_2.2 __open F GLIBC_2.2 __open64 F @@ -47,7 +46,6 @@ GLIBC_2.2 __read F GLIBC_2.2 __res_state F GLIBC_2.2 __send F GLIBC_2.2 __sigaction F -GLIBC_2.2 __wait F GLIBC_2.2 __write F GLIBC_2.2 _pthread_cleanup_pop F GLIBC_2.2 _pthread_cleanup_pop_restore F @@ -181,7 +179,6 @@ GLIBC_2.2 siglongjmp F GLIBC_2.2 sigwait F GLIBC_2.2 system F GLIBC_2.2 tcdrain F -GLIBC_2.2 wait F GLIBC_2.2 waitpid F GLIBC_2.2 write F GLIBC_2.2.3 pthread_getattr_np F diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist index 5d1bf0f5ab..a35cbdb0e4 100644 --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist @@ -24,7 +24,6 @@ GLIBC_2.0 __pthread_setspecific F GLIBC_2.0 __read F GLIBC_2.0 __send F GLIBC_2.0 __sigaction F -GLIBC_2.0 __wait F GLIBC_2.0 __write F GLIBC_2.0 _pthread_cleanup_pop F GLIBC_2.0 _pthread_cleanup_pop_restore F @@ -103,7 +102,6 @@ GLIBC_2.0 siglongjmp F GLIBC_2.0 sigwait F GLIBC_2.0 system F GLIBC_2.0 tcdrain F -GLIBC_2.0 wait F GLIBC_2.0 waitpid F GLIBC_2.0 write F GLIBC_2.1 __libc_allocate_rtsig F diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist index c065ddbf67..d15b0f09d8 100644 --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist @@ -18,7 +18,6 @@ GLIBC_2.2 __h_errno_location F GLIBC_2.2 __libc_allocate_rtsig F GLIBC_2.2 __libc_current_sigrtmax F GLIBC_2.2 __libc_current_sigrtmin F -GLIBC_2.2 __libpthread_version_placeholder F GLIBC_2.2 __lseek F GLIBC_2.2 __open F GLIBC_2.2 __open64 F @@ -47,7 +46,6 @@ GLIBC_2.2 __read F GLIBC_2.2 __res_state F GLIBC_2.2 __send F GLIBC_2.2 __sigaction F -GLIBC_2.2 __wait F GLIBC_2.2 __write F GLIBC_2.2 _pthread_cleanup_pop F GLIBC_2.2 _pthread_cleanup_pop_restore F @@ -181,7 +179,6 @@ GLIBC_2.2 siglongjmp F GLIBC_2.2 sigwait F GLIBC_2.2 system F GLIBC_2.2 tcdrain F -GLIBC_2.2 wait F GLIBC_2.2 waitpid F GLIBC_2.2 write F GLIBC_2.2.3 pthread_getattr_np F diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist index c5b7aeb7c4..428aac48e6 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist @@ -79,7 +79,6 @@ GLIBC_2.4 __read F GLIBC_2.4 __res_state F GLIBC_2.4 __send F GLIBC_2.4 __sigaction F -GLIBC_2.4 __wait F GLIBC_2.4 __write F GLIBC_2.4 _pthread_cleanup_pop F GLIBC_2.4 _pthread_cleanup_pop_restore F @@ -232,6 +231,5 @@ GLIBC_2.4 siglongjmp F GLIBC_2.4 sigwait F GLIBC_2.4 system F GLIBC_2.4 tcdrain F -GLIBC_2.4 wait F GLIBC_2.4 waitpid F GLIBC_2.4 write F diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist index 5d1bf0f5ab..a35cbdb0e4 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist @@ -24,7 +24,6 @@ GLIBC_2.0 __pthread_setspecific F GLIBC_2.0 __read F GLIBC_2.0 __send F GLIBC_2.0 __sigaction F -GLIBC_2.0 __wait F GLIBC_2.0 __write F GLIBC_2.0 _pthread_cleanup_pop F GLIBC_2.0 _pthread_cleanup_pop_restore F @@ -103,7 +102,6 @@ GLIBC_2.0 siglongjmp F GLIBC_2.0 sigwait F GLIBC_2.0 system F GLIBC_2.0 tcdrain F -GLIBC_2.0 wait F GLIBC_2.0 waitpid F GLIBC_2.0 write F GLIBC_2.1 __libc_allocate_rtsig F diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist index bf777df285..50002eb438 100644 --- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist @@ -44,7 +44,6 @@ GLIBC_2.18 __read F GLIBC_2.18 __res_state F GLIBC_2.18 __send F GLIBC_2.18 __sigaction F -GLIBC_2.18 __wait F GLIBC_2.18 __write F GLIBC_2.18 _pthread_cleanup_pop F GLIBC_2.18 _pthread_cleanup_pop_restore F @@ -205,7 +204,6 @@ GLIBC_2.18 siglongjmp F GLIBC_2.18 sigwait F GLIBC_2.18 system F GLIBC_2.18 tcdrain F -GLIBC_2.18 wait F GLIBC_2.18 waitpid F GLIBC_2.18 write F GLIBC_2.28 call_once F diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist index bf777df285..50002eb438 100644 --- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist @@ -44,7 +44,6 @@ GLIBC_2.18 __read F GLIBC_2.18 __res_state F GLIBC_2.18 __send F GLIBC_2.18 __sigaction F -GLIBC_2.18 __wait F GLIBC_2.18 __write F GLIBC_2.18 _pthread_cleanup_pop F GLIBC_2.18 _pthread_cleanup_pop_restore F @@ -205,7 +204,6 @@ GLIBC_2.18 siglongjmp F GLIBC_2.18 sigwait F GLIBC_2.18 system F GLIBC_2.18 tcdrain F -GLIBC_2.18 wait F GLIBC_2.18 waitpid F GLIBC_2.18 write F GLIBC_2.28 call_once F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist index 1b5fd5e751..93558db21f 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist @@ -24,7 +24,6 @@ GLIBC_2.0 __pthread_setspecific F GLIBC_2.0 __read F GLIBC_2.0 __send F GLIBC_2.0 __sigaction F -GLIBC_2.0 __wait F GLIBC_2.0 __write F GLIBC_2.0 _pthread_cleanup_pop F GLIBC_2.0 _pthread_cleanup_pop_restore F @@ -103,7 +102,6 @@ GLIBC_2.0 siglongjmp F GLIBC_2.0 sigwait F GLIBC_2.0 system F GLIBC_2.0 tcdrain F -GLIBC_2.0 wait F GLIBC_2.0 waitpid F GLIBC_2.0 write F GLIBC_2.11 pthread_sigqueue F @@ -117,7 +115,6 @@ GLIBC_2.18 pthread_setattr_default_np F GLIBC_2.2 __libc_allocate_rtsig F GLIBC_2.2 __libc_current_sigrtmax F GLIBC_2.2 __libc_current_sigrtmin F -GLIBC_2.2 __libpthread_version_placeholder F GLIBC_2.2 __open64 F GLIBC_2.2 __pread64 F GLIBC_2.2 __pthread_rwlock_destroy F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist index 1b5fd5e751..93558db21f 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist @@ -24,7 +24,6 @@ GLIBC_2.0 __pthread_setspecific F GLIBC_2.0 __read F GLIBC_2.0 __send F GLIBC_2.0 __sigaction F -GLIBC_2.0 __wait F GLIBC_2.0 __write F GLIBC_2.0 _pthread_cleanup_pop F GLIBC_2.0 _pthread_cleanup_pop_restore F @@ -103,7 +102,6 @@ GLIBC_2.0 siglongjmp F GLIBC_2.0 sigwait F GLIBC_2.0 system F GLIBC_2.0 tcdrain F -GLIBC_2.0 wait F GLIBC_2.0 waitpid F GLIBC_2.0 write F GLIBC_2.11 pthread_sigqueue F @@ -117,7 +115,6 @@ GLIBC_2.18 pthread_setattr_default_np F GLIBC_2.2 __libc_allocate_rtsig F GLIBC_2.2 __libc_current_sigrtmax F GLIBC_2.2 __libc_current_sigrtmin F -GLIBC_2.2 __libpthread_version_placeholder F GLIBC_2.2 __open64 F GLIBC_2.2 __pread64 F GLIBC_2.2 __pthread_rwlock_destroy F diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist index 03a462ef91..226cf52615 100644 --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist @@ -44,7 +44,6 @@ GLIBC_2.21 __read F GLIBC_2.21 __res_state F GLIBC_2.21 __send F GLIBC_2.21 __sigaction F -GLIBC_2.21 __wait F GLIBC_2.21 __write F GLIBC_2.21 _pthread_cleanup_pop F GLIBC_2.21 _pthread_cleanup_pop_restore F @@ -205,7 +204,6 @@ GLIBC_2.21 siglongjmp F GLIBC_2.21 sigwait F GLIBC_2.21 system F GLIBC_2.21 tcdrain F -GLIBC_2.21 wait F GLIBC_2.21 waitpid F GLIBC_2.21 write F GLIBC_2.28 call_once F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist index 0245103a0b..6ddac21923 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist @@ -24,7 +24,6 @@ GLIBC_2.0 __pthread_setspecific F GLIBC_2.0 __read F GLIBC_2.0 __send F GLIBC_2.0 __sigaction F -GLIBC_2.0 __wait F GLIBC_2.0 __write F GLIBC_2.0 _pthread_cleanup_pop F GLIBC_2.0 _pthread_cleanup_pop_restore F @@ -103,7 +102,6 @@ GLIBC_2.0 siglongjmp F GLIBC_2.0 sigwait F GLIBC_2.0 system F GLIBC_2.0 tcdrain F -GLIBC_2.0 wait F GLIBC_2.0 waitpid F GLIBC_2.0 write F GLIBC_2.1 __libc_allocate_rtsig F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist index 618004a931..c97f8ee3df 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist @@ -67,7 +67,6 @@ GLIBC_2.3 __read F GLIBC_2.3 __res_state F GLIBC_2.3 __send F GLIBC_2.3 __sigaction F -GLIBC_2.3 __wait F GLIBC_2.3 __write F GLIBC_2.3 _pthread_cleanup_pop F GLIBC_2.3 _pthread_cleanup_pop_restore F @@ -201,7 +200,6 @@ GLIBC_2.3 siglongjmp F GLIBC_2.3 sigwait F GLIBC_2.3 system F GLIBC_2.3 tcdrain F -GLIBC_2.3 wait F GLIBC_2.3 waitpid F GLIBC_2.3 write F GLIBC_2.3.2 pthread_cond_broadcast F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist index 98a8473fcd..cfa71ef697 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist @@ -44,7 +44,6 @@ GLIBC_2.17 __read F GLIBC_2.17 __res_state F GLIBC_2.17 __send F GLIBC_2.17 __sigaction F -GLIBC_2.17 __wait F GLIBC_2.17 __write F GLIBC_2.17 _pthread_cleanup_pop F GLIBC_2.17 _pthread_cleanup_pop_restore F @@ -203,7 +202,6 @@ GLIBC_2.17 siglongjmp F GLIBC_2.17 sigwait F GLIBC_2.17 system F GLIBC_2.17 tcdrain F -GLIBC_2.17 wait F GLIBC_2.17 waitpid F GLIBC_2.17 write F GLIBC_2.18 pthread_getattr_default_np F diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist index d44217ac85..0ed3f137be 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist @@ -43,7 +43,6 @@ GLIBC_2.27 __read F GLIBC_2.27 __res_state F GLIBC_2.27 __send F GLIBC_2.27 __sigaction F -GLIBC_2.27 __wait F GLIBC_2.27 __write F GLIBC_2.27 _pthread_cleanup_pop F GLIBC_2.27 _pthread_cleanup_pop_restore F @@ -200,7 +199,6 @@ GLIBC_2.27 sendto F GLIBC_2.27 sigaction F GLIBC_2.27 sigwait F GLIBC_2.27 tcdrain F -GLIBC_2.27 wait F GLIBC_2.27 waitpid F GLIBC_2.27 write F GLIBC_2.28 call_once F diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist index 429d8b6224..3ef6e2169b 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist @@ -24,7 +24,6 @@ GLIBC_2.0 __pthread_setspecific F GLIBC_2.0 __read F GLIBC_2.0 __send F GLIBC_2.0 __sigaction F -GLIBC_2.0 __wait F GLIBC_2.0 __write F GLIBC_2.0 _pthread_cleanup_pop F GLIBC_2.0 _pthread_cleanup_pop_restore F @@ -103,7 +102,6 @@ GLIBC_2.0 siglongjmp F GLIBC_2.0 sigwait F GLIBC_2.0 system F GLIBC_2.0 tcdrain F -GLIBC_2.0 wait F GLIBC_2.0 waitpid F GLIBC_2.0 write F GLIBC_2.1 __libc_allocate_rtsig F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist index d42e1fc4b0..b2326477ae 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist @@ -20,7 +20,6 @@ GLIBC_2.2 __h_errno_location F GLIBC_2.2 __libc_allocate_rtsig F GLIBC_2.2 __libc_current_sigrtmax F GLIBC_2.2 __libc_current_sigrtmin F -GLIBC_2.2 __libpthread_version_placeholder F GLIBC_2.2 __lseek F GLIBC_2.2 __open F GLIBC_2.2 __open64 F @@ -49,7 +48,6 @@ GLIBC_2.2 __read F GLIBC_2.2 __res_state F GLIBC_2.2 __send F GLIBC_2.2 __sigaction F -GLIBC_2.2 __wait F GLIBC_2.2 __write F GLIBC_2.2 _pthread_cleanup_pop F GLIBC_2.2 _pthread_cleanup_pop_restore F @@ -183,7 +181,6 @@ GLIBC_2.2 siglongjmp F GLIBC_2.2 sigwait F GLIBC_2.2 system F GLIBC_2.2 tcdrain F -GLIBC_2.2 wait F GLIBC_2.2 waitpid F GLIBC_2.2 write F GLIBC_2.2.3 pthread_getattr_np F diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist index d87fadf3d8..9b7c7dae3f 100644 --- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist @@ -18,7 +18,6 @@ GLIBC_2.2 __h_errno_location F GLIBC_2.2 __libc_allocate_rtsig F GLIBC_2.2 __libc_current_sigrtmax F GLIBC_2.2 __libc_current_sigrtmin F -GLIBC_2.2 __libpthread_version_placeholder F GLIBC_2.2 __lseek F GLIBC_2.2 __open F GLIBC_2.2 __open64 F @@ -47,7 +46,6 @@ GLIBC_2.2 __read F GLIBC_2.2 __res_state F GLIBC_2.2 __send F GLIBC_2.2 __sigaction F -GLIBC_2.2 __wait F GLIBC_2.2 __write F GLIBC_2.2 _pthread_cleanup_pop F GLIBC_2.2 _pthread_cleanup_pop_restore F @@ -181,7 +179,6 @@ GLIBC_2.2 siglongjmp F GLIBC_2.2 sigwait F GLIBC_2.2 system F GLIBC_2.2 tcdrain F -GLIBC_2.2 wait F GLIBC_2.2 waitpid F GLIBC_2.2 write F GLIBC_2.2.3 pthread_getattr_np F diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist index d87fadf3d8..9b7c7dae3f 100644 --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist @@ -18,7 +18,6 @@ GLIBC_2.2 __h_errno_location F GLIBC_2.2 __libc_allocate_rtsig F GLIBC_2.2 __libc_current_sigrtmax F GLIBC_2.2 __libc_current_sigrtmin F -GLIBC_2.2 __libpthread_version_placeholder F GLIBC_2.2 __lseek F GLIBC_2.2 __open F GLIBC_2.2 __open64 F @@ -47,7 +46,6 @@ GLIBC_2.2 __read F GLIBC_2.2 __res_state F GLIBC_2.2 __send F GLIBC_2.2 __sigaction F -GLIBC_2.2 __wait F GLIBC_2.2 __write F GLIBC_2.2 _pthread_cleanup_pop F GLIBC_2.2 _pthread_cleanup_pop_restore F @@ -181,7 +179,6 @@ GLIBC_2.2 siglongjmp F GLIBC_2.2 sigwait F GLIBC_2.2 system F GLIBC_2.2 tcdrain F -GLIBC_2.2 wait F GLIBC_2.2 waitpid F GLIBC_2.2 write F GLIBC_2.2.3 pthread_getattr_np F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist index f42bcffd1e..ddb500a9d7 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist @@ -24,7 +24,6 @@ GLIBC_2.0 __pthread_setspecific F GLIBC_2.0 __read F GLIBC_2.0 __send F GLIBC_2.0 __sigaction F -GLIBC_2.0 __wait F GLIBC_2.0 __write F GLIBC_2.0 _pthread_cleanup_pop F GLIBC_2.0 _pthread_cleanup_pop_restore F @@ -103,7 +102,6 @@ GLIBC_2.0 siglongjmp F GLIBC_2.0 sigwait F GLIBC_2.0 system F GLIBC_2.0 tcdrain F -GLIBC_2.0 wait F GLIBC_2.0 waitpid F GLIBC_2.0 write F GLIBC_2.1 __libc_allocate_rtsig F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist index c065ddbf67..d15b0f09d8 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist @@ -18,7 +18,6 @@ GLIBC_2.2 __h_errno_location F GLIBC_2.2 __libc_allocate_rtsig F GLIBC_2.2 __libc_current_sigrtmax F GLIBC_2.2 __libc_current_sigrtmin F -GLIBC_2.2 __libpthread_version_placeholder F GLIBC_2.2 __lseek F GLIBC_2.2 __open F GLIBC_2.2 __open64 F @@ -47,7 +46,6 @@ GLIBC_2.2 __read F GLIBC_2.2 __res_state F GLIBC_2.2 __send F GLIBC_2.2 __sigaction F -GLIBC_2.2 __wait F GLIBC_2.2 __write F GLIBC_2.2 _pthread_cleanup_pop F GLIBC_2.2 _pthread_cleanup_pop_restore F @@ -181,7 +179,6 @@ GLIBC_2.2 siglongjmp F GLIBC_2.2 sigwait F GLIBC_2.2 system F GLIBC_2.2 tcdrain F -GLIBC_2.2 wait F GLIBC_2.2 waitpid F GLIBC_2.2 write F GLIBC_2.2.3 pthread_getattr_np F diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist index 610562bd40..ca00d79b0c 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist @@ -18,7 +18,6 @@ GLIBC_2.2.5 __h_errno_location F GLIBC_2.2.5 __libc_allocate_rtsig F GLIBC_2.2.5 __libc_current_sigrtmax F GLIBC_2.2.5 __libc_current_sigrtmin F -GLIBC_2.2.5 __libpthread_version_placeholder F GLIBC_2.2.5 __lseek F GLIBC_2.2.5 __open F GLIBC_2.2.5 __open64 F @@ -47,7 +46,6 @@ GLIBC_2.2.5 __read F GLIBC_2.2.5 __res_state F GLIBC_2.2.5 __send F GLIBC_2.2.5 __sigaction F -GLIBC_2.2.5 __wait F GLIBC_2.2.5 __write F GLIBC_2.2.5 _pthread_cleanup_pop F GLIBC_2.2.5 _pthread_cleanup_pop_restore F @@ -182,7 +180,6 @@ GLIBC_2.2.5 siglongjmp F GLIBC_2.2.5 sigwait F GLIBC_2.2.5 system F GLIBC_2.2.5 tcdrain F -GLIBC_2.2.5 wait F GLIBC_2.2.5 waitpid F GLIBC_2.2.5 write F GLIBC_2.28 call_once F diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist index aadd9eb0fa..ae748ed431 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist @@ -44,7 +44,6 @@ GLIBC_2.16 __read F GLIBC_2.16 __res_state F GLIBC_2.16 __send F GLIBC_2.16 __sigaction F -GLIBC_2.16 __wait F GLIBC_2.16 __write F GLIBC_2.16 _pthread_cleanup_pop F GLIBC_2.16 _pthread_cleanup_pop_restore F @@ -203,7 +202,6 @@ GLIBC_2.16 siglongjmp F GLIBC_2.16 sigwait F GLIBC_2.16 system F GLIBC_2.16 tcdrain F -GLIBC_2.16 wait F GLIBC_2.16 waitpid F GLIBC_2.16 write F GLIBC_2.18 pthread_getattr_default_np F From patchwork Thu Nov 14 14:47:00 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: 179439 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp11155851ilf; Thu, 14 Nov 2019 06:47:54 -0800 (PST) X-Google-Smtp-Source: APXvYqzSeBZcPKaToX/fbmzRgQMMW5C9nuAeUleIno1N9pMx6dUhAV03pf4PLwkbvpN3w/ySgLmn X-Received: by 2002:a17:906:6dcf:: with SMTP id j15mr8796248ejt.104.1573742874220; Thu, 14 Nov 2019 06:47:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573742874; cv=none; d=google.com; s=arc-20160816; b=YNHVwF2v8S/7WoIxHkuNA/5U3SfoG3hXsyjKv6ovAoxoP6VKql8MYUvX2dQHHXO8kp OMLafP7l2uNQf16pO0/KQytwOZmdcSfMrOsVGkURznGj93xHwAkHo8C6p6QSAmLBkn3h t5mfuX+JKqg5B+7Qe2BOG11PwNr746hV4QtERc89ZWdxFnBvygZrQnqQpHrekYA8b16U id4MSUd5KUoD7Vp+5ogGYkLX/dARGFjM86Pwe+9R9hk0bBeDv+w/N1wCcHz3vqQcEqnh Pg02FCUULh3H/RElaAh5kUAAncT5qF6wwdwGF+Gncd6+OI5pB1tzutLkCcUDrMe/2yXB F3Tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc: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=U48HfhxEmV+UWirBSTo7Dps1REsFHmSWLWnDKAlStOo=; b=orOR9151u7ySFnVxbJZb4RZBrO+WucLAsPgy8fhlE5VBtr8wwwu+TrFxctyLKzA8AV twXwFPDFJDBXVV9UgpvVIQjE0w732nrM6pW4IH0qran9Och1MYn9uH34uXY3G1dceP05 b4GcXsto7oYjdqTkT5GnVbq/UBs1VC1VEqgz1ompga/S+Qp45QWN2Cbfz3NK0TbQMssy N/oFAQycO4GaOp+X2wm/4GVdD1IQbQU9ajQ+fvtLjZXa7Hsy1G83E+ezsBxkraiagowW Q/I0Yr322KGX/H/k8CsDPGpJ1/uOyw6eMaCyvUGDrw0gyWAxp4devTQi9NPofRPa+TTd zP+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=krTmqbUy; dkim=pass header.i=@linaro.org header.s=google header.b=XhqmCKz7; spf=pass (google.com: domain of libc-alpha-return-107083-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-107083-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 c1si3571497ejn.250.2019.11.14.06.47.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Nov 2019 06:47:54 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-107083-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=krTmqbUy; dkim=pass header.i=@linaro.org header.s=google header.b=XhqmCKz7; spf=pass (google.com: domain of libc-alpha-return-107083-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-107083-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:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=R3ZtL8UdJHacSmuNnWyby8OMH6EZJsM Jy2uWiPrGZ09ytOOkf9V6X2yB/GTJDv4KMha+wciOp3C3BLPUv14qr49kDWqItSR S072s8rhpQfIxTTL2TK+5A7jZKVlgdvvE5RCw3rqeduvbhTeqCiKQ84fO4SKTYua 4b5wma/iAtRo= 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:cc:subject:date:message-id:in-reply-to :references; s=default; bh=bdLgAAd8e/z6wI8qsNdE7EeUcKU=; b=krTmq bUytOU22wJgBScauxXxgaxQqTlYAy1Aul/7Vs43CcTFa1kWzmnII/+3ZNuZn+Kgr lrsKCwkcR8UvGRY7qEKh1BySxiBZUyCOCLNzCnXtFwpRMvftlH89bW1sg36KDmea 7B16dreiCscrx7OZ7WF+iJhTDrey4x6SZbD8Ho= Received: (qmail 29643 invoked by alias); 14 Nov 2019 14:47:19 -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 29503 invoked by uid 89); 14 Nov 2019 14:47:19 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.6 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 autolearn=ham version=3.3.1 spammy=2026 X-HELO: mail-qt1-f171.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=U48HfhxEmV+UWirBSTo7Dps1REsFHmSWLWnDKAlStOo=; b=XhqmCKz7AG7nJ4Ha6QTGzxRFhgutyNcGIdK639Bwx9VCtdKL04yur98kaCgKOCvELs rtsXi7CFcHhgwK0GePiJbsU81lsQn7NBB+vWMWVyrdZkM92g0P28ffm/ukqODnf00tY9 F/kD7PNbik4J7CySt6vkJ443PF0DZoJob9HPU9BWAT54J9vLB9sVN5nehN6qGzYTriA8 JaVZ676qPRiNSAB/RVZETA/UIv5oWgVhh0Wx0Ok0J3tdZvO2twmT8kCGiCc/eIVOYtW4 OT99oMevQob5pMOOkM5Gsa4AHf0EVw1nGlSRqbRnOWoovrDScC7WDbjIAfwRWtudZYs7 +DUA== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: Alistair Francis , alistair23@gmail.com Subject: [PATCH 3/7] nptl: Move waitpid implementation to libc Date: Thu, 14 Nov 2019 11:47:00 -0300 Message-Id: <20191114144704.19002-3-adhemerval.zanella@linaro.org> In-Reply-To: <20191114144704.19002-1-adhemerval.zanella@linaro.org> References: <20191114144704.19002-1-adhemerval.zanella@linaro.org> Checked on x86_64-linux-gnu and powerpc64le-linux-gnu. --- nptl/Makefile | 3 +-- nptl/Versions | 2 +- sysdeps/unix/sysv/linux/aarch64/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/alpha/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/arm/be/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/arm/le/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/csky/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/hppa/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/i386/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/ia64/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/nios2/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist | 1 - .../unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist | 1 - .../unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/sh/be/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/sh/le/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist | 1 - 29 files changed, 2 insertions(+), 30 deletions(-) -- 2.17.1 diff --git a/nptl/Makefile b/nptl/Makefile index f93d41176f..35f998754b 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -46,7 +46,7 @@ pthread-compat-wrappers = \ sendto fsync lseek lseek64 \ msync open open64 pause \ pread pread64 pwrite pwrite64 \ - tcdrain waitpid msgrcv msgsnd \ + tcdrain msgrcv msgsnd \ sigwait sigsuspend \ recvmsg sendmsg @@ -205,7 +205,6 @@ CFLAGS-pread.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-pread64.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-pwrite.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-pwrite64.c += -fexceptions -fasynchronous-unwind-tables -CFLAGS-waitpid.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-sigwait.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-msgrcv.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-msgsnd.c += -fexceptions -fasynchronous-unwind-tables diff --git a/nptl/Versions b/nptl/Versions index 1dda4b9064..ff6fc06002 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -99,7 +99,7 @@ libpthread { close; __close; fcntl; __fcntl; read; __read; write; __write; accept; connect; __connect; recv; recvfrom; recvmsg; send; __send; sendmsg; sendto; fsync; lseek; __lseek; msync; open; __open; pause; tcdrain; - system; waitpid; + system; # Hidden entry point (through macros). _pthread_cleanup_push; _pthread_cleanup_pop; diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist index cfa71ef697..7fb670d91f 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist @@ -202,7 +202,6 @@ GLIBC_2.17 siglongjmp F GLIBC_2.17 sigwait F GLIBC_2.17 system F GLIBC_2.17 tcdrain F -GLIBC_2.17 waitpid F GLIBC_2.17 write F GLIBC_2.18 pthread_getattr_default_np F GLIBC_2.18 pthread_setattr_default_np F diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist index ddb500a9d7..42679385d7 100644 --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist @@ -102,7 +102,6 @@ GLIBC_2.0 siglongjmp F GLIBC_2.0 sigwait F GLIBC_2.0 system F GLIBC_2.0 tcdrain F -GLIBC_2.0 waitpid F GLIBC_2.0 write F GLIBC_2.1 __libc_allocate_rtsig F GLIBC_2.1 __libc_current_sigrtmax F diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist index 428aac48e6..144ef997fe 100644 --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist @@ -231,5 +231,4 @@ GLIBC_2.4 siglongjmp F GLIBC_2.4 sigwait F GLIBC_2.4 system F GLIBC_2.4 tcdrain F -GLIBC_2.4 waitpid F GLIBC_2.4 write F diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist index 428aac48e6..144ef997fe 100644 --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist @@ -231,5 +231,4 @@ GLIBC_2.4 siglongjmp F GLIBC_2.4 sigwait F GLIBC_2.4 system F GLIBC_2.4 tcdrain F -GLIBC_2.4 waitpid F GLIBC_2.4 write F diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist index 7c17230afd..4edf765af2 100644 --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist @@ -218,7 +218,6 @@ GLIBC_2.29 tss_create F GLIBC_2.29 tss_delete F GLIBC_2.29 tss_get F GLIBC_2.29 tss_set F -GLIBC_2.29 waitpid F GLIBC_2.29 write F GLIBC_2.30 pthread_cond_clockwait F GLIBC_2.30 pthread_mutex_clocklock F diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist index 9b7c7dae3f..a5dfdef124 100644 --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist @@ -179,7 +179,6 @@ GLIBC_2.2 siglongjmp F GLIBC_2.2 sigwait F GLIBC_2.2 system F GLIBC_2.2 tcdrain F -GLIBC_2.2 waitpid F GLIBC_2.2 write F GLIBC_2.2.3 pthread_getattr_np F GLIBC_2.28 call_once F diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist index a35cbdb0e4..94e5ea5d0b 100644 --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist @@ -102,7 +102,6 @@ GLIBC_2.0 siglongjmp F GLIBC_2.0 sigwait F GLIBC_2.0 system F GLIBC_2.0 tcdrain F -GLIBC_2.0 waitpid F GLIBC_2.0 write F GLIBC_2.1 __libc_allocate_rtsig F GLIBC_2.1 __libc_current_sigrtmax F diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist index d15b0f09d8..f71c61da1f 100644 --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist @@ -179,7 +179,6 @@ GLIBC_2.2 siglongjmp F GLIBC_2.2 sigwait F GLIBC_2.2 system F GLIBC_2.2 tcdrain F -GLIBC_2.2 waitpid F GLIBC_2.2 write F GLIBC_2.2.3 pthread_getattr_np F GLIBC_2.28 call_once F diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist index 428aac48e6..144ef997fe 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist @@ -231,5 +231,4 @@ GLIBC_2.4 siglongjmp F GLIBC_2.4 sigwait F GLIBC_2.4 system F GLIBC_2.4 tcdrain F -GLIBC_2.4 waitpid F GLIBC_2.4 write F diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist index a35cbdb0e4..94e5ea5d0b 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist @@ -102,7 +102,6 @@ GLIBC_2.0 siglongjmp F GLIBC_2.0 sigwait F GLIBC_2.0 system F GLIBC_2.0 tcdrain F -GLIBC_2.0 waitpid F GLIBC_2.0 write F GLIBC_2.1 __libc_allocate_rtsig F GLIBC_2.1 __libc_current_sigrtmax F diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist index 50002eb438..40dbd1e7c7 100644 --- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist @@ -204,7 +204,6 @@ GLIBC_2.18 siglongjmp F GLIBC_2.18 sigwait F GLIBC_2.18 system F GLIBC_2.18 tcdrain F -GLIBC_2.18 waitpid F GLIBC_2.18 write F GLIBC_2.28 call_once F GLIBC_2.28 cnd_broadcast F diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist index 50002eb438..40dbd1e7c7 100644 --- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist @@ -204,7 +204,6 @@ GLIBC_2.18 siglongjmp F GLIBC_2.18 sigwait F GLIBC_2.18 system F GLIBC_2.18 tcdrain F -GLIBC_2.18 waitpid F GLIBC_2.18 write F GLIBC_2.28 call_once F GLIBC_2.28 cnd_broadcast F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist index 93558db21f..b29ab3d261 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist @@ -102,7 +102,6 @@ GLIBC_2.0 siglongjmp F GLIBC_2.0 sigwait F GLIBC_2.0 system F GLIBC_2.0 tcdrain F -GLIBC_2.0 waitpid F GLIBC_2.0 write F GLIBC_2.11 pthread_sigqueue F GLIBC_2.12 pthread_getname_np F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist index 93558db21f..b29ab3d261 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist @@ -102,7 +102,6 @@ GLIBC_2.0 siglongjmp F GLIBC_2.0 sigwait F GLIBC_2.0 system F GLIBC_2.0 tcdrain F -GLIBC_2.0 waitpid F GLIBC_2.0 write F GLIBC_2.11 pthread_sigqueue F GLIBC_2.12 pthread_getname_np F diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist index 226cf52615..e787d881b5 100644 --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist @@ -204,7 +204,6 @@ GLIBC_2.21 siglongjmp F GLIBC_2.21 sigwait F GLIBC_2.21 system F GLIBC_2.21 tcdrain F -GLIBC_2.21 waitpid F GLIBC_2.21 write F GLIBC_2.28 call_once F GLIBC_2.28 cnd_broadcast F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist index 6ddac21923..acf358b471 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist @@ -102,7 +102,6 @@ GLIBC_2.0 siglongjmp F GLIBC_2.0 sigwait F GLIBC_2.0 system F GLIBC_2.0 tcdrain F -GLIBC_2.0 waitpid F GLIBC_2.0 write F GLIBC_2.1 __libc_allocate_rtsig F GLIBC_2.1 __libc_current_sigrtmax F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist index c97f8ee3df..f6ae27d76b 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist @@ -200,7 +200,6 @@ GLIBC_2.3 siglongjmp F GLIBC_2.3 sigwait F GLIBC_2.3 system F GLIBC_2.3 tcdrain F -GLIBC_2.3 waitpid F GLIBC_2.3 write F GLIBC_2.3.2 pthread_cond_broadcast F GLIBC_2.3.2 pthread_cond_destroy F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist index cfa71ef697..7fb670d91f 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist @@ -202,7 +202,6 @@ GLIBC_2.17 siglongjmp F GLIBC_2.17 sigwait F GLIBC_2.17 system F GLIBC_2.17 tcdrain F -GLIBC_2.17 waitpid F GLIBC_2.17 write F GLIBC_2.18 pthread_getattr_default_np F GLIBC_2.18 pthread_setattr_default_np F diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist index 0ed3f137be..1581991fd5 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist @@ -199,7 +199,6 @@ GLIBC_2.27 sendto F GLIBC_2.27 sigaction F GLIBC_2.27 sigwait F GLIBC_2.27 tcdrain F -GLIBC_2.27 waitpid F GLIBC_2.27 write F GLIBC_2.28 call_once F GLIBC_2.28 cnd_broadcast F diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist index 3ef6e2169b..0bffc8f456 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist @@ -102,7 +102,6 @@ GLIBC_2.0 siglongjmp F GLIBC_2.0 sigwait F GLIBC_2.0 system F GLIBC_2.0 tcdrain F -GLIBC_2.0 waitpid F GLIBC_2.0 write F GLIBC_2.1 __libc_allocate_rtsig F GLIBC_2.1 __libc_current_sigrtmax F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist index b2326477ae..bd82c1969a 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist @@ -181,7 +181,6 @@ GLIBC_2.2 siglongjmp F GLIBC_2.2 sigwait F GLIBC_2.2 system F GLIBC_2.2 tcdrain F -GLIBC_2.2 waitpid F GLIBC_2.2 write F GLIBC_2.2.3 pthread_getattr_np F GLIBC_2.28 call_once F diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist index 9b7c7dae3f..a5dfdef124 100644 --- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist @@ -179,7 +179,6 @@ GLIBC_2.2 siglongjmp F GLIBC_2.2 sigwait F GLIBC_2.2 system F GLIBC_2.2 tcdrain F -GLIBC_2.2 waitpid F GLIBC_2.2 write F GLIBC_2.2.3 pthread_getattr_np F GLIBC_2.28 call_once F diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist index 9b7c7dae3f..a5dfdef124 100644 --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist @@ -179,7 +179,6 @@ GLIBC_2.2 siglongjmp F GLIBC_2.2 sigwait F GLIBC_2.2 system F GLIBC_2.2 tcdrain F -GLIBC_2.2 waitpid F GLIBC_2.2 write F GLIBC_2.2.3 pthread_getattr_np F GLIBC_2.28 call_once F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist index ddb500a9d7..42679385d7 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist @@ -102,7 +102,6 @@ GLIBC_2.0 siglongjmp F GLIBC_2.0 sigwait F GLIBC_2.0 system F GLIBC_2.0 tcdrain F -GLIBC_2.0 waitpid F GLIBC_2.0 write F GLIBC_2.1 __libc_allocate_rtsig F GLIBC_2.1 __libc_current_sigrtmax F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist index d15b0f09d8..f71c61da1f 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist @@ -179,7 +179,6 @@ GLIBC_2.2 siglongjmp F GLIBC_2.2 sigwait F GLIBC_2.2 system F GLIBC_2.2 tcdrain F -GLIBC_2.2 waitpid F GLIBC_2.2 write F GLIBC_2.2.3 pthread_getattr_np F GLIBC_2.28 call_once F diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist index ca00d79b0c..6ec95f4dcc 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist @@ -180,7 +180,6 @@ GLIBC_2.2.5 siglongjmp F GLIBC_2.2.5 sigwait F GLIBC_2.2.5 system F GLIBC_2.2.5 tcdrain F -GLIBC_2.2.5 waitpid F GLIBC_2.2.5 write F GLIBC_2.28 call_once F GLIBC_2.28 cnd_broadcast F diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist index ae748ed431..6d8045dbe0 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist @@ -202,7 +202,6 @@ GLIBC_2.16 siglongjmp F GLIBC_2.16 sigwait F GLIBC_2.16 system F GLIBC_2.16 tcdrain F -GLIBC_2.16 waitpid F GLIBC_2.16 write F GLIBC_2.18 pthread_getattr_default_np F GLIBC_2.18 pthread_setattr_default_np F From patchwork Thu Nov 14 14:47:01 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: 179438 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp11155679ilf; Thu, 14 Nov 2019 06:47:45 -0800 (PST) X-Google-Smtp-Source: APXvYqxWWgneyst3cKsOcHDdSm87TQlfCM0Lcced7sAb+nBVb7fKYn73Q2AqR3Z59bVYpA79nuEe X-Received: by 2002:aa7:c894:: with SMTP id p20mr1695207eds.145.1573742865019; Thu, 14 Nov 2019 06:47:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573742865; cv=none; d=google.com; s=arc-20160816; b=wyJMbm0aQosJ3AkZrE/qnZ0SbltFDy8x+7FCYnOp2ONNHURzxPh05FFOQaU2M3LCBK LhBbYOJvqKC5ZlftfEYomrADIL8s4/o6e9ogO2qfg+x1rTOHt+6OxWr4E5VDLHPG58Tm CYrOKVkAWGXpcQzWYTbZdO/A2OYNdANSJtxy+E/OZLMnZPpkF3KD88X75VW59lXw5xF+ DczrqonLDxOR7tUFUdH1AegkOXinwAWQhTNjxJxZ5b7jW4IfgBc5uabWlVti1ouZ+2Jh IMO1hRWW1LK6EzRo92B8U8ryOpHnuay7J+j7aJIXBXo1KWxpywdfrB3SCpUg4P14uyGh GJaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc: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=Z6SLZq1tm477cM4QN+7XZKMHajeWyJcEu7ySStf5JPU=; b=w6lx+vA0+cAwxWfVXJUI3HWXd5Igi1lkIUeg3zdAksKSOhHdGO6aQpsvFb7kc3CYO8 dG8hw9MRQH8xf4+Bg2H4BTLn6XcWdwhEefkszsAK5hN7va48+Ln0pUsn3+b8ACFfzZrv a+TBmd0EnJE7KJm5t9k3wwzmK4J8nBxOa0DaLSvuEXbWTNQuuimvv3XcNp6Nofht8oKl l/ukXD1frYkLjTUmKFdxaQiZTm9e5KhIEBrDR1c2pbOlpufPu5sXdyvnKTDFB1g+LJt8 n2j9tTgVW4VOT9uZRuJZiAS6OKPTPRWOCG5bTLzmhX0T9RqEAzHyt9PQ2VpvJOwjuDmO A5YA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=QDNmAQ4e; dkim=pass header.i=@linaro.org header.s=google header.b=hlqNVYFT; spf=pass (google.com: domain of libc-alpha-return-107082-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-107082-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 x12si3541499eju.50.2019.11.14.06.47.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Nov 2019 06:47:44 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-107082-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=QDNmAQ4e; dkim=pass header.i=@linaro.org header.s=google header.b=hlqNVYFT; spf=pass (google.com: domain of libc-alpha-return-107082-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-107082-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:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=GbjDaOMxgKd8slY/Xo4yeH9qFaFLixA 2q10hiq3+xO30G556npekj45pruiZb4NC6/b/6530LaIpguJsvydzHKuGGmZrV0e pG67WwQZ2jhwiDnlN9LvU0fTsv7PmbUVZUPR8R/IGUNe4+xHdwqjSWy3NzPYlLoS Xj0cTdF3EgEc= 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:cc:subject:date:message-id:in-reply-to :references; s=default; bh=fqlkMXHUp6XlXMWVvWWsA5l9zZ0=; b=QDNmA Q4exOwZ75Dxp1KTZoI0T8/42KnyOAy+p4EnX7INRD1Q8I9hVWFWuQDxzTxBDR/cC 3m0irYiXUhvc5i/o2sNhbx/yQOPQiWpWerwUVtdpo5wy211Jb6126QcJf9Xf8q65 yFMJqx1aY9+Ac7wMsx6ppm33qPjrTj9Vx1gmr4= Received: (qmail 29562 invoked by alias); 14 Nov 2019 14:47:19 -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 29469 invoked by uid 89); 14 Nov 2019 14:47:19 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.6 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-qt1-f193.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Z6SLZq1tm477cM4QN+7XZKMHajeWyJcEu7ySStf5JPU=; b=hlqNVYFT/jYX6JFgE9etFbB02TejWo83gyJr84b5JHwBH/PWuvGmBJDSf30V9pzXT6 n+af0I/VnofR4MB8tMHqZT5N7OVq1xfJKcj9N5QniwtUmHT2X06zTMEX1+WH6YqwLu/q Jp6JNSSu7pcIAz5HIPVTZJU4Dg14yLXYPmfVRxyy2xPGXgwQ1axkieiLnUgIZhsu/e8r GQBWUBdlKMWoVPqqb2WgcU/i/aWAluOLNa42ZganDQ7ghSKXi9h8p/5T0oqXGQemvx+3 J7uhuCiVP8MefllL16AIQNQ2yD4Um5BGDXNK4PJKuY1kxrQm8sDSK6tBkfHLbANalDuJ SkQQ== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: Alistair Francis , alistair23@gmail.com Subject: [PATCH 4/7] Implement wait in terms of waitpid Date: Thu, 14 Nov 2019 11:47:01 -0300 Message-Id: <20191114144704.19002-4-adhemerval.zanella@linaro.org> In-Reply-To: <20191114144704.19002-1-adhemerval.zanella@linaro.org> References: <20191114144704.19002-1-adhemerval.zanella@linaro.org> The posix implementation is used as default and both bsd and linux version are removed. It simplifies the implementation for architectures that does not provide either __NR_waitpid or __NR_wait4. Checked on x86_64-linux-gnu and powerpc64le-linux-gnu. --- posix/wait.c | 6 +----- sysdeps/posix/wait.c | 30 ----------------------------- sysdeps/unix/bsd/wait.c | 32 ------------------------------- sysdeps/unix/sysv/linux/wait.c | 35 ---------------------------------- 4 files changed, 1 insertion(+), 102 deletions(-) delete mode 100644 sysdeps/posix/wait.c delete mode 100644 sysdeps/unix/bsd/wait.c delete mode 100644 sysdeps/unix/sysv/linux/wait.c -- 2.17.1 diff --git a/posix/wait.c b/posix/wait.c index 0acd1e4926..908e15030a 100644 --- a/posix/wait.c +++ b/posix/wait.c @@ -16,16 +16,12 @@ . */ #include -#include /* Wait for a child to die. When one does, put its status in *STAT_LOC and return its process ID. For errors, return (pid_t) -1. */ __pid_t __wait (int *stat_loc) { - __set_errno (ENOSYS); - return -1; + return __waitpid (WAIT_ANY, (int *) stat_loc, 0); } -stub_warning (wait) - weak_alias (__wait, wait) diff --git a/sysdeps/posix/wait.c b/sysdeps/posix/wait.c deleted file mode 100644 index 573aa47a6d..0000000000 --- a/sysdeps/posix/wait.c +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (C) 1991-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 - - -/* Wait for a child to die. When one does, put its status in *STAT_LOC - and return its process ID. For errors, return (pid_t) -1. */ -__pid_t -__libc_wait (int *stat_loc) -{ - return __waitpid (WAIT_ANY, (int *) stat_loc, 0); -} - -weak_alias (__libc_wait, __wait) -weak_alias (__libc_wait, wait) diff --git a/sysdeps/unix/bsd/wait.c b/sysdeps/unix/bsd/wait.c deleted file mode 100644 index 3207d96330..0000000000 --- a/sysdeps/unix/bsd/wait.c +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright (C) 1991-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 -#include -#include -#include - -/* Wait for a child to die. When one does, put its status in *STAT_LOC - and return its process ID. For errors, return (pid_t) -1. */ -__pid_t -__libc_wait (int *stat_loc) -{ - return __wait4 (WAIT_ANY, stat_loc, 0, (struct rusage *) NULL); -} - -weak_alias (__libc_wait, __wait) -weak_alias (__libc_wait, wait) diff --git a/sysdeps/unix/sysv/linux/wait.c b/sysdeps/unix/sysv/linux/wait.c deleted file mode 100644 index c2385c752e..0000000000 --- a/sysdeps/unix/sysv/linux/wait.c +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright (C) 1991-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 -#include -#include -#include -#include - -/* Wait for a child to die. When one does, put its status in *STAT_LOC - and return its process ID. For errors, return (pid_t) -1. */ -pid_t -__libc_wait (int *stat_loc) -{ - pid_t result = SYSCALL_CANCEL (wait4, WAIT_ANY, stat_loc, 0, - (struct rusage *) NULL); - return result; -} - -weak_alias (__libc_wait, __wait) -weak_alias (__libc_wait, wait) From patchwork Thu Nov 14 14:47:02 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: 179440 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp11156109ilf; Thu, 14 Nov 2019 06:48:07 -0800 (PST) X-Google-Smtp-Source: APXvYqyjXKOKO7UTyZxnNB8LyP7n/RWXBzjwkpkfn8P/nFYFKGGAj3MOShYxOLnEOPbmM2wQ2WqX X-Received: by 2002:a50:ef16:: with SMTP id m22mr1685853eds.154.1573742887283; Thu, 14 Nov 2019 06:48:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573742887; cv=none; d=google.com; s=arc-20160816; b=gw+m/sCSvwsKHAVeoAPRb/QbJfkVEjRAADoUkhfLi/lvyzOulreZk40xhxzHE4kvRq q/5wfrhoHQFnkh3c0zaKwysmE6bBaQ0UrxUmDn8/mdvwL39BjEe6yZs/K5XaB3i6zzxZ 2t7vPd89/gKm6pn21EO/ReVIONUEOVWYRjVvh95T+PYS/MnQllQff35hVrGoZ3lIzzIY bw6PzO6oxCgyr8QTKe2zs5tWT5llhFgHWIO4L13SM35g8FUc8eChWW9jsbTjX/pYpZpm 4w8FdOmTBff2WlDV0CvB1QC6+zIiBk6hzYt/H0HFN+jpbD6oRPldDMq6klL1kceZ38wF ZGdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc: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=sBN0cA4LyxPGOCHH5tUTr/M8ODXZLTgrNQdVi5Nk3SU=; b=FtQGkzU4URW4qwVG4nxRAUX/hifau4+xLejbXiNFcbh8hMxt/usF59D7jDyOy+to9N v9A8FxJJIvLuWzCD28PDt/xIfL7Uv2FE35NI4UARvL98LK/GE0Yk7d+OWcKfHk32s6K4 xgMUZBeQqMj14r5L/UxMCFOdrNoRlZHJCaN+1Tr7l4OH76J+gH24Qc/Hj6x3qYEzuXyG CpWJbug9sLIzXU26/WNM9xUbhdQgNvHe+2yh1jhcCTv4o3fTLWUvIiu62T9mNl8lN3X3 qeJJMiyt56lduXAx+pKsabERxGJckcDJusDCihwvco8lQ2tRg7GX8sbcV90+gWi3Ki0k 3Bzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b="j/4dSo1/"; dkim=pass header.i=@linaro.org header.s=google header.b=dU7fmIAp; spf=pass (google.com: domain of libc-alpha-return-107084-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-107084-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 t8si4597489edd.373.2019.11.14.06.48.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Nov 2019 06:48:07 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-107084-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="j/4dSo1/"; dkim=pass header.i=@linaro.org header.s=google header.b=dU7fmIAp; spf=pass (google.com: domain of libc-alpha-return-107084-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-107084-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:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=lKECAxhMDChe8iJSOBikePu7WPHVPVo SZKVXngfZVmYx05T4gMYC5j9kmfx1C/+Do5GbQmPdgmWfZzs761/wSBCyKDndaMv 4CjG8u7OapW8vWt8cTaMDWyBUP8ALQL5xNUGXuAp5/9il/rpNxnGozv1zejRXGtQ ydDbGZ6NnPbw= 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:cc:subject:date:message-id:in-reply-to :references; s=default; bh=cJqLDwiZYe52udIDj+OqMpL0N/0=; b=j/4dS o1/4AUm/9HTa8kRGl9uEEFdPK8KwtXTlDDeJH9TcDj1km/IO4eI9ZxuJmvDvExSh ewMdy/Lp0FREkcwX/HegCc9WryONT9slK1m36l2asy54U7OeD1qUt0FuYB3LB7DE iUa+Tz6ozVTG14cES3hsap1eJlx9MS2sgK9QTg= Received: (qmail 30021 invoked by alias); 14 Nov 2019 14:47:22 -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 29961 invoked by uid 89); 14 Nov 2019 14:47:22 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.6 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-qk1-f193.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sBN0cA4LyxPGOCHH5tUTr/M8ODXZLTgrNQdVi5Nk3SU=; b=dU7fmIApcrzVVy86UdDRdBFEzONebVkhHDLQwGX3IWRiQc9sXL8IIcZEuuRJU6Jwvc lJGWyJ/MjHok2iRxLhMyEpM86pfQX+zpLfD2hwApuzze+mulNgyUG9K+9QSZ4RVHkSq5 tCj79sG5UGo+tAyaCdMSGnBhMb5eFK9AraxKTe8W9o9vKQUv2Ihs24M5LKxsbIwlSPc0 GSu29CjYVnUFDljsPvnGKievS6atoSIWla5nGPNR2W9uvRoBwjypkvAIR97fgwL1bPY5 RSTBjy/l+Z39q4ap6A/RgHnJ3N92A2wnuIVXFdR/zZaSX2/UZAAI4/gZ4VzB0YNvXu/2 xSBw== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: Alistair Francis , alistair23@gmail.com Subject: [PATCH 5/7] linux: Use waitid on wait4 if __NR_wait4 is not defined Date: Thu, 14 Nov 2019 11:47:02 -0300 Message-Id: <20191114144704.19002-5-adhemerval.zanella@linaro.org> In-Reply-To: <20191114144704.19002-1-adhemerval.zanella@linaro.org> References: <20191114144704.19002-1-adhemerval.zanella@linaro.org> If the wait4 syscall is not avaliable (such as y2038 safe 32-bit systems) waitid should be used instead. However prior Linux 5.4 waitid is not a fully superset of other wait instruction, since it does not include support for waiting for the current process group. It would be possible to emulate to issue an extra syscall to get the current process group, but it is inherent racy: after the current process group is received and before it is passed to waitid a signal could arrive causing the current process group to change So waitid is used if wait4 is not defined iff the build is enabled with a minimum kernel if 5.4+. The new assume __ASSUME_WAITID_PID0_P_PGID is added and an error is issued if waitid can not be implemented by either __NR_wait4 or __NR_waitid && __ASSUME_WAITID_PID0_P_PGID. Checked on x86_64-linux-gnu and i686-linux-gnu. Co-authored-by: Alistair Francis --- sysdeps/unix/sysv/linux/kernel-features.h | 6 ++ sysdeps/unix/sysv/linux/syscalls.list | 1 - sysdeps/unix/sysv/linux/wait4.c | 88 +++++++++++++++++++++++ 3 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 sysdeps/unix/sysv/linux/wait4.c -- 2.17.1 diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h index e6be76ff46..43faaa3f9d 100644 --- a/sysdeps/unix/sysv/linux/kernel-features.h +++ b/sysdeps/unix/sysv/linux/kernel-features.h @@ -208,4 +208,10 @@ # define __ASSUME_TIME64_SYSCALLS 1 #endif +/* Linux waitid prior kernel 5.4 does not support waiting for the current + process group. */ +#if __LINUX_KERNEL_VERSION >= 0x050400 +# define __ASSUME_WAITID_PID0_P_PGID +#endif + #endif /* kernel-features.h */ diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index 603e517ca6..5f1352ad43 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -67,7 +67,6 @@ swapoff - swapoff i:s __swapoff swapoff unshare EXTRA unshare i:i unshare uselib EXTRA uselib i:s __compat_uselib uselib@GLIBC_2.0:GLIBC_2.23 utime - utime i:sP utime -wait4 - wait4 i:iWiP __wait4 wait4 chown - chown i:sii __libc_chown __chown chown diff --git a/sysdeps/unix/sysv/linux/wait4.c b/sysdeps/unix/sysv/linux/wait4.c new file mode 100644 index 0000000000..d09917c7ff --- /dev/null +++ b/sysdeps/unix/sysv/linux/wait4.c @@ -0,0 +1,88 @@ +/* Wait for process to change state. Linux 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 +#include +#include + +pid_t +__wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage) +{ +#if __NR_wait4 + return SYSCALL_CANCEL (wait4, pid, stat_loc, options, usage); +#elif defined (__ASSUME_WAITID_PID0_P_PGID) + idtype_t idtype = P_PID; + + if (pid < -1) + { + idtype = P_PGID; + pid *= -1; + } + else if (pid == -1) + { + idtype = P_ALL; + } + else if (pid == 0) + { + idtype = P_PGID; + } + + options |= WEXITED; + + siginfo_t infop; + if (SYSCALL_CANCEL (waitid, idtype, pid, &infop, options, usage) < 0) + return -1; + + if (stat_loc) + { + switch (infop.si_code) + { + case CLD_EXITED: + *stat_loc = W_EXITCODE (infop.si_status, 0); + break; + case CLD_DUMPED: + *stat_loc = WCOREFLAG | infop.si_status; + break; + case CLD_KILLED: + *stat_loc = infop.si_status; + break; + case CLD_TRAPPED: + case CLD_STOPPED: + *stat_loc = W_STOPCODE (infop.si_status); + break; + case CLD_CONTINUED: + *stat_loc = __W_CONTINUED; + break; + default: + *stat_loc = 0; + break; + } + } + + return infop.si_pid; +# else +/* Linux waitid prior kernel 5.4 does not support waiting for the current + process. It would be possible to emulate it by calling getpgid for pid 0, + however, it would require an additional syscall and it is inherent racy: + after the current process group is received and before it is passed + to waitid a signal could arrive causing the current process group to + change. */ +# error "The kernel ABI does not provide a way to implement wait4" +#endif +} +weak_alias (__wait4, wait4) From patchwork Thu Nov 14 14:47:03 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: 179441 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp11156357ilf; Thu, 14 Nov 2019 06:48:20 -0800 (PST) X-Google-Smtp-Source: APXvYqy/uKbr5/NhHjpt93ZO43D3krbbVIBV7E0tYWA1rOhZXCK3ypTBuUQFlQJaW3mQrgcKSDNG X-Received: by 2002:aa7:c453:: with SMTP id n19mr1724899edr.103.1573742900740; Thu, 14 Nov 2019 06:48:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573742900; cv=none; d=google.com; s=arc-20160816; b=JZ0fgb9DanK5PsPmyCrLA9TIwUl4mOtjpQF+2UCMVyMj3gpMqksA1/mqwv8zWA9+ES QrOdl56c415XT6drXE03Gq/aoLHvpu9Wb/K48VNTbhD4KpnFjwLwMWFPsKJPysK1kP3q Ak4YUswnXljUAuy7nkJJunthwrM8GIo7e3iqyMlQNgRNgHbIBZTh582/4PM7IJHQLDo/ hH/pKo2/EXENMaZm1+Df05opeI4KL/clQ83vtz6IjQDPAG0/CnOmMTGhfTfyDhEzBkpk VTQ+RtJS8YjsA+nfAoYvW0DXMOBmU0oO0mwiH4Sl94toXcRpsCXvvT4ULZmibzY1ssLT yHjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc: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=H4v64pG13DBzvoI8jjVF2zcWNVeJEMz/NHYANkY1GU4=; b=h8gvoQQMA5RiBHmZZZUV+xnKHxzOnbjsiPH3aiprfNjXfiBl0BU+rpicgjvzz/xRsG 2MilyJ+CVXLN7IkHvN4GF3AptFqos9nCa0qM1xODyhkpkpIXwl9AxK0fImkM/3GIHLDj tcvFHP3W97uZLZ2nbTXdJIi3hwEGrNTF21RCPyjUjJKh9NjlwMNiNFJwjFrLwdxIJlwr zCOQkMjX0L058iC2k50YeW4jYeGHTMgUiY0eTQcP9EO5jgqELINzUmCPnlG2j2HJksJV 2wEfVEDgGsWNXjipu8lE5wXWlCqYxXx3xfXIaOfxhsWTa/ZaGij3AsgJTTmjwfM3ga4i 6KDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=laKamEAx; dkim=pass header.i=@linaro.org header.s=google header.b=tZv5LVwK; spf=pass (google.com: domain of libc-alpha-return-107085-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-107085-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 s1si4042405edx.188.2019.11.14.06.48.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Nov 2019 06:48:20 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-107085-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=laKamEAx; dkim=pass header.i=@linaro.org header.s=google header.b=tZv5LVwK; spf=pass (google.com: domain of libc-alpha-return-107085-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-107085-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:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=YuBbrUyP+QpRU/+Z09wd9K7jER+1heq yi8lEi3UXTEtdQGdCrhCeoTWF+4kAJ4fKzcYZ6dnP3sfUrp4cuBj1az+h+jTrU7X mrfDfKrc05l5mBqKa92GbXAW9OMz+4nkuO5bvMe0XJUxpC6d0okSiniqPXPrDbpy BDdNhZ7KxorE= 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:cc:subject:date:message-id:in-reply-to :references; s=default; bh=Dn9eYNnuHmlapC9APCFL3T631Ek=; b=laKam EAxxRH6GUBZeiHWUf9lj1bbDvlyY+VsGtrYWzV3nxhS7CdnN4Vqa6unbOfV3vYHa wLE3E+15LtxDV2z5bcbqlCCWqsV+dLWlt/98y0dwp58/k+5kiaSTeIEil1WyNeFp wNDxpLkhos/H3s4UxrHBAlBFL6b0bybRiFaNBc= Received: (qmail 30173 invoked by alias); 14 Nov 2019 14:47:23 -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 30086 invoked by uid 89); 14 Nov 2019 14:47:23 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-qt1-f195.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=H4v64pG13DBzvoI8jjVF2zcWNVeJEMz/NHYANkY1GU4=; b=tZv5LVwKElTTnghkDW5lG4oQ4skQqAsMXdQSgV9VhCIvhwxXUPyTR1fzeFXkHsh3MY LpkX04r9SsnK3/l9tKuypPxZD6841GkBLzP2WbXlNQu9FqPJmpyRQKgS5hUUYM3Uwxvb XBOHMvcE+DbvTF6muDssvE9x3I8n6tmmaCUQLWS2dFBh6lKXWjOF0YJvBqUf2fFL0xPo Dj9ttBM6PXFXbouGu1yNhAtbvMpQ2U3yMxY/biTsN+AsJjN6LazphuVpZAKZPDhJsTj9 HmqkYcQ0n8/pQWBzmobdPPddzR08tmIWiCs1ZQgvtThjm6Bif6O9EP7ProNPmlsFYHdH oLsg== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: Alistair Francis , alistair23@gmail.com Subject: [PATCH 6/7] Implement waitpid in terms of wait4 Date: Thu, 14 Nov 2019 11:47:03 -0300 Message-Id: <20191114144704.19002-6-adhemerval.zanella@linaro.org> In-Reply-To: <20191114144704.19002-1-adhemerval.zanella@linaro.org> References: <20191114144704.19002-1-adhemerval.zanella@linaro.org> This also consolidate all waitpid implementations. Checked on x86_64-linux-gnu. --- include/sys/wait.h | 1 + posix/wait4.c | 2 +- posix/waitpid.c | 34 ++++++------------------- sysdeps/mach/hurd/wait4.c | 2 +- sysdeps/unix/bsd/waitpid.c | 42 ------------------------------- sysdeps/unix/sysv/linux/wait4.c | 1 + sysdeps/unix/sysv/linux/waitpid.c | 34 ------------------------- 7 files changed, 11 insertions(+), 105 deletions(-) delete mode 100644 sysdeps/unix/bsd/waitpid.c delete mode 100644 sysdeps/unix/sysv/linux/waitpid.c -- 2.17.1 diff --git a/include/sys/wait.h b/include/sys/wait.h index 5ac9cd6ca6..39a327f6b2 100644 --- a/include/sys/wait.h +++ b/include/sys/wait.h @@ -15,5 +15,6 @@ extern __pid_t __wait3 (int *__stat_loc, extern __pid_t __wait4 (__pid_t __pid, int *__stat_loc, int __options, struct rusage *__usage) attribute_hidden; +libc_hidden_proto (__wait4); #endif #endif diff --git a/posix/wait4.c b/posix/wait4.c index eb4f7fb6de..5857b4e7c1 100644 --- a/posix/wait4.c +++ b/posix/wait4.c @@ -26,5 +26,5 @@ __wait4 (__pid_t pid, int *stat_loc, int options, struct rusage *usage) return (pid_t) -1; } stub_warning (wait4) - +libc_hidden_def (__wait4) weak_alias (__wait4, wait4) diff --git a/posix/waitpid.c b/posix/waitpid.c index adae03918a..0490c37316 100644 --- a/posix/waitpid.c +++ b/posix/waitpid.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991-2019 Free Software Foundation, Inc. +/* Wait for process to change state. + Copyright (C) 1991-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 @@ -16,35 +17,14 @@ . */ #include +#include +#include #include -#include - -/* Wait for a child matching PID to die. - If PID is greater than 0, match any process whose process ID is PID. - If PID is (pid_t) -1, match any process. - If PID is (pid_t) 0, match any process with the - same process group as the current process. - If PID is less than -1, match any process whose - process group is the absolute value of PID. - If the WNOHANG bit is set in OPTIONS, and that child - is not already dead, return (pid_t) 0. If successful, - return PID and store the dead child's status in STAT_LOC. - Return (pid_t) -1 for errors. If the WUNTRACED bit is set in OPTIONS, - return status for stopped children; otherwise don't. */ -pid_t -__waitpid (pid_t pid, int *stat_loc, int options) +__pid_t +__waitpid (__pid_t pid, int *stat_loc, int options) { - if ((options & ~(WNOHANG|WUNTRACED)) != 0) - { - __set_errno (EINVAL); - return (pid_t) -1; - } - - __set_errno (ENOSYS); - return (pid_t) -1; + return __wait4 (pid, stat_loc, options, NULL); } libc_hidden_def (__waitpid) weak_alias (__waitpid, waitpid) - -stub_warning (waitpid) diff --git a/sysdeps/mach/hurd/wait4.c b/sysdeps/mach/hurd/wait4.c index 78ad33e8f5..a0137482c4 100644 --- a/sysdeps/mach/hurd/wait4.c +++ b/sysdeps/mach/hurd/wait4.c @@ -49,5 +49,5 @@ __wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage) return (pid_t) __hurd_fail (err); } } - +libc_hidden_def (__wait4) weak_alias (__wait4, wait4) diff --git a/sysdeps/unix/bsd/waitpid.c b/sysdeps/unix/bsd/waitpid.c deleted file mode 100644 index 679d45d3dd..0000000000 --- a/sysdeps/unix/bsd/waitpid.c +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright (C) 1991-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 -#include -#include -#include - -/* Wait for a child matching PID to die. - If PID is greater than 0, match any process whose process ID is PID. - If PID is (pid_t) -1, match any process. - If PID is (pid_t) 0, match any process with the - same process group as the current process. - If PID is less than -1, match any process whose - process group is the absolute value of PID. - If the WNOHANG bit is set in OPTIONS, and that child - is not already dead, return (pid_t) 0. If successful, - return PID and store the dead child's status in STAT_LOC. - Return (pid_t) -1 for errors. If the WUNTRACED bit is set in OPTIONS, - return status for stopped children; otherwise don't. */ -pid_t -__waitpid (pid_t pid, int *stat_loc, int options) -{ - return __wait4 (pid, stat_loc, options, NULL); -} - -libc_hidden_def (__waitpid) -weak_alias (__waitpid, waitpid) diff --git a/sysdeps/unix/sysv/linux/wait4.c b/sysdeps/unix/sysv/linux/wait4.c index d09917c7ff..203deb7730 100644 --- a/sysdeps/unix/sysv/linux/wait4.c +++ b/sysdeps/unix/sysv/linux/wait4.c @@ -85,4 +85,5 @@ __wait4 (pid_t pid, int *stat_loc, int options, struct rusage *usage) # error "The kernel ABI does not provide a way to implement wait4" #endif } +libc_hidden_def (__wait4); weak_alias (__wait4, wait4) diff --git a/sysdeps/unix/sysv/linux/waitpid.c b/sysdeps/unix/sysv/linux/waitpid.c deleted file mode 100644 index d35aac01bc..0000000000 --- a/sysdeps/unix/sysv/linux/waitpid.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Linux waitpid syscall implementation. - Copyright (C) 1991-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 -#include -#include -#include - -__pid_t -__waitpid (__pid_t pid, int *stat_loc, int options) -{ -#ifdef __NR_waitpid - return SYSCALL_CANCEL (waitpid, pid, stat_loc, options); -#else - return SYSCALL_CANCEL (wait4, pid, stat_loc, options, NULL); -#endif -} -libc_hidden_def (__waitpid) -weak_alias (__waitpid, waitpid) From patchwork Thu Nov 14 14:47:04 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: 179442 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp11156548ilf; Thu, 14 Nov 2019 06:48:30 -0800 (PST) X-Google-Smtp-Source: APXvYqyUSpWzE8hPoBspIcbegWb+/K7qDWoz6UObvcAZv6BzWimAhK4t/50xVoma2qxfuDE+99WF X-Received: by 2002:a17:906:5786:: with SMTP id k6mr8819335ejq.294.1573742910216; Thu, 14 Nov 2019 06:48:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573742910; cv=none; d=google.com; s=arc-20160816; b=n2joAkdifEqgpVrBzANta831TfDdeNkpeC0tNjlPkbUkfaBWCZOzMj9TSk1t76PPgH f4EAaNg87mC8cNhazDB3Qon+D1RqdMuWtpY1Dbalkg5ez9pFSgLIfFJYmPR6Rm3LMn43 dJLdT9yqJdNL2QdgJwibgAobN2uQPpCbr5maZbF+d4CExRWjfkySU/RzIklxt6e5rGon Q7zk8+Ihom1fJDsyhFE28y7uYiEGesvNYUeL0PERGSsD/IICEtjDWafhqO+6DouEKwu2 /7AD9qBBrhjNFbZG0waI6NYQ5H5QJoQ4E1iNCM9l2dvwfumvhNQ3f24z48YvhkyVHh03 e5Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc: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=iinejSlIt8VuF0soYcV/L+80DhRPCWRE4jMj3imRgUs=; b=kErAdnB77YeuFJtnjjh/E0GYK3v1+U8rZPPHApNq5r7MJkDBmz5MI/gi7WXccGANGr Hu3DK0O7tQHeUKxQxJEoEEVUcohSi96EXwFKtgfRaTjIPnbKeft+loegRUDkzJaa1pH+ OUlv7VBe5Au8BKVrUQRM3HFEhIX067iEr9PBCHosJDoFbhw6aKCBvR/uouqHFJAhFKqi KUaGz1beaUCCdAXya9kLB8Ihed0KMoMKdzAfMiDk2Z+xUyXG703AfsjgtZ2lm65PN2/p rvXV03LRaTwMAWcC+ux5xXuCjeeKCT9xIXVyrhOx4EbcdyPfnlr/mVfGauGgMn5qb4+Z 8nXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=LaTtj8PZ; dkim=pass header.i=@linaro.org header.s=google header.b=JWDEMBdS; spf=pass (google.com: domain of libc-alpha-return-107086-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-107086-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 l4si3666718edr.286.2019.11.14.06.48.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Nov 2019 06:48:30 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-107086-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=LaTtj8PZ; dkim=pass header.i=@linaro.org header.s=google header.b=JWDEMBdS; spf=pass (google.com: domain of libc-alpha-return-107086-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-107086-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:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=CDy0pptkj9sbBa+XycFM/DIsEUM+zAo JE5uVybeCzrQ0mofXGQ3ImX5x29he/2k1Klq5DrFgteEXZLCkt1JDmReXbRe7khD Rf4ihrZfL9E8KWzGEswfofRWZLmLn6O23iRcnXAeAlM0ir0CJQ6ufBxjgNVtLjES Be4jnHjEc5w4= 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:cc:subject:date:message-id:in-reply-to :references; s=default; bh=irPm7GXNBq++uUv77uuBCyFDVZI=; b=LaTtj 8PZUVscFqrbjlYZLVH9fFMlRYwfoI0rc4loZ8Trah420oFonStONH/Kf8h9FlTyi cVZyx4nGzIWmUVW9I0yLmokfAb37CHSCMfPFmfEtPz5snsCdly86BLmmpdV1itxQ HyHOZQ+F0kojWQXpP4jT/0Yd2Sw+LbhNUXr7sk= Received: (qmail 30373 invoked by alias); 14 Nov 2019 14:47:24 -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 30327 invoked by uid 89); 14 Nov 2019 14:47:24 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.7 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-qk1-f196.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=iinejSlIt8VuF0soYcV/L+80DhRPCWRE4jMj3imRgUs=; b=JWDEMBdStWjyAQAbGZHxN1fL60RkZt9sLj8uSUfwmvbZvxL1f9UAuQ5v3i+ruvZxTW 50Wl23AoBIKctlSr1TvUqdINFb0BYgW8t1G+u0R7sH/CHvYESihHNNNtGci3DjAfa21D 6MAqZyxyk4PYLr1PcjAsasdqswAEQwIjXO9al9T3bAJZ6Ut1x8oqYwFcszpbswo1MALU SC9ZYFBGb+gD6NDzq3Wai1UAKpr+c+LD5t+k8C07FkFtd+A3WlTe5Jffrvo493QPprZp zSBV+yrYfrM0TjQ6h80tjPerg7dBwRY7jqQMGobA+UlUm9IuHeMuazATG5lVTIrmO3T+ c3hg== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: Alistair Francis , alistair23@gmail.com Subject: [PATCH 7/7] Consolidate wait3 implementations Date: Thu, 14 Nov 2019 11:47:04 -0300 Message-Id: <20191114144704.19002-7-adhemerval.zanella@linaro.org> In-Reply-To: <20191114144704.19002-1-adhemerval.zanella@linaro.org> References: <20191114144704.19002-1-adhemerval.zanella@linaro.org> The generic one calls wait4. Checked on x86_64-linux-gnu. --- posix/wait3.c | 14 +++--------- sysdeps/posix/wait3.c | 39 --------------------------------- sysdeps/unix/bsd/wait3.c | 33 ---------------------------- sysdeps/unix/sysv/linux/wait3.c | 1 - 4 files changed, 3 insertions(+), 84 deletions(-) delete mode 100644 sysdeps/posix/wait3.c delete mode 100644 sysdeps/unix/bsd/wait3.c delete mode 100644 sysdeps/unix/sysv/linux/wait3.c -- 2.17.1 diff --git a/posix/wait3.c b/posix/wait3.c index 6b6e3a500d..f0abf24e31 100644 --- a/posix/wait3.c +++ b/posix/wait3.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991-2019 Free Software Foundation, Inc. +/* Wait for process to change state. + Copyright (C) 1991-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 @@ -15,7 +16,6 @@ License along with the GNU C Library; if not, see . */ -#include #include #include @@ -27,15 +27,7 @@ pid_t __wait3 (int *stat_loc, int options, struct rusage *usage) { - if ((options & ~(WNOHANG|WUNTRACED)) != 0) - { - __set_errno (EINVAL); - return (pid_t) -1; - } - - __set_errno (ENOSYS); - return (pid_t) -1; + return __wait4 (WAIT_ANY, stat_loc, options, usage); } -stub_warning (wait3) weak_alias (__wait3, wait3) diff --git a/sysdeps/posix/wait3.c b/sysdeps/posix/wait3.c deleted file mode 100644 index daba36c6dc..0000000000 --- a/sysdeps/posix/wait3.c +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright (C) 1992-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 -#include -#include -#include - -/* Wait for a child to exit. When one does, put its status in *STAT_LOC and - return its process ID. For errors return (pid_t) -1. If USAGE is not nil, - store information about the child's resource usage (as a `struct rusage') - there. If the WUNTRACED bit is set in OPTIONS, return status for stopped - children; otherwise don't. */ -pid_t -__wait3 (int *stat_loc, int options, struct rusage *usage) -{ - if (usage != NULL) - { - __set_errno (ENOSYS); - return (pid_t) -1; - } - return __waitpid (WAIT_ANY, stat_loc, options); -} - -weak_alias (__wait3, wait3) diff --git a/sysdeps/unix/bsd/wait3.c b/sysdeps/unix/bsd/wait3.c deleted file mode 100644 index d7fa7e4496..0000000000 --- a/sysdeps/unix/bsd/wait3.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright (C) 1991-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 -#include -#include - -/* Wait for a child to exit. When one does, put its status in *STAT_LOC and - return its process ID. For errors return (pid_t) -1. If USAGE is not nil, - store information about the child's resource usage (as a `struct rusage') - there. If the WUNTRACED bit is set in OPTIONS, return status for stopped - children; otherwise don't. */ -pid_t -__wait3 (int *stat_loc, int options, struct rusage *usage) -{ - return __wait4 (WAIT_ANY, stat_loc, options, usage); -} - -weak_alias (__wait3, wait3) diff --git a/sysdeps/unix/sysv/linux/wait3.c b/sysdeps/unix/sysv/linux/wait3.c deleted file mode 100644 index 2ff027f0e1..0000000000 --- a/sysdeps/unix/sysv/linux/wait3.c +++ /dev/null @@ -1 +0,0 @@ -#include