This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[COMMITTED PATCH] NPTL: Move __libc_multiple_threads_ptr defn to nptl-init.c
- From: Roland McGrath <roland at hack dot frob dot com>
- To: "GNU C. Library" <libc-alpha at sourceware dot org>
- Date: Wed, 12 Nov 2014 14:52:58 -0800 (PST)
- Subject: [COMMITTED PATCH] NPTL: Move __libc_multiple_threads_ptr defn to nptl-init.c
- Authentication-results: sourceware.org; auth=none
There was no rhyme or reason to the placement of this definition.
Move it to the file where the variable gets initialized.
Verified no code changes on x86_64-linux-gnu (except for assertion line
numbers).
Thanks,
Roland
2014-11-12 Roland McGrath <roland@hack.frob.com>
* nptl/createthread.c [!TLS_MULTIPLE_THREADS_IN_TCB]
(__libc_multiple_threads_ptr): Variable moved ...
* nptl/nptl-init.c [!TLS_MULTIPLE_THREADS_IN_TCB]: ... here.
--- a/nptl/createthread.c
+++ b/nptl/createthread.c
@@ -36,12 +36,6 @@
#endif
-#ifndef TLS_MULTIPLE_THREADS_IN_TCB
-/* Pointer to the corresponding variable in libc. */
-int *__libc_multiple_threads_ptr attribute_hidden;
-#endif
-
-
static int
do_clone (struct pthread *pd, const struct pthread_attr *attr,
int clone_flags, int (*fct) (void *), STACK_VARIABLES_PARMS,
--- a/nptl/nptl-init.c
+++ b/nptl/nptl-init.c
@@ -37,6 +37,11 @@
#include <kernel-features.h>
+#ifndef TLS_MULTIPLE_THREADS_IN_TCB
+/* Pointer to the corresponding variable in libc. */
+int *__libc_multiple_threads_ptr attribute_hidden;
+#endif
+
/* Size and alignment of static TLS block. */
size_t __static_tls_size;
size_t __static_tls_align_m1;