From patchwork Fri Dec 27 14:56: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: 182485 Delivered-To: patch@linaro.org Received: by 2002:a92:815a:0:0:0:0:0 with SMTP id e87csp3066419ild; Fri, 27 Dec 2019 06:56:30 -0800 (PST) X-Google-Smtp-Source: APXvYqxGBZdN6LKiYvSZpG6evikkMWcQpCNY9cjCUy69XKO+6DfjtVXXk+pGQkF0ToR70WThOtYs X-Received: by 2002:a9d:2dca:: with SMTP id g68mr52573719otb.150.1577458590274; Fri, 27 Dec 2019 06:56:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577458590; cv=none; d=google.com; s=arc-20160816; b=nss6Bbef6eCVbtHGzZWCb3Q2ObjgAPL7z18BbI/Q0pBBY3Xnsmd/dURiyofcYVnJZd Fd2xHvq+SY6eDVL8tAydwbZPnyQZEGrjCiu31VVtz0nA1lz5T04WhNc9yLJENfJ7m8ek 0vPdx+JC5IAXOaECgGpc8iM98ldj3BjRrdPraIZ4fEoHLiHuPnNr1mH/wj7VPXdXEz39 aaWa79+HXXY7Bl7Y0doavMKRsbIX14ElSxP7jfoTrzp9afWpmDyjCSWo6YKg9xVV2ZLV Sj7n7ATedZTiOLcAVsR+ajfQfMfSt4mLC4NBK1h0i91fiWMRUSmwUW3fVyUptnCByR1N CCPw== 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: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=plT90yHYMq9KJhSKgfBtVdIcr2ScTS8n0bGEHINWPbA=; b=L12wRikpqZzD1L+bdbOowMpdAffk3J9vnCuQhtximkzk7ujWqsY/AQaYLSjWsyMQ1S mKAhiAKqk4YLYW3XIwARI9egDQkKtwFnXtQIbCB7o4s7qkNtTyVYSddMYH0Lm2RJkSTX V1lDitBL/G0i+0qu4h/J1sou1CF9jHfB2xBRQj+JriNPIhrRboV2aJ0a8URaP/RuGxxq zF8u0KyuViLn01rr0ddVuarXhnT4iVYfNQpVPjAuyj+2RX3Jkrl3/LieBjALoklKqPNI 6G9QlSO44/NLH7Bbf/tl3iAbQSP9XgAwXYWZ7UJh+J/2gPXc/ga1XJtbwzeyOWtYPTn7 dJ9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Su4yxNi5; dkim=pass header.i=@linaro.org header.s=google header.b=BBZls+LN; spf=pass (google.com: domain of libc-alpha-return-108333-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-108333-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 g93si18501574otg.231.2019.12.27.06.56.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Dec 2019 06:56:30 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-108333-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=Su4yxNi5; dkim=pass header.i=@linaro.org header.s=google header.b=BBZls+LN; spf=pass (google.com: domain of libc-alpha-return-108333-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-108333-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=K8Oc4b27iaOqk3HZ5wPg4MqcPFZ8OI0 PbDRnFgCGrd+LoaWAn+J4JsCysq/lQI1ZizIUHXrrL1TWdoV5BCvFO7LArC/guFk LQwYMfwPAXMF7v8MEv/uCSses2WdNy4SLdKN3m1mvOnn5m21ZIE7HVc31l2dNB8G GW69DYukVcbc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=Vi8sGO3gUYsVqWi9ZRsGn10mTIQ=; b=Su4yx Ni51u6/Xms4BBMAg4DfAVakkuDwVPoQm5+R7TbbHsjkODhwxjJIHL/o3Gb1AVC3z Pe5DHdAuwS19rB6A2S12wzlvQW4iIbTTdwuq5IaGE4WaJ3W0xRuInjiGMmuIZ0zx BjkwuPavBL6OR+UM1oFlDhV4M5b6rX4CG96sGE= Received: (qmail 99609 invoked by alias); 27 Dec 2019 14:56:16 -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 99510 invoked by uid 89); 27 Dec 2019 14:56:16 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=Needed, April, april, 1999 X-HELO: mail-pf1-f178.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=plT90yHYMq9KJhSKgfBtVdIcr2ScTS8n0bGEHINWPbA=; b=BBZls+LNwPPtAAWlQzh312Bd/tWAfc+LhNdtXxSHssyFODQqhqbmjLr3VpXr1ORXo+ SaRe+aMEvFIK+tA4ZhYqeLA62WtdBVBzXeho5xeJM0U3CxtxFWKGfM+Rur1wkIx2QeqQ yzX85kY0lUf4Y5HcNJH/3aseGyiL+Jscy2dwlSut5AjsRGgaB2LeVdGNlWRA6lBOMYJA daQ2eht64ovdhNuDfPPoAsAxWhKcoEdaCe3B+gBSLqIBAfaFCqmIw4ulsodH0jg1YtEf USw3kKmMMisLUrnGZ3IBqr6Pr4TdCkBQLcCGQLcZkhitK5fIsp3yY6Z4HkYkfjg4jnGY 7bOA== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [COMMITTED] linux: Consolidate sigprocmask Date: Fri, 27 Dec 2019 11:56:01 -0300 Message-Id: <20191227145601.12404-2-adhemerval.zanella@linaro.org> In-Reply-To: <20191227145601.12404-1-adhemerval.zanella@linaro.org> References: <20191227145601.12404-1-adhemerval.zanella@linaro.org> All architectures now uses the Linux generic implementation which uses __NR_rt_sigprocmask. Checked on x86_64-linux-gnu, sparc64-linux-gnu, ia64-linux-gnu, s390x-linux-gnu, and alpha-linux-gnu. --- sysdeps/unix/sysv/linux/alpha/sigprocmask.c | 58 ------------------- sysdeps/unix/sysv/linux/ia64/sigprocmask.c | 40 ------------- .../sysv/linux/s390/s390-64/sigprocmask.c | 38 ------------ sysdeps/unix/sysv/linux/sigprocmask.c | 14 +---- .../sysv/linux/sparc/sparc64/sigprocmask.c | 34 ----------- sysdeps/unix/sysv/linux/x86_64/sigprocmask.c | 39 ------------- 6 files changed, 3 insertions(+), 220 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/alpha/sigprocmask.c delete mode 100644 sysdeps/unix/sysv/linux/ia64/sigprocmask.c delete mode 100644 sysdeps/unix/sysv/linux/s390/s390-64/sigprocmask.c delete mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/sigprocmask.c delete mode 100644 sysdeps/unix/sysv/linux/x86_64/sigprocmask.c -- 2.17.1 diff --git a/sysdeps/unix/sysv/linux/alpha/sigprocmask.c b/sysdeps/unix/sysv/linux/alpha/sigprocmask.c deleted file mode 100644 index 0e807179bf..0000000000 --- a/sysdeps/unix/sysv/linux/alpha/sigprocmask.c +++ /dev/null @@ -1,58 +0,0 @@ -/* Copyright (C) 1993-2019 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by David Mosberger (davidm@azstarnet.com). - - 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 - -/* When there is kernel support for more than 64 signals, we'll have to - switch to a new system call convention here. */ - -int -__sigprocmask (int how, const sigset_t *set, sigset_t *oset) -{ - unsigned long int setval; - long result; - - if (set) - setval = set->__val[0]; - else - { - setval = 0; - how = SIG_BLOCK; /* ensure blocked mask doesn't get changed */ - } - - result = INLINE_SYSCALL (osf_sigprocmask, 2, how, setval); - if (result == -1) - /* If there are ever more than 63 signals, we need to recode this - in assembler since we wouldn't be able to distinguish a mask of - all 1s from -1, but for now, we're doing just fine... */ - return result; - - if (oset) - { - oset->__val[0] = result; - result = _SIGSET_NWORDS; - while (--result > 0) - oset->__val[result] = 0; - } - return 0; -} - -libc_hidden_def (__sigprocmask) -weak_alias (__sigprocmask, sigprocmask); diff --git a/sysdeps/unix/sysv/linux/ia64/sigprocmask.c b/sysdeps/unix/sysv/linux/ia64/sigprocmask.c deleted file mode 100644 index 81c2d3cd8e..0000000000 --- a/sysdeps/unix/sysv/linux/ia64/sigprocmask.c +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright (C) 1997-2019 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Linux/IA64 specific sigprocmask - Written by Jes Sorensen, , April 1999. - - 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 - . */ - -/* Linux/ia64 only has rt signals, thus we do not even want to try falling - back to the old style signals as the default Linux handler does. */ - -#include -#include -#include - -#include -#include - -/* Get and/or change the set of blocked signals. */ -int -__sigprocmask (int how, const sigset_t *set, sigset_t *oset) -{ - - /* XXX The size argument hopefully will have to be changed to the - real size of the user-level sigset_t. */ - return INLINE_SYSCALL (rt_sigprocmask, 4, how, set, oset, _NSIG / 8); -} -libc_hidden_def (__sigprocmask) -weak_alias (__sigprocmask, sigprocmask) diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sigprocmask.c b/sysdeps/unix/sysv/linux/s390/s390-64/sigprocmask.c deleted file mode 100644 index f0eb099748..0000000000 --- a/sysdeps/unix/sysv/linux/s390/s390-64/sigprocmask.c +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (C) 2001-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 - . */ - -/* 64 bit Linux for S/390 only has rt signals, thus we do not even want to try - falling back to the old style signals as the default Linux handler does. */ - -#include -#include -#include - -#include -#include - -/* Get and/or change the set of blocked signals. */ -int -__sigprocmask (int how, const sigset_t *set, sigset_t *oset) -{ - - /* XXX The size argument hopefully will have to be changed to the - real size of the user-level sigset_t. */ - return INLINE_SYSCALL (rt_sigprocmask, 4, how, set, oset, _NSIG / 8); -} -libc_hidden_def (__sigprocmask) -weak_alias (__sigprocmask, sigprocmask) diff --git a/sysdeps/unix/sysv/linux/sigprocmask.c b/sysdeps/unix/sysv/linux/sigprocmask.c index 01521c8107..73b0d0c19a 100644 --- a/sysdeps/unix/sysv/linux/sigprocmask.c +++ b/sysdeps/unix/sysv/linux/sigprocmask.c @@ -15,17 +15,9 @@ License along with the GNU C Library; if not, see . */ -#include #include -#include /* Needed for string function builtin redirection. */ -#include - -#include -#include - #include /* SIGCANCEL, SIGSETXID */ - /* Get and/or change the set of blocked signals. */ int __sigprocmask (int how, const sigset_t *set, sigset_t *oset) @@ -35,8 +27,8 @@ __sigprocmask (int how, const sigset_t *set, sigset_t *oset) /* The only thing we have to make sure here is that SIGCANCEL and SIGSETXID are not blocked. */ if (set != NULL - && (__builtin_expect (__sigismember (set, SIGCANCEL), 0) - || __builtin_expect (__sigismember (set, SIGSETXID), 0))) + && __glibc_unlikely (__sigismember (set, SIGCANCEL) + || __glibc_unlikely (__sigismember (set, SIGSETXID)))) { local_newmask = *set; __sigdelset (&local_newmask, SIGCANCEL); @@ -44,7 +36,7 @@ __sigprocmask (int how, const sigset_t *set, sigset_t *oset) set = &local_newmask; } - return INLINE_SYSCALL (rt_sigprocmask, 4, how, set, oset, _NSIG / 8); + return INLINE_SYSCALL_CALL (rt_sigprocmask, how, set, oset, _NSIG / 8); } libc_hidden_def (__sigprocmask) weak_alias (__sigprocmask, sigprocmask) diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/sigprocmask.c b/sysdeps/unix/sysv/linux/sparc/sparc64/sigprocmask.c deleted file mode 100644 index 5823826ab2..0000000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/sigprocmask.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (C) 1997-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 - -/* Get and/or change the set of blocked signals. */ -int -__sigprocmask (int how, const sigset_t *set, sigset_t *oset) -{ - /* XXX The size argument hopefully will have to be changed to the - real size of the user-level sigset_t. */ - return INLINE_SYSCALL (rt_sigprocmask, 4, how, set, oset, _NSIG / 8); -} -libc_hidden_def (__sigprocmask) -weak_alias (__sigprocmask, sigprocmask) diff --git a/sysdeps/unix/sysv/linux/x86_64/sigprocmask.c b/sysdeps/unix/sysv/linux/x86_64/sigprocmask.c deleted file mode 100644 index c2e721d7b9..0000000000 --- a/sysdeps/unix/sysv/linux/x86_64/sigprocmask.c +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright (C) 1997-2019 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Written by Jes Sorensen, , April 1999. - - 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 - . */ - -/* Linux/x86_64 only has rt signals, thus we do not even want to try falling - back to the old style signals as the default Linux handler does. */ - -#include -#include -#include - -#include -#include - -/* Get and/or change the set of blocked signals. */ -int -__sigprocmask (int how, const sigset_t *set, sigset_t *oset) -{ - - /* XXX The size argument hopefully will have to be changed to the - real size of the user-level sigset_t. */ - return INLINE_SYSCALL (rt_sigprocmask, 4, how, set, oset, _NSIG / 8); -} -libc_hidden_def (__sigprocmask) -weak_alias (__sigprocmask, sigprocmask)