diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | nptl/createthread.c | 6 | ||||
| -rw-r--r-- | nptl/nptl-init.c | 5 |
3 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index d4c340630d..f6fe1fa4c3 100644 --- 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 0980a7748b..49442d9f23 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 b7d2197b3e..831d762a70 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; |