Fix __waitpid_nocancel link error.

diff --git a/ChangeLog b/ChangeLog
index 6e913efa87c3c00d11abeea2d7bf988ec4171eb4..13118b41d3927a9669b76d82002beee93e571252 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-16  Roland McGrath  <roland@hack.frob.com>
+
+       * sysdeps/unix/sysv/linux/not-cancel.h (waitpid_not_cancel):
+       Use wait4 regardless of [__NR_waitpid].
+
 2014-05-16  Maciej W. Rozycki  <macro@codesourcery.com>
 
        PR libgcc/60166

diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h
index bc17107239d27b80a6aae4898a2bf0f8069a6515..14f5e8bd8b9c3a84f6cb3d7950a7be1d8e04fbbe 100644 (file)
--- a/sysdeps/unix/sysv/linux/not-cancel.h
+++ b/sysdeps/unix/sysv/linux/not-cancel.h
@@ -83,13 +83,8 @@ extern int __openat64_nocancel (int fd, const char *fname, int oflag,
   __fcntl_nocancel (fd, cmd, val)
 
 /* Uncancelable waitpid.  */
-#ifdef __NR_waitpid
-# define waitpid_not_cancel(pid, stat_loc, options) \
-  __waitpid_nocancel (pid, stat_loc, options)
-#else
-# define waitpid_not_cancel(pid, stat_loc, options) \
+#define waitpid_not_cancel(pid, stat_loc, options) \
   INLINE_SYSCALL (wait4, 4, pid, stat_loc, options, NULL)
-#endif
 
 /* Uncancelable pause.  */
 #define pause_not_cancel() \