linux: pselect: Remove CALL_PSELECT6 macro

Message ID 20191105134953.26231-1-lukma@denx.de
State Superseded
Headers show
Series
  • linux: pselect: Remove CALL_PSELECT6 macro
Related show

Commit Message

Lukasz Majewski Nov. 5, 2019, 1:49 p.m.
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(-)

-- 
2.20.1

Comments

Florian Weimer Nov. 5, 2019, 1:57 p.m. | #1
* Lukasz Majewski:

> 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).


Typo: "pselec6"

> 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.


I would just say that nothing defines CALL_PSELECT6 in the current tree.
That's enough reason to remove it.

Thanks,
Florian

Patch

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)