From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun, 12 Jan 2020 23:47:19 +0000 (+0100)
Subject: htl: Add internal versions of functions used by C11 threads
X-Git-Tag: glibc-2.31~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e404be33feaa586231fe30e3bdf6d380a79c2679;p=thirdparty%2Fglibc.git

htl: Add internal versions of functions used by C11 threads

The C11 threads implementation needs to call pthread_join and
pthread_key_delete without exposing them.
---

diff --git a/htl/pt-join.c b/htl/pt-join.c
index 158c328af10..b141c4c8b95 100644
--- a/htl/pt-join.c
+++ b/htl/pt-join.c
@@ -27,7 +27,7 @@
 /* Make calling thread wait for termination of thread THREAD.  Return
    the exit status of the thread in *STATUS.  */
 int
-pthread_join (pthread_t thread, void **status)
+__pthread_join (pthread_t thread, void **status)
 {
   struct __pthread *pthread;
   int err = 0;
@@ -75,3 +75,4 @@ pthread_join (pthread_t thread, void **status)
 
   return err;
 }
+strong_alias (__pthread_join, pthread_join);
diff --git a/sysdeps/htl/libc-lockP.h b/sysdeps/htl/libc-lockP.h
index 4b035021c93..4ba3930a13a 100644
--- a/sysdeps/htl/libc-lockP.h
+++ b/sysdeps/htl/libc-lockP.h
@@ -112,6 +112,8 @@ extern int __pthread_rwlock_unlock (pthread_rwlock_t *__rwlock);
 extern int __pthread_key_create (pthread_key_t *__key,
 				 void (*__destr_function) (void *));
 
+extern int __pthread_key_delete (pthread_key_t __key);
+
 extern int __pthread_setspecific (pthread_key_t __key,
 				  const void *__pointer);
 
diff --git a/sysdeps/htl/pt-key-delete.c b/sysdeps/htl/pt-key-delete.c
index 9b3fd9078d3..2f8aae16a5d 100644
--- a/sysdeps/htl/pt-key-delete.c
+++ b/sysdeps/htl/pt-key-delete.c
@@ -21,7 +21,7 @@
 #include <pt-internal.h>
 
 int
-pthread_key_delete (pthread_key_t key)
+__pthread_key_delete (pthread_key_t key)
 {
   error_t err = 0;
 
@@ -61,3 +61,4 @@ pthread_key_delete (pthread_key_t key)
 
   return err;
 }
+strong_alias (__pthread_key_delete, pthread_key_delete)
diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index 47fd3af87a3..30e074c1d0d 100644
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -45,6 +45,7 @@ int __pthread_create (pthread_t *newthread,
 void __cthread_detach (__cthread_t);
 int __pthread_detach (pthread_t __threadp);
 void __pthread_exit (void *value) __attribute__ ((__noreturn__));
+int __pthread_join (pthread_t, void **);
 int __cthread_keycreate (__cthread_key_t *);
 int __cthread_getspecific (__cthread_key_t, void **);
 int __cthread_setspecific (__cthread_key_t, void *);