This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.20-182-gc6aab2c
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 12 Nov 2014 22:52:54 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.20-182-gc6aab2c
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via c6aab2cb524a9c54613f0a4f8310fc1ab48658a8 (commit)
from 24f4f8253f177f8a1f5a6cd5f59be1cf766be284 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c6aab2cb524a9c54613f0a4f8310fc1ab48658a8
commit c6aab2cb524a9c54613f0a4f8310fc1ab48658a8
Author: Roland McGrath <roland@hack.frob.com>
Date: Wed Nov 12 14:50:09 2014 -0800
NPTL: Move __libc_multiple_threads_ptr defn to nptl-init.c
diff --git a/ChangeLog b/ChangeLog
index d4c3406..f6fe1fa 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 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;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
nptl/createthread.c | 6 ------
nptl/nptl-init.c | 5 +++++
3 files changed, 11 insertions(+), 6 deletions(-)
hooks/post-receive
--
GNU C Library master sources