git-libpthread-testcancel

Commited in 2.32

commit 59b7fe99f2593682ba779fe0faa8f1156d48d087
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Sun Feb 9 22:23:52 2020 +0000

    htl: Add support for libc cancellation points

Gbp-Pq: Topic hurd-i386
Gbp-Pq: Name git-libpthread-testcancel.diff

diff --git a/htl/pt-testcancel.c b/htl/pt-testcancel.c
index 1ec324b95faf3763fd3b006db6d4fbf908373aa7..37326280eea23d49f777231c312acafcad943603 100644 (file)
--- a/htl/pt-testcancel.c
+++ b/htl/pt-testcancel.c
@@ -22,7 +22,7 @@
 #include <pthreadP.h>
 
 void
-pthread_testcancel (void)
+__pthread_testcancel (void)
 {
   struct __pthread *p = _pthread_self ();
   int cancelled;
@@ -34,3 +34,4 @@ pthread_testcancel (void)
   if (cancelled)
     __pthread_exit (PTHREAD_CANCELED);
 }
+strong_alias (__pthread_testcancel, pthread_testcancel)

diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index ce1eb34d80ab6162062ad9f4f24ac4fe2aab9042..9d249f4497d249ad5bc38d251258fb41737bc329 100644 (file)
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -67,6 +67,7 @@ int __pthread_attr_setstacksize (pthread_attr_t *__attr, size_t __stacksize);
 int __pthread_attr_setstack (pthread_attr_t *__attr, void *__stackaddr,
                             size_t __stacksize);
 int __pthread_attr_getstack (const pthread_attr_t *, void **, size_t *);
+void __pthread_testcancel (void);
 
 #if IS_IN (libpthread)
 hidden_proto (__pthread_create)