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-859-gfe114d2
- From: macro at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 27 Jun 2013 10:51:51 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.17-859-gfe114d2
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 fe114d206479a36369d732ea260e81a686fdbb0b (commit)
from cbe7d24bb48d5f572d714d893a27a8858870b1d2 (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=fe114d206479a36369d732ea260e81a686fdbb0b
commit fe114d206479a36369d732ea260e81a686fdbb0b
Author: Maciej W. Rozycki <macro@codesourcery.com>
Date: Thu Jun 27 11:15:51 2013 +0100
_dl_static_init: Remove nested locking.
This function is now called from dl_open_worker with the GL(dl_load_lock)
lock held and no longer needs local protection. GL(dl_load_lock) also
correctly protects _dl_lookup_symbol_x called here that relies on the
caller to have serialized access to the data structures it uses.
diff --git a/ports/ChangeLog.ia64 b/ports/ChangeLog.ia64
index 78d6b58..0189858 100644
--- a/ports/ChangeLog.ia64
+++ b/ports/ChangeLog.ia64
@@ -1,3 +1,10 @@
+2013-06-27 Maciej W. Rozycki <macro@codesourcery.com>
+
+ * sysdeps/unix/sysv/linux/ia64/dl-static.c: Do not include
+ <bits/libc-lock.h>.
+ (_dl_static_lock): Remove variable.
+ (_dl_static_init): Remove _dl_static_lock locking.
+
2013-06-15 Siddhesh Poyarekar <siddhesh@redhat.com>
* sysdeps/unix/sysv/linux/ia64/nptl/libpthread.abilist: Update.
diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips
index bdb9e5c..00542f5 100644
--- a/ports/ChangeLog.mips
+++ b/ports/ChangeLog.mips
@@ -1,3 +1,10 @@
+2013-06-27 Maciej W. Rozycki <macro@codesourcery.com>
+
+ * sysdeps/unix/sysv/linux/mips/dl-static.c: Do not include
+ <bits/libc-lock.h>.
+ (_dl_static_lock): Remove variable.
+ (_dl_static_init): Remove _dl_static_lock locking.
+
2013-06-15 Siddhesh Poyarekar <siddhesh@redhat.com>
* sysdeps/unix/sysv/linux/mips/mips32/nptl/libpthread.abilist:
diff --git a/ports/sysdeps/unix/sysv/linux/ia64/dl-static.c b/ports/sysdeps/unix/sysv/linux/ia64/dl-static.c
index de635db..9853253 100644
--- a/ports/sysdeps/unix/sysv/linux/ia64/dl-static.c
+++ b/ports/sysdeps/unix/sysv/linux/ia64/dl-static.c
@@ -35,9 +35,6 @@ _dl_var_init (void *array[])
}
#else
-#include <bits/libc-lock.h>
-
-__libc_lock_define_initialized_recursive (static, _dl_static_lock)
static void *variables[] =
{
@@ -52,8 +49,6 @@ _dl_static_init (struct link_map *map)
lookup_t loadbase;
void (*f) (void *[]);
- __libc_lock_lock_recursive (_dl_static_lock);
-
loadbase = _dl_lookup_symbol_x ("_dl_var_init", map, &ref,
map->l_local_scope, NULL, 0, 1, NULL);
if (ref != NULL)
@@ -61,8 +56,6 @@ _dl_static_init (struct link_map *map)
f = (void (*) (void *[])) DL_SYMBOL_ADDRESS (loadbase, ref);
f (variables);
}
-
- __libc_lock_unlock_recursive (_dl_static_lock);
}
#endif
diff --git a/ports/sysdeps/unix/sysv/linux/mips/dl-static.c b/ports/sysdeps/unix/sysv/linux/mips/dl-static.c
index e0501be..9290ed9 100644
--- a/ports/sysdeps/unix/sysv/linux/mips/dl-static.c
+++ b/ports/sysdeps/unix/sysv/linux/mips/dl-static.c
@@ -33,9 +33,6 @@ _dl_var_init (void *array[])
}
#else
-#include <bits/libc-lock.h>
-
-__libc_lock_define_initialized_recursive (static, _dl_static_lock)
static void *variables[] =
{
@@ -64,8 +61,6 @@ _dl_static_init (struct link_map *l)
void (*f) (void *[]);
size_t i;
- __libc_lock_lock_recursive (_dl_static_lock);
-
loadbase = _dl_lookup_symbol_x ("_dl_var_init", l, &ref, l->l_local_scope,
NULL, 0, 1, NULL);
@@ -84,8 +79,6 @@ _dl_static_init (struct link_map *l)
f (variables);
_dl_protect_relro (rtld_map);
}
-
- __libc_lock_unlock_recursive (_dl_static_lock);
}
#endif
-----------------------------------------------------------------------
Summary of changes:
ports/ChangeLog.ia64 | 7 +++++++
ports/ChangeLog.mips | 7 +++++++
ports/sysdeps/unix/sysv/linux/ia64/dl-static.c | 7 -------
ports/sysdeps/unix/sysv/linux/mips/dl-static.c | 7 -------
4 files changed, 14 insertions(+), 14 deletions(-)
hooks/post-receive
--
GNU C Library master sources