diff mbox

[COMMITTED] NPTL: Move __libc_multiple_threads_ptr defn to nptl-init.c

Message ID 20141112225258.6D3F32C3B29@topped-with-meat.com
State New
Headers show

Commit Message

Roland McGrath Nov. 12, 2014, 10:52 p.m. UTC 
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.
diff mbox

Patch

--- 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;