This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] linux: pselect: Remove CALL_PSELECT6 macro
- From: Lukasz Majewski <lukma at denx dot de>
- To: Joseph Myers <joseph at codesourcery dot com>, Paul Eggert <eggert at cs dot ucla dot edu>
- Cc: Alistair Francis <alistair23 at gmail dot com>, Alistair Francis <alistair dot francis at wdc dot com>, GNU C Library <libc-alpha at sourceware dot org>, Adhemerval Zanella <adhemerval dot zanella at linaro dot org>, Florian Weimer <fweimer at redhat dot com>, Florian Weimer <fw at deneb dot enyo dot de>, Zack Weinberg <zackw at panix dot com>, Carlos O'Donell <carlos at redhat dot com>, Lukasz Majewski <lukma at denx dot de>
- Date: Tue, 5 Nov 2019 14:49:52 +0100
- Subject: [PATCH] linux: pselect: Remove CALL_PSELECT6 macro
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)
--
2.20.1