aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2014-05-16 14:00:35 -0700
committerRoland McGrath <roland@hack.frob.com>2014-05-16 15:45:58 -0700
commitf75616b2b1095cf17c3330f33f4bcfcc8fc2fdcd (patch)
tree79784c2ad00c21257d505f5e6b98ce7da853aa27
parentdeb0f7f6a825f2a90220bc4e1053d70876efb150 (diff)
downloadtermbaud-linaro/master.tar.gz
termbaud-linaro/master.tar.xz
termbaud-linaro/master.zip
Fix __waitpid_nocancel link error.linaro/master
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/not-cancel.h7
2 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e913efa87c..13118b41d39 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 bc17107239d..14f5e8bd8b9 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() \