From: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Date: Tue, 18 Oct 2016 21:10:46 +0000 (+0000)
Subject: cvs-setcancelstate
X-Git-Tag: archive/raspbian/2.25-3+rpi1~1^2^2^2^2^2^2^2^2^2^2^2~67
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c3d3d891d74a1d3290b3c2f2b1aaae6441526e9c;p=glibc.git

cvs-setcancelstate

For some yet unknown reason, fixes exec crash at boot due to ext2fs.static
including this.


Gbp-Pq: Topic hurd-i386
Gbp-Pq: Name cvs-setcancelstate.diff
---

diff --git a/libpthread/pthread/pt-exit.c b/libpthread/pthread/pt-exit.c
index b078db27a..af75937bc 100644
--- a/libpthread/pthread/pt-exit.c
+++ b/libpthread/pthread/pt-exit.c
@@ -39,14 +39,14 @@ __pthread_exit (void *status)
   /* Run any cancelation handlers.  According to POSIX, the
      cancellation cleanup handlers should be called with cancellation
      disabled.  */
-  __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &oldstate);
+  pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &oldstate);
 
   for (handlers = __pthread_get_cleanup_stack ();
        *handlers;
        *handlers = (*handlers)->__next)
     (*handlers)->__handler ((*handlers)->__arg);
 
-  __pthread_setcancelstate (oldstate, &oldstate);
+  pthread_setcancelstate (oldstate, &oldstate);
 
   /* Decrease the number of threads.  We use an atomic operation to
      make sure that only the last thread calls `exit'.  */