From patchwork Tue Nov 5 13:49:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 1189710 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-106642-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="B1CZ2uC8"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 476rdn69PNz9s4Y for ; Wed, 6 Nov 2019 00:50:21 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; q=dns; s=default; b=vFn vh05jv59yFpit83OFlNyzbyRQxh3Pu5rqNxXko2QFuGnfDcQzRGKPOg4XPdZtR41 4HHs15409QX7/o1gEt+Gve9BvhScKXFKE+Ca/IcQylQsDd5AVqTvOe848roXyTeh rqUTW7b13iUSreNzjRBzSZ7r3Iw7X3+N+0RJ8Ots= 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 :mime-version:content-transfer-encoding; s=default; bh=1SwxXeT5Z Pbpgsd4IHH+9viS4o4=; b=B1CZ2uC8AJMHFxKbQ9yr4vv7hqBMSHx+or4iWYYmJ Ho1mo+G+yGwXZc7tHdglCjIQJF8iOFAbYIbOugdx2Fg8OxYwymKZedgQRkUKEOxL FumUqVXauCEy2oCYd0m0+GCUqX+GGnjXPoAPXxMZJKLjWfUZQx99VkGUQOgfwGIf BI= Received: (qmail 48236 invoked by alias); 5 Nov 2019 13:50:15 -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 48228 invoked by uid 89); 5 Nov 2019 13:50:15 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 spammy=HX-Languages-Length:1478, HContent-Transfer-Encoding:8bit X-HELO: mail-out.m-online.net From: Lukasz Majewski To: Joseph Myers , Paul Eggert Cc: Alistair Francis , Alistair Francis , GNU C Library , Adhemerval Zanella , Florian Weimer , Florian Weimer , Zack Weinberg , Carlos O'Donell , Lukasz Majewski Subject: [PATCH] linux: pselect: Remove CALL_PSELECT6 macro Date: Tue, 5 Nov 2019 14:49:52 +0100 Message-Id: <20191105134953.26231-1-lukma@denx.de> MIME-Version: 1.0 The CALL_PSELECT6 is now only defined in the sysdeps/unix/sysv/linux/pselect.c file and was introduced to allow i386 specific assembler implementation of pselec6 (with 6 arguments). As the i386 now supports pselect6 syscall and the assembler implementation (in the sysdeps/unix/sysv/linux/i386/call_pselect6.S) has already been removed it is safe to remove this macro define. Tested with: - make PARALLELMFLAGS="-j8" && make xcheck PARALLELMFLAGS="-j8" (x86_64) - scripts/build-many-glibcs.py --- sysdeps/unix/sysv/linux/pselect.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/sysdeps/unix/sysv/linux/pselect.c b/sysdeps/unix/sysv/linux/pselect.c index d07d64114d..acda3e0cdd 100644 --- a/sysdeps/unix/sysv/linux/pselect.c +++ b/sysdeps/unix/sysv/linux/pselect.c @@ -59,15 +59,8 @@ __pselect (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, data.ss = (__syscall_ulong_t) (uintptr_t) sigmask; data.ss_len = _NSIG / 8; - int result; - -#ifndef CALL_PSELECT6 -# define CALL_PSELECT6(nfds, readfds, writefds, exceptfds, timeout, data) \ - SYSCALL_CANCEL (pselect6, nfds, readfds, writefds, exceptfds, timeout, data) -#endif - - result = CALL_PSELECT6 (nfds, readfds, writefds, exceptfds, timeout, - &data); + int result = SYSCALL_CANCEL (pselect6, nfds, readfds, writefds, exceptfds, + timeout, &data); # ifndef __ASSUME_PSELECT if (result == -1 && errno == ENOSYS)