aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2020-02-09 23:13:24 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2020-02-10 00:06:59 +0000
commitf1cd3407e4c6767e0bbe2ca122b713c6581b8d67 (patch)
tree8c22e44447d7c34fa562df64ec3b4f329c4272d9
parent782ee4e256a1e2b6fe2fe226ec8a38732e43c60f (diff)
downloadglibc-f1cd3407e4c6767e0bbe2ca122b713c6581b8d67.tar
glibc-f1cd3407e4c6767e0bbe2ca122b713c6581b8d67.tar.gz
glibc-f1cd3407e4c6767e0bbe2ca122b713c6581b8d67.tar.bz2
glibc-f1cd3407e4c6767e0bbe2ca122b713c6581b8d67.zip
htl: clean __pthread_get_cleanup_stack hidden proto
-rw-r--r--htl/pt-cleanup.c4
-rw-r--r--htl/pt-exit.c2
-rw-r--r--htl/pt-join.c2
-rw-r--r--sysdeps/htl/pthreadP.h2
4 files changed, 4 insertions, 6 deletions
diff --git a/htl/pt-cleanup.c b/htl/pt-cleanup.c
index 3f5f43f253..a9a7c95847 100644
--- a/htl/pt-cleanup.c
+++ b/htl/pt-cleanup.c
@@ -21,8 +21,8 @@
#include <pt-internal.h>
struct __pthread_cancelation_handler **
-___pthread_get_cleanup_stack (void)
+__pthread_get_cleanup_stack (void)
{
return &_pthread_self ()->cancelation_handlers;
}
-strong_alias (___pthread_get_cleanup_stack, __pthread_get_cleanup_stack)
+hidden_def(__pthread_get_cleanup_stack)
diff --git a/htl/pt-exit.c b/htl/pt-exit.c
index 9a4db2da51..94e3cd9dc0 100644
--- a/htl/pt-exit.c
+++ b/htl/pt-exit.c
@@ -41,7 +41,7 @@ __pthread_exit (void *status)
disabled. */
__pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &oldstate);
- for (handlers = ___pthread_get_cleanup_stack ();
+ for (handlers = __pthread_get_cleanup_stack ();
*handlers != NULL;
*handlers = (*handlers)->__next)
(*handlers)->__handler ((*handlers)->__arg);
diff --git a/htl/pt-join.c b/htl/pt-join.c
index b141c4c8b9..43878a3d52 100644
--- a/htl/pt-join.c
+++ b/htl/pt-join.c
@@ -22,8 +22,6 @@
#include <pt-internal.h>
-#define __pthread_get_cleanup_stack ___pthread_get_cleanup_stack
-
/* Make calling thread wait for termination of thread THREAD. Return
the exit status of the thread in *STATUS. */
int
diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index fd1e697e39..7de96120a4 100644
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -84,7 +84,6 @@ 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 *);
-struct __pthread_cancelation_handler **___pthread_get_cleanup_stack (void) attribute_hidden;
#if IS_IN (libpthread)
hidden_proto (__pthread_key_create)
@@ -93,6 +92,7 @@ hidden_proto (__pthread_setspecific)
hidden_proto (__pthread_mutex_init)
hidden_proto (__pthread_mutex_destroy)
hidden_proto (__pthread_mutex_timedlock)
+hidden_proto (__pthread_get_cleanup_stack)
#endif
#define ASSERT_TYPE_SIZE(type, size) \