diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-08-22 10:09:52 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-08-22 14:25:08 -0300 |
| commit | 988f991b5069f09d793c887618e84a196b100416 (patch) | |
| tree | bc138106252aed27b4fb875f38ca80a8787bac60 | |
| parent | 6f33fd046b8e8746e2abc19db2fdfd9c668750e9 (diff) | |
| download | glibc-988f991b5069f09d793c887618e84a196b100416.tar.gz glibc-988f991b5069f09d793c887618e84a196b100416.tar.xz glibc-988f991b5069f09d793c887618e84a196b100416.zip | |
Remove non cancellable sigsuspend definition
There is no current internal usage for non cancellable sigsuspend calls. Checked on x86_64-linux-gnu, x86_64-linux-gnu-x32, and i686-linux-gnu. * sysdeps/generic/not-cancel.h (sigsuspend_not_cancel): remove macro. * sysdeps/mach/hurd/sigsuspend.c (sigsuspend_not_cancel): remove alias. * sysdeps/unix/sysv/linux/not-cancel.h (sigsuspend_not_cancel): likewise.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | sysdeps/generic/not-cancel.h | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/sigsuspend.c | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/not-cancel.h | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index edac4d29dc..922cd8712f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2017-08-22 Adhemerval Zanella <adhemerval.zanella@linaro.org> + * sysdeps/generic/not-cancel.h (sigsuspend_not_cancel): Remove + macro. + * sysdeps/mach/hurd/sigsuspend.c (sigsuspend_not_cancel): Remove + alias. + * 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 e4a8584724..70ead5510a 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/mach/hurd/sigsuspend.c b/sysdeps/mach/hurd/sigsuspend.c index 4f5af1d302..e60f2eb178 100644 --- a/sysdeps/mach/hurd/sigsuspend.c +++ b/sysdeps/mach/hurd/sigsuspend.c @@ -79,5 +79,4 @@ __sigsuspend (const sigset_t *set) return -1; } libc_hidden_def (__sigsuspend) -strong_alias (__sigsuspend, sigsuspend_not_cancel) weak_alias (__sigsuspend, sigsuspend) diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h index 577dca8297..f73b2bbe8c 100644 --- a/sysdeps/unix/sysv/linux/not-cancel.h +++ b/sysdeps/unix/sysv/linux/not-cancel.h @@ -85,8 +85,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 */ |