NPTL: Move __libc_multiple_threads_ptr defn to nptl-init.c

diff --git a/ChangeLog b/ChangeLog
index d4c3406..f6fe1fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
 2014-11-12  Joseph Myers  <joseph@codesourcery.com>
 
        * conform/GlibcConform.pm: New file.

diff --git a/nptl/createthread.c b/nptl/createthread.c
index 0980a77..49442d9 100644 (file)
--- 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,

diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
index b7d2197..831d762 100644 (file)
--- 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;