From: Roland McGrath <roland@hack.frob.com>
Date: Fri, 16 May 2014 21:00:35 +0000 (-0700)
Subject: Fix __waitpid_nocancel link error.
X-Git-Tag: upstream/2.30~7479
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f75616b2b1095cf17c3330f33f4bcfcc8fc2fdcd;p=external%2Fglibc.git

Fix __waitpid_nocancel link error.
---

diff --git a/ChangeLog b/ChangeLog
index 6e913ef..13118b4 100644
--- 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 bc17107..14f5e8b 100644
--- 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() \