diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sysdeps/generic/not-cancel.h | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/not-cancel.h | 4 |
3 files changed, 5 insertions, 6 deletions
@@ -1,5 +1,10 @@ 2017-07-04 Adhemerval Zanella <adhemerval.zanella@linaro.org> + * sysdeps/generic/not-cancel.h (sigsuspend_not_cancel): Remove + macro. + * sysdeps/unix/sysv/linux/not-cancel.h (sigsuspend_not_cancel): + Likewise. + * nptl/pthread_mutex_timedlock.c (__pthread_mutex_timedlock): Replace nanosleep_not_cancel with __nanosleep_nocancel. * sysdeps/generic/not-cancel.h (nanosleep_not_cancel): Remove macro. diff --git a/sysdeps/generic/not-cancel.h b/sysdeps/generic/not-cancel.h index 8eb29953ca..3418db5a48 100644 --- a/sysdeps/generic/not-cancel.h +++ b/sysdeps/generic/not-cancel.h @@ -42,7 +42,5 @@ __pause () #define __nanosleep_nocancel(requested_time, remaining) \ __nanosleep (requested_time, remaining) -#define sigsuspend_not_cancel(set) \ - __sigsuspend (set) #define NO_CANCELLATION 1 diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h index 9aaa7815a2..797c92557a 100644 --- a/sysdeps/unix/sysv/linux/not-cancel.h +++ b/sysdeps/unix/sysv/linux/not-cancel.h @@ -86,8 +86,4 @@ libc_hidden_proto (__pause_nocancel) __typeof (__nanosleep) __nanosleep_nocancel; hidden_proto (__nanosleep_nocancel) -/* Uncancelable sigsuspend. */ -#define sigsuspend_not_cancel(set) \ - INLINE_SYSCALL (rt_sigsuspend, 2, set, _NSIG / 8) - #endif /* NOT_CANCEL_H */ |