From c6aab2cb524a9c54613f0a4f8310fc1ab48658a8 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@hack.frob.com>
Date: Wed, 12 Nov 2014 14:50:09 -0800
Subject: NPTL: Move __libc_multiple_threads_ptr defn to nptl-init.c

---
 nptl/createthread.c | 6 ------
 nptl/nptl-init.c    | 5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'nptl')

diff --git a/nptl/createthread.c b/nptl/createthread.c
index 0980a77..49442d9 100644
--- 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
--- 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;
-- 
cgit v1.1