fix double-processing of DT_RELR relocations in ldso relocating itself

[musl] / src / select / poll.c

diff --git a/src/select/poll.c b/src/select/poll.c
index e92943e..c84c8a9 100644 (file)
--- a/src/select/poll.c
+++ b/src/select/poll.c
@@ -1,12 +1,15 @@
 #include <poll.h>
+#include <time.h>
+#include <signal.h>
 #include "syscall.h"
-#include "libc.h"
 
 int poll(struct pollfd *fds, nfds_t n, int timeout)
 {
-       int r;
-       CANCELPT_BEGIN;
-       r = syscall3(__NR_poll, (long)fds, n, timeout);
-       CANCELPT_END;
-       return r;
+#ifdef SYS_poll
+       return syscall_cp(SYS_poll, fds, n, timeout);
+#else
+       return syscall_cp(SYS_ppoll, fds, n, timeout>=0 ?
+               &((struct timespec){ .tv_sec = timeout/1000,
+               .tv_nsec = timeout%1000*1000000 }) : 0, 0, _NSIG/8);
+#endif
 }