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.17-854-gb003710
- From: macro at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 26 Jun 2013 18:35:06 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.17-854-gb003710
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 b0037103771cc02e092884c39aa9e4982073099a (commit)
from c18c701d030e28698e6faee9c6d3b8b80d0e2302 (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=b0037103771cc02e092884c39aa9e4982073099a
commit b0037103771cc02e092884c39aa9e4982073099a
Author: Maciej W. Rozycki <macro@codesourcery.com>
Date: Wed Jun 26 19:14:29 2013 +0100
[BZ #15022] Avoid repeated calls to DL_STATIC_INIT for the same module.
diff --git a/ChangeLog b/ChangeLog
index 8bc2ddc..64f2fe3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-26 Maciej W. Rozycki <macro@codesourcery.com>
+
+ [BZ #15022]
+ * elf/dl-open.c (_dl_open) [!SHARED]: Move call to DL_STATIC_INIT
+ over to...
+ (dl_open_worker) [!SHARED]: ... here.
+
2013-06-26 Ryan S. Arnold <rsa@linux.vnet.ibm.com>
* elf/elf.h (AT_HWCAP2): Add a new a_type entry.
diff --git a/elf/dl-open.c b/elf/dl-open.c
index 0f054bf..15221c8 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -568,6 +568,10 @@ cannot load any more object with static TLS"));
if (relocation_in_progress)
LIBC_PROBE (reloc_complete, 3, args->nsid, r, new);
+#ifndef SHARED
+ DL_STATIC_INIT (new);
+#endif
+
/* Run the initializer functions of new objects. */
_dl_init (new, args->argc, args->argv, args->env);
@@ -721,10 +725,6 @@ no more namespaces available for dlmopen()"));
/* Release the lock. */
__rtld_lock_unlock_recursive (GL(dl_load_lock));
-#ifndef SHARED
- DL_STATIC_INIT (args.map);
-#endif
-
return args.map;
}
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
elf/dl-open.c | 8 ++++----
2 files changed, 11 insertions(+), 4 deletions(-)
hooks/post-receive
--
GNU C Library master sources