mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-08 14:20:07 +00:00
nptl: Fix tst-cancel30 on kernels without ppoll_time64 support
Fall back to ppoll if ppoll_time64 fails with ENOSYS.
Fixes commit 370da8a121
("nptl: Fix
tst-cancel30 on sparc64").
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
This commit is contained in:
parent
16c8dfba14
commit
f4724843ad
@ -18,6 +18,7 @@
|
||||
License along with the GNU C Library; if not, see
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <errno.h>
|
||||
#include <support/check.h>
|
||||
#include <support/xstdio.h>
|
||||
#include <support/xthread.h>
|
||||
@ -46,13 +47,19 @@ tf (void *arg)
|
||||
|
||||
/* Wait indefinitely for cancellation, which only works if asynchronous
|
||||
cancellation is enabled. */
|
||||
#if defined SYS_ppoll || defined SYS_ppoll_time64
|
||||
# ifndef SYS_ppoll_time64
|
||||
# define SYS_ppoll_time64 SYS_ppoll
|
||||
#ifdef SYS_ppoll_time64
|
||||
long int ret = syscall (SYS_ppoll_time64, NULL, 0, NULL, NULL);
|
||||
(void) ret;
|
||||
# ifdef SYS_ppoll
|
||||
if (ret == -1 && errno == ENOSYS)
|
||||
syscall (SYS_ppoll, NULL, 0, NULL, NULL);
|
||||
# endif
|
||||
syscall (SYS_ppoll_time64, NULL, 0, NULL, NULL);
|
||||
#else
|
||||
# ifdef SYS_ppoll
|
||||
syscall (SYS_ppoll, NULL, 0, NULL, NULL);
|
||||
# else
|
||||
for (;;);
|
||||
# endif
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user