From ba0da1823b7c5dc7ee13ff767a493c874faf8a14 Mon Sep 17 00:00:00 2001 From: GNU Libc Maintainers Date: Sat, 2 Oct 2021 13:47:40 +0100 Subject: [PATCH] git-pthread_get_cleanup_stack Commited in 2.32 commit f1cd3407e4c6767e0bbe2ca122b713c6581b8d67 Author: Samuel Thibault Date: Sun Feb 9 23:13:24 2020 +0000 htl: clean __pthread_get_cleanup_stack hidden proto Gbp-Pq: Topic hurd-i386 Gbp-Pq: Name git-pthread_get_cleanup_stack.diff --- htl/pt-cleanup.c | 4 ++-- htl/pt-exit.c | 2 +- htl/pt-join.c | 2 -- sysdeps/htl/pthreadP.h | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/htl/pt-cleanup.c b/htl/pt-cleanup.c index 3f5f43f25..a9a7c9584 100644 --- a/htl/pt-cleanup.c +++ b/htl/pt-cleanup.c @@ -21,8 +21,8 @@ #include 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 9a4db2da5..94e3cd9dc 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 b141c4c8b..43878a3d5 100644 --- a/htl/pt-join.c +++ b/htl/pt-join.c @@ -22,8 +22,6 @@ #include -#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 43208dd39..ce1eb34d8 100644 --- a/sysdeps/htl/pthreadP.h +++ b/sysdeps/htl/pthreadP.h @@ -67,7 +67,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_create) @@ -76,6 +75,7 @@ hidden_proto (__pthread_key_create) hidden_proto (__pthread_getspecific) hidden_proto (__pthread_setspecific) hidden_proto (_pthread_mutex_init) +hidden_proto (__pthread_get_cleanup_stack) #endif #define ASSERT_TYPE_SIZE(type, size) \ -- 2.30.2