aboutsummaryrefslogtreecommitdiff
path: root/nptl/pthread_cancel.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2019-10-18 14:29:04 +0200
committerFlorian Weimer <fweimer@redhat.com>2019-10-18 14:29:04 +0200
commite4b3707cea0eae2cf46a82534dd9279541e7415a (patch)
treec2246b8c9cf4f12e0de4e3cd050f15a751402fb3 /nptl/pthread_cancel.c
parent5e20aae5ee087f394f276bd556c5c1df52d76ff9 (diff)
downloadglibc-e4b3707cea0eae2cf46a82534dd9279541e7415a.tar
glibc-e4b3707cea0eae2cf46a82534dd9279541e7415a.tar.gz
glibc-e4b3707cea0eae2cf46a82534dd9279541e7415a.tar.bz2
glibc-e4b3707cea0eae2cf46a82534dd9279541e7415a.zip
nptl: SIGCANCEL, SIGTIMER, SIGSETXID are always defined
All nptl targets have these signal definitions nowadays. This changes also replaces the nptl-generic version of pthread_sigmask with the Linux version. Tested on x86_64-linux-gnu and i686-linux-gnu. Built with build-many-glibcs.py. Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'nptl/pthread_cancel.c')
-rw-r--r--nptl/pthread_cancel.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/nptl/pthread_cancel.c b/nptl/pthread_cancel.c
index 64ac12e60a..f6be8c1dd6 100644
--- a/nptl/pthread_cancel.c
+++ b/nptl/pthread_cancel.c
@@ -63,7 +63,6 @@ __pthread_cancel (pthread_t th)
oldval))
goto again;
-#ifdef SIGCANCEL
/* The cancellation handler will take care of marking the
thread as canceled. */
pid_t pid = __getpid ();
@@ -73,12 +72,6 @@ __pthread_cancel (pthread_t th)
SIGCANCEL);
if (INTERNAL_SYSCALL_ERROR_P (val, err))
result = INTERNAL_SYSCALL_ERRNO (val, err);
-#else
- /* It should be impossible to get here at all, since
- pthread_setcanceltype should never have allowed
- PTHREAD_CANCEL_ASYNCHRONOUS to be set. */
- abort ();
-#endif
break;
}