htl: Move __pthread_cleanup_stack out of libc_pthread_init.c

It does not actually need to be extern any more.

diff --git a/htl/Versions b/htl/Versions
index 2a83eb1b2794a204a61c5e310f1589d7f2d92c15..009c0d0e3560a0c6c406ea7a8133d506de99661c 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -248,7 +248,6 @@ libc {
   GLIBC_PRIVATE {
     __libc_alloca_cutoff;
     __libc_pthread_init;
-    __pthread_cleanup_stack;
     __pthread_total;
     ___pthread_self;
     __pthread_alloc;

diff --git a/htl/libc_pthread_init.c b/htl/libc_pthread_init.c
index ca71af5d7a84b11d0b5b06d84fc97a94a8991d5f..b61a3a1d0a1791d4c8eff336ee61b2e13aacae07 100644 (file)
--- a/htl/libc_pthread_init.c
+++ b/htl/libc_pthread_init.c
@@ -19,8 +19,6 @@
 #include <string.h>
 #include <pthread-functions.h>
 
-__thread struct __pthread_cancelation_handler *__pthread_cleanup_stack;
-
 void
 __libc_pthread_init (const struct pthread_functions *functions)
 {

diff --git a/htl/pt-cleanup.c b/htl/pt-cleanup.c
index 76fdbe291803e93d9fbc452c8981776083df8449..054be1be4b64665794f261473c826dce3e507baf 100644 (file)
--- a/htl/pt-cleanup.c
+++ b/htl/pt-cleanup.c
@@ -21,6 +21,8 @@
 #include <pt-internal.h>
 #include <shlib-compat.h>
 
+static __thread struct __pthread_cancelation_handler *__pthread_cleanup_stack;
+
 struct __pthread_cancelation_handler **
 ___pthread_get_cleanup_stack (void)
 {

diff --git a/htl/pt-internal.h b/htl/pt-internal.h
index 1bab90cf933e513906cf8f908da38380ee08b9c6..2bc9d82d59b58678be02ea9e6a6aa9d70537b038 100644 (file)
--- a/htl/pt-internal.h
+++ b/htl/pt-internal.h
@@ -192,9 +192,6 @@ libc_hidden_proto (__pthread_max_threads)
 #ifndef _pthread_self
 extern struct __pthread *_pthread_self (void);
 #endif
-
-/* Stores the stack of cleanup handlers for the thread.  */
-extern __thread struct __pthread_cancelation_handler *__pthread_cleanup_stack;
 \f
 
 /* Initialize the pthreads library.  */