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.16-ports-merge-304-g5385d05
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 6 Sep 2012 19:20:33 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-304-g5385d05
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 5385d052d69189c13e1f318bb058df7fad27e248 (commit)
via 0948c3af9dfb3bc1312d6bed2f3a6bfd4e96eef4 (commit)
via f5fce0629a6a75e2e5969a87b01c37e8c45c1f4d (commit)
from a5055ad15a4cb063627653d0a2109f66ead63c33 (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://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5385d052d69189c13e1f318bb058df7fad27e248
commit 5385d052d69189c13e1f318bb058df7fad27e248
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Thu Sep 6 12:20:16 2012 -0700
Mention BZ #14545 in NEWS
diff --git a/NEWS b/NEWS
index 7016a64..c3a3b28 100644
--- a/NEWS
+++ b/NEWS
@@ -13,7 +13,7 @@ Version 2.17
13939, 13966, 14042, 14090, 14166, 14150, 14151, 14154, 14157, 14166,
14173, 14195, 14237, 14252, 14283, 14298, 14303, 14307, 14328, 14331,
14336, 14337, 14347, 14349, 14459, 14476, 14505, 14510, 14516, 14519,
- 14532, 14538, 14544
+ 14532, 14538, 14544, 14545.
* Support for STT_GNU_IFUNC symbols added for s390 and s390x.
Optimized versions of memcpy, memset, and memcmp added for System z10 and
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=0948c3af9dfb3bc1312d6bed2f3a6bfd4e96eef4
commit 0948c3af9dfb3bc1312d6bed2f3a6bfd4e96eef4
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Wed Sep 5 12:24:37 2012 -0700
Always check dtv before freeing dtv[-1]
diff --git a/ChangeLog b/ChangeLog
index 08fa5a1..7385bcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2012-09-06 H.J. Lu <hongjiu.lu@intel.com>
+ [BZ #14545]
+ * csu/libc-tls.c (_dl_initial_dtv): New variable.
+ * elf/dl-tls.c (_dl_deallocate_tls): Always check dtv before
+ freeing dtv[-1].
+
+2012-09-06 H.J. Lu <hongjiu.lu@intel.com>
+
[BZ #14544]
* Makeconfig (link-static-before-libc): Replace $(+prector)
with $(+prectorT).
diff --git a/csu/libc-tls.c b/csu/libc-tls.c
index b00a5cc..eb9c502 100644
--- a/csu/libc-tls.c
+++ b/csu/libc-tls.c
@@ -65,6 +65,8 @@ size_t _dl_tls_static_size = 2048;
size_t _dl_tls_static_used;
/* Alignment requirement of the static TLS block. */
size_t _dl_tls_static_align;
+/* Initial dtv of the main thread, not allocated with normal malloc. */
+void *_dl_initial_dtv = &static_dtv[1];
/* Generation counter for the dtv. */
size_t _dl_tls_generation;
diff --git a/elf/dl-tls.c b/elf/dl-tls.c
index 4138312..ff59e9e 100644
--- a/elf/dl-tls.c
+++ b/elf/dl-tls.c
@@ -477,9 +477,7 @@ _dl_deallocate_tls (void *tcb, bool dealloc_tcb)
free (dtv[1 + cnt].pointer.val);
/* The array starts with dtv[-1]. */
-#ifdef SHARED
if (dtv != GL(dl_initial_dtv))
-#endif
free (dtv - 1);
if (dealloc_tcb)
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f5fce0629a6a75e2e5969a87b01c37e8c45c1f4d
commit f5fce0629a6a75e2e5969a87b01c37e8c45c1f4d
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Thu Sep 6 05:44:57 2012 -0700
Add tst-cancel21-static.c
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index f4b7ff3..34b3698 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,10 @@
+2012-09-06 H.J. Lu <hongjiu.lu@intel.com>
+
+ [BZ #14545]
+ * Makefile (tests-static): Add tst-cancel21-static.
+ (tests): Likewise.
+ * tst-cancel21-static.c: New file.
+
2012-09-01 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/pthread_getcpuclockid.c
diff --git a/nptl/Makefile b/nptl/Makefile
index 614f0ce..ad7ac05 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -348,8 +348,9 @@ CFLAGS-funlockfile.c = $(libio-mtsafe)
link-libc-static := $(common-objpfx)libc.a $(static-gnulib) \
$(common-objpfx)libc.a
-tests-static += tst-locale1 tst-locale2 tst-stackguard1-static
-tests += tst-stackguard1-static
+tests-static += tst-locale1 tst-locale2 tst-stackguard1-static \
+ tst-cancel21-static
+tests += tst-stackguard1-static tst-cancel21-static
xtests-static += tst-setuid1-static
# These tests are linked with libc before libpthread
diff --git a/nptl/tst-cancel21-static.c b/nptl/tst-cancel21-static.c
new file mode 100644
index 0000000..2a01061
--- /dev/null
+++ b/nptl/tst-cancel21-static.c
@@ -0,0 +1 @@
+#include "tst-cancel21.c"
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
NEWS | 2 +-
csu/libc-tls.c | 2 ++
elf/dl-tls.c | 2 --
nptl/ChangeLog | 7 +++++++
nptl/Makefile | 5 +++--
nptl/{tst-cancelx21.c => tst-cancel21-static.c} | 0
7 files changed, 20 insertions(+), 5 deletions(-)
copy nptl/{tst-cancelx21.c => tst-cancel21-static.c} (100%)
hooks/post-receive
--
GNU C Library master sources