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-307-g04570aa
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 6 Sep 2012 23:29:32 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-307-g04570aa
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 04570aaa8ad88caad303f8afe469beb4cf851e17 (commit)
from b80af2f40631871cf53a5e39d08d5d5516473b96 (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=04570aaa8ad88caad303f8afe469beb4cf851e17
commit 04570aaa8ad88caad303f8afe469beb4cf851e17
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Thu Sep 6 16:29:10 2012 -0700
Restore GL(dl_initial_dtv)
diff --git a/ChangeLog b/ChangeLog
index e259fab..f8ccb68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2012-09-06 H.J. Lu <hongjiu.lu@intel.com>
+ * elf/dl-tls.c (DL_INITIAL_DTV): Removed.
+ (_dl_initial_dtv): New. Defined if SHARED isn't defined.
+ (_dl_deallocate_tls): Restore GL(dl_initial_dtv).
+
+2012-09-06 H.J. Lu <hongjiu.lu@intel.com>
+
* csu/libc-tls.c (static_dtv): Renamed to ...
(_dl_static_dtv): This. Make it global.
(_dl_initial_dtv): Removed.
diff --git a/elf/dl-tls.c b/elf/dl-tls.c
index 9d896b7..c3a3d68 100644
--- a/elf/dl-tls.c
+++ b/elf/dl-tls.c
@@ -466,9 +466,7 @@ rtld_hidden_def (_dl_allocate_tls)
#ifndef SHARED
extern dtv_t _dl_static_dtv[];
-# define DL_INITIAL_DTV (&_dl_static_dtv[1])
-#else
-# define DL_INITIAL_DTV GL(dl_initial_dtv)
+# define _dl_initial_dtv (&_dl_static_dtv[1])
#endif
void
@@ -484,7 +482,7 @@ _dl_deallocate_tls (void *tcb, bool dealloc_tcb)
free (dtv[1 + cnt].pointer.val);
/* The array starts with dtv[-1]. */
- if (dtv != DL_INITIAL_DTV)
+ if (dtv != GL(dl_initial_dtv))
free (dtv - 1);
if (dealloc_tcb)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
elf/dl-tls.c | 6 ++----
2 files changed, 8 insertions(+), 4 deletions(-)
hooks/post-receive
--
GNU C Library master sources