htl: clean __pthread_get_cleanup_stack hidden proto

diff --git a/htl/pt-cleanup.c b/htl/pt-cleanup.c
index 3f5f43f2535d5e77511282bb26a67fd4481944eb..a9a7c95847af8d20caf8425b2cd5ea050b46da4d 100644 (file)
--- 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 9a4db2da511fd4c1657f9397487bbb6329aa58f0..94e3cd9dc0c339c322293f2c622a05fa1b307c15 100644 (file)
--- 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 b141c4c8b95844131e1c1f3529b3432669a8e059..43878a3d527c9ad9c7c7812c6fea60c805ee7fa8 100644 (file)
--- 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 fd1e697e39bd332292dc7597a46a214a23f4c935..7de96120a48f6fd285a1baad7f20c3ff2a24ba60 100644 (file)
--- 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)                                   \