Clean up nptl/tst-join5 use of nanosleep.

diff --git a/ChangeLog b/ChangeLog
index 94a3907a27250ffdab08b465e74351fecac8a2e4..c28f7e542ed15ddd5d34a62c2f8702a9ffdc43c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2015-02-06  Roland McGrath  <roland@hack.frob.com>
 
+       * nptl/tst-join5.c: Drop #include <sys/syscall.h>.
+       (wait_code): New function replaces macro.
+       Call nanosleep rather than syscall.
+
        * nptl/pt-system.c: Rewritten.  Put everything under
        [SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22)].
        Use IFUNC to redirect when possible.

diff --git a/nptl/tst-join5.c b/nptl/tst-join5.c
index e83f8958c00f6f3ab5d4db3c55d5ed022edfc97e..b45d2106298beefda5816651ed4b4c2d45da324f 100644 (file)
--- a/nptl/tst-join5.c
+++ b/nptl/tst-join5.c
@@ -22,15 +22,15 @@
 #include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
-#include <sys/syscall.h>
 
 
-#define wait_code()                                                          \
-  do {                                                                       \
-    struct timespec ts = { .tv_sec = 0, .tv_nsec = 200000000 };                      \
-    while (syscall (__NR_nanosleep, &ts, &ts) < 0)                           \
-      /* nothing */;                                                         \
-  } while (0)
+static void
+wait_code (void)
+{
+  struct timespec ts = { .tv_sec = 0, .tv_nsec = 200000000 };
+  while (nanosleep (&ts, &ts) < 0)
+    ;
+}
 
 
 #ifdef WAIT_IN_CHILD