You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
50 lines
1.6 KiB
50 lines
1.6 KiB
1 month ago
|
commit e828914cf9f2fc2caa5bced0fc6a03cb78324979
|
||
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
||
|
|
Date: Tue Apr 23 21:16:32 2024 +0200
|
||
|
|
|
||
|
|
nptl: Fix tst-cancel30 on kernels without ppoll_time64 support
|
||
|
|
|
||
|
|
Fall back to ppoll if ppoll_time64 fails with ENOSYS.
|
||
|
|
Fixes commit 370da8a121c3ba9eeb2f13da15fc0f21f4136b25 ("nptl: Fix
|
||
|
|
tst-cancel30 on sparc64").
|
||
|
|
|
||
|
|
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
||
|
|
(cherry picked from commit f4724843ada64a51d66f65d3199fe431f9d4c254)
|
||
|
|
|
||
|
|
diff --git a/sysdeps/pthread/tst-cancel30.c b/sysdeps/pthread/tst-cancel30.c
|
||
|
|
index 3030660e5fd93e2c..94ad6281bcf080f4 100644
|
||
|
|
--- a/sysdeps/pthread/tst-cancel30.c
|
||
|
|
+++ b/sysdeps/pthread/tst-cancel30.c
|
||
|
|
@@ -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;
|