From patchwork Mon Oct 16 04:34:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 23596 Received: (qmail 72350 invoked by alias); 16 Oct 2017 04:34:49 -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 72246 invoked by uid 89); 16 Oct 2017 04:34:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=3026, 3019 X-HELO: NAM02-CY1-obe.outbound.protection.outlook.com Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Yuri.Norov@cavium.com; From: Yury Norov To: libc-alpha@sourceware.org Cc: Yury Norov Subject: [PATCH 1/3] Remove useless #ifdefs from sysdeps/unix/sysv/linux/sigprocmask.c Date: Mon, 16 Oct 2017 07:34:05 +0300 Message-Id: <20171016043407.1142-2-ynorov@caviumnetworks.com> In-Reply-To: <20171016043407.1142-1-ynorov@caviumnetworks.com> References: <20171016043407.1142-1-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-ClientProxiedBy: DB6PR07CA0186.eurprd07.prod.outlook.com (2603:10a6:6:42::16) To MWHPR0701MB3833.namprd07.prod.outlook.com (2603:10b6:301:7f::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7976355e-4a81-4c30-5b89-08d5144f39a7 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:MWHPR0701MB3833; X-Microsoft-Exchange-Diagnostics: 1; MWHPR0701MB3833; 3:uAWhKcAAa9qdcJ9cJTuEgeMf4mG1GvkHTZ7yd2KEz14oXsHDxHYYkYSKUPhnZ3WSxaB8D4Hfucr93XPqaI94ivd7sFi/Jfv5RDZfReN+oSZD/RPnEPqbqvvC7t+hu0F0N6cIHEe9hqCuFkllv9klOPWAFQF29jaPrAnAwU4mZ7qDwxMhgPWuty9+sLEcY+uUU3QQ0VRjFO/uggWbsvQcbv9Nxzkfi0JZD0qYTZEBH2/LB92oDYbvzBcb1ah7sI82; 25:Noqs6d3f7SO0ORI69Fs2ikrSDpesEQGdJpeYZ5QdzZylKut3sB6ejmPOLwJ3n90er7RoyIAbX6dDMHH7CxdnnA5ePcL1uE8YZIGfwPY3bM5lGETIuV4JFUId9zjbQq0KUTH1CkRdkqHwtcEnGi3AuDKT+80zbc2WjO3u7vdtG4ihO1xfkCCuKxBi/paguEJiSaoROJzXvAnP+ma4LsHKElPNSOQNb4SzsgwAg/SS89RMu+y7eUtR16rdHAX42lE8fvMNlEtFp2I3KnY4BBX5OzcfgVrLicOBVZeh11ta3wXZRuh77TVznujaRIS4O/tgfct1wLci2ctrGufE/SS/0g==; 31:dn2ikY/9JhHdRMURtFQZ07Novz9px/PnEJ6sb3BZvLy50Zic2/sqLfMc1+FgVkAeCPGL9kitvbfRzHaTA6+TDS6SiTswcF3KdwdpPw6zBlRaof0ANrwXYNtF+tX3yxsgOfIjrpSKcmw4m3B+UBTT1onDZmgehFKhtqFE2DhlavcR6XvwRZXs6cPcBNSWOM1bPXjpk/tGVOICn0UfTJoRvENBZsE13sVgGIlP/Wb/f8w= X-MS-TrafficTypeDiagnostic: MWHPR0701MB3833: X-Microsoft-Exchange-Diagnostics: 1; MWHPR0701MB3833; 20:QcAK7rJhXNEj5IAHqMZxN21EirQjdB7WBHE14Bfq5R+urhUJT9NRuTQDoXfQwwStfuB4pDUue9QqQc//G1MO9mwrWKr+gY0niOKczEaLgE/RO/7LyJDvnzW3+ZoQiHHjhfz/7QeUe+JELjO4hVKiLANiCHy3xXfWPT0xPzMPEHzq2BQFG0C0vj77YBSJSia2RYys2rwKeclFyNHVRwrQYFJFUzNq37KVfYeQ+ktX0N8CI4JDbsgQvJkSwd5to4E9XwZMn9wQI2K/E/su38vBYJUAzHtO4Bns2DCR54aWyrVFu1Zh8BLOgD1VeUoX36CRbcU+gI3c54WzMe3YRFPEMz89N3N+XPOaydNSZGEFtfWFekZb2qxKNtjwrtigWN4YwuszXe5L75dCQKGgZsYzVHba3nBrBX7Pijl2qD6fuH/fJmoHf9cikOuKexl6pnVMwRR28RnxJCxc2v2qKD70nvyReuH8phnJHKHkz5a8FsTMhgF8GgXUtv0LV6LE43jBw+ZuaTVgQpOZRUblSAwT0pvuqLdLU/NyuJcJ7U/AdsbuGM1E1GGrByVmows76MrdNg8pZiM06qfz741Ux4+lxeNoyuKIXlipC4C1x3Gja/s=; 4:pH6yY/9ZA12V672vY1mIJvyew4SXorUwsgIIWrXqD90Kmy0aJX2OZa1LaS+r9lyq3H3m/0UbsXNNBiqif3fSE+0SpBJvIJP+XWLV6ojgsDePCTXFECcu+GSQLh34Jus7kTV3uNn2aNk1P6WDSVz+b4Q41hS+noJ27sIh3AEjDgxCVjXtz0272QesoS0m2RpsyBqbXYf6OpEqIBXrcwhNRpe3fndFC7P/OfD7le49T5rJ736ZGAVi1WRKOe9Iuwt2 X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(10201501046)(3002001)(93006095)(6041248)(20161123558100)(20161123562025)(20161123564025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR0701MB3833; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR0701MB3833; X-Forefront-PRVS: 0462918D61 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(6009001)(346002)(376002)(189002)(199003)(105586002)(106356001)(72206003)(478600001)(50986999)(76506005)(1076002)(6116002)(3846002)(101416001)(8936002)(76176999)(50226002)(6496005)(6486002)(4326008)(47776003)(66066001)(42882006)(6666003)(189998001)(5003940100001)(107886003)(6916009)(2950100002)(68736007)(53936002)(33646002)(2361001)(2351001)(25786009)(5660300001)(575784001)(97736004)(16586007)(50466002)(8676002)(48376002)(36756003)(2906002)(16526018)(316002)(81156014)(81166006)(305945005)(7736002); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR0701MB3833; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR0701MB3833; 23:MOGLkTIhGLrCVzv3+Tkk8OY4UBO9Z8UWKnPkzl8?= =?us-ascii?Q?YmULGX5LpEzIHwiFoxEFZacs97kQt3INKLtu2pCpIXQerdhXcnEH6rrBEcTC?= =?us-ascii?Q?XgIzw8HyvP4IV8jLiqRYe7u/63qydn63GLc/9bUyOXY9vkcY/wzq6VBy7DWu?= =?us-ascii?Q?DQAvSvdbtV34jY9lgJzCBSXqCovYYSLovviR6dvXNw+W4elEkqEPQqGgXqPr?= =?us-ascii?Q?P0q/4e62Pk9On1Vmmqekf3qtSSmglHT5+ofLYZPmSpL45zevTg/oitfhccAJ?= =?us-ascii?Q?YKcMxWo2tNx22HYmfR5olUCfNqQ/jZ90wMSL1tszMkDCRBCc4FZkopL+GBQo?= =?us-ascii?Q?mdDbiA451n44iKeQDzOExjDJOGg/kw/L89U9jj1CYWz2l9aG8XHIFvHkq6Ad?= =?us-ascii?Q?rw6IEm+i/h07kOgtz/CzNGN05xb9QSljYD/7VlG3lYkKlHHfdNKR2n83/4ws?= =?us-ascii?Q?GHVry9H38IaO//GDms7gER12WzIpsRTs9tufgAOqOfEmaa9OjMjesJs0Aj5E?= =?us-ascii?Q?bQ1Dfq9TP17nOHuca75Crunmvif6UxchD8NcfJ/Q2eQMWDS6sV9lrWu9dbNJ?= =?us-ascii?Q?yC/aQhIRtctyO0pKhaeDD4wn/earba9u485qGByoNnpVoHPBFkgJgm728GCK?= =?us-ascii?Q?s1N2PYNTNG0A2XUVpGLR1VH+oz7cIHzQ74396Iv9NBTidkYOw6FV0ylwVl/h?= =?us-ascii?Q?YZJiCIpUfu7F7WLbyo8Hw1YY/yXdzupFWlodyIYTobY2E4jzm8ydbeFPEU+G?= =?us-ascii?Q?0VT3irufg7IpcaZhFtol0BU+gQayP7xh1Be/lBbQlxUToF25rw3QmiInqKoV?= =?us-ascii?Q?lSh9xBx9HgMSyKx/c7JgUil/abYUbtR9I4aD0LlXhix+3TB30DBIlw5bfw0z?= =?us-ascii?Q?oGmhErq+TJBovQ5+XZ8bZGVNWBz8+N7fx13ZYbFabonqH73ABRw+H9sYmLR2?= =?us-ascii?Q?DelU7BgD4+d4PXkimcEKIuVUZQC2jsjmvrdAWiTeCW7We1+ryDbdKOm9Ym7M?= =?us-ascii?Q?XVDq3kHFoC5heiq3IQ/xwbuC7HQ05Kut3k14pOu7qp+fuMeLAJrqijEWMkM+?= =?us-ascii?Q?NVcvD9ZPuYm8LqmQ1Yuc4+1GDDLrLQpwPAbYismmgp8tlvgZpTy9ykFPuW5L?= =?us-ascii?Q?zQVDBs5KVOIQK1veBYNdZWV7ibUsL8SkpwZZp6Gl3ritOW3hllVhyYFvtjB2?= =?us-ascii?Q?6/dK80vWjTcdCYglhXDtbTKTms3PVMxndKTSC?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR0701MB3833; 6:zOZUjwWb3ArD7t6/Gxu4fiKOkDetybigfObhO4Hrodsve7lw4pa2rqLVF4QbcU/AZtyhEFyGB4z2vPCSNXMnyLFPcZRN82HuA0sUGJVdgkDOT4npXk416uAgnpUFEC3gMWczQDdbqLjeiTmqWmuMzPuQ/cdarmxUfYzDUFKGpbm7xcZATCctG51cvOdd1cZLn9720FANwsHUwaQ8xgYw31H6D47rpjqQtCOGql/CM1ONAcvIck3gJKfkdNwmpShG244N5D4ogaGWzOfHESHVbq03bA3uPnKJx3zrn8hAw1F8ehIoK7ECUrgfbGL5V555a1uKhB5fWTUed52xw8xMAA==; 5:aCAjGzZLrO4VtD20IMUQlvg/6/yRCafoHdZqrqaqsoNdvM9leloMoBQo4N4N5o1AjtiOTXj6SOSojn9G7i8j88ectsom5MqQmJBAebBjl1bsvq0OLcMXxxU3ApCXV/SLHgzLvVriq+4MGgwGpnT7M23lLref4rHQSSGMOS4MvnY=; 24:Gkz0dDO3/9mffT/c2frqnOufIFgrgMPYPRONs3o+tomAslus41zpr7R8IIHkKqDUzGIQbfDJzqSYN294njud1gYdVymQJ+FIGlwqDxTuQPU=; 7:CiH2lFd6Wyh06OhCLFa3RjJ6Se7ejU7vFPqZGD2kXld3DtJzWrCmjU68iQdwEK5TYxjtmCWB8V5eHuBMq96uBqD7EPKp8yzXaqXW8zFSvdsIJhHXwc5X3D3nQiHybbtXEQ788iY/A1uxEwYMvk0VVE0t8NtMslXSxVpAP+Z3JRY1Nq2jPMqDHIv0cjZgxChEjkD4nzPrhx9wMY6WOffhyf/hNR+8nwHOoY0OzhX68i8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2017 04:34:43.9253 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR0701MB3833 The sysdeps/unix/sysv/linux/sigprocmask.c includes nptl-signals.h via nptl/pthreadP.h, and so SIGCANCEL and SIGSETXID become defined unconditionally. But later in the code, there are some checks weither symbols defined, which is useless. This patch removes useless checks. * sysdeps/unix/sysv/linux/sigprocmask.c: Remove useless #ifdefs --- sysdeps/unix/sysv/linux/sigprocmask.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/sysdeps/unix/sysv/linux/sigprocmask.c b/sysdeps/unix/sysv/linux/sigprocmask.c index d0b8e049b2..e776563336 100644 --- a/sysdeps/unix/sysv/linux/sigprocmask.c +++ b/sysdeps/unix/sysv/linux/sigprocmask.c @@ -30,26 +30,19 @@ int __sigprocmask (int how, const sigset_t *set, sigset_t *oset) { -#ifdef SIGCANCEL sigset_t local_newmask; /* 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) -# ifdef SIGSETXID - || __builtin_expect (__sigismember (set, SIGSETXID), 0) -# endif - )) + || __builtin_expect (__sigismember (set, SIGSETXID), 0))) { local_newmask = *set; __sigdelset (&local_newmask, SIGCANCEL); -# ifdef SIGSETXID __sigdelset (&local_newmask, SIGSETXID); -# endif set = &local_newmask; } -#endif return INLINE_SYSCALL (rt_sigprocmask, 4, how, set, oset, _NSIG / 8); }