Message ID | 20140516210218.8081E2C3A81@topped-with-meat.com |
---|---|
State | New |
Headers | show |
On Fri, 2014-05-16 at 14:02 -0700, Roland McGrath wrote: > > This is unrelated to fork. It is due to my not-cancel.h change. > I think the following patch will fix it. Can you verify that? > (You can just use 'git checkout roland/waitpid' if you are otherwise > using unmodified trunk.) > > > Thanks, > Roland > > > * sysdeps/unix/sysv/linux/not-cancel.h (waitpid_not_cancel): > Use wait4 regardless of [__NR_waitpid]. > > --- 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() \ I applied this patch and my MIPS build worked. Steve Ellcey sellcey@mips.com
Thanks for the testing. I've put the change in.
--- 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() \