This is the mail archive of the mailing list for the glibc project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.19-432-gf75616b

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  f75616b2b1095cf17c3330f33f4bcfcc8fc2fdcd (commit)
      from  deb0f7f6a825f2a90220bc4e1053d70876efb150 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------;a=commitdiff;h=f75616b2b1095cf17c3330f33f4bcfcc8fc2fdcd

commit f75616b2b1095cf17c3330f33f4bcfcc8fc2fdcd
Author: Roland McGrath <>
Date:   Fri May 16 14:00:35 2014 -0700

    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  <>
+	* sysdeps/unix/sysv/linux/not-cancel.h (waitpid_not_cancel):
+	Use wait4 regardless of [__NR_waitpid].
 2014-05-16  Maciej W. Rozycki  <>
 	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)
-# 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)
 /* Uncancelable pause.  */
 #define pause_not_cancel() \


Summary of changes:
 ChangeLog                            |    5 +++++
 sysdeps/unix/sysv/linux/not-cancel.h |    7 +------
 2 files changed, 6 insertions(+), 6 deletions(-)

GNU C Library master sources

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]