This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
Community source repository for glibc add-on ports branch, master, updated. glibc-2.11-25-g872083b
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 16 Dec 2009 17:44:14 -0000
- Subject: Community source repository for glibc add-on ports branch, master, updated. glibc-2.11-25-g872083b
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 "Community source repository for glibc add-on ports".
The branch, master has been updated
via 872083bf1559281ac2afc772ff2f093638e1d6e5 (commit)
from 4b8a7d2c3f00ac9a4e31e3c8c132b4b9aefbc5fe (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-ports.git;a=commitdiff;h=872083bf1559281ac2afc772ff2f093638e1d6e5
commit 872083bf1559281ac2afc772ff2f093638e1d6e5
Author: Joseph Myers <joseph@codesourcery.com>
Date: Wed Dec 16 17:44:03 2009 +0000
Update MIPS dl-lookup.c.
diff --git a/ChangeLog.mips b/ChangeLog.mips
index 9dfe2a5..0f8f7c8 100644
--- a/ChangeLog.mips
+++ b/ChangeLog.mips
@@ -1,3 +1,7 @@
+2009-12-16 Joseph Myers <joseph@codesourcery.com>
+
+ * sysdeps/mips/dl-lookup.c: Update from generic version.
+
2009-12-15 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Redefine O_SYNC and
diff --git a/sysdeps/mips/dl-lookup.c b/sysdeps/mips/dl-lookup.c
index c7deb4d..a9fff59 100644
--- a/sysdeps/mips/dl-lookup.c
+++ b/sysdeps/mips/dl-lookup.c
@@ -794,7 +794,7 @@ _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map,
if (__builtin_expect (protected != 0, 0))
{
/* It is very tricky. We need to figure out what value to
- return for the protected symbol. */
+ return for the protected symbol. */
if (type_class == ELF_RTYPE_CLASS_PLT)
{
if (current_value.s != NULL && current_value.m != undef_map)
@@ -839,7 +839,8 @@ _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map,
version, type_class, flags, skip_map);
/* The object is used. */
- current_value.m->l_used = 1;
+ if (__builtin_expect (current_value.m->l_used == 0, 0))
+ current_value.m->l_used = 1;
if (__builtin_expect (GLRO(dl_debug_mask)
& (DL_DEBUG_BINDINGS|DL_DEBUG_PRELINK), 0))
@@ -861,7 +862,7 @@ _dl_setup_hash (struct link_map *map)
Elf_Symndx nchain;
if (__builtin_expect (map->l_info[DT_ADDRTAGIDX (DT_GNU_HASH) + DT_NUM
- + DT_THISPROCNUM + DT_VERSIONTAGNUM
+ + DT_THISPROCNUM + DT_VERSIONTAGNUM
+ DT_EXTRANUM + DT_VALNUM] != NULL, 1))
{
Elf32_Word *hash32
-----------------------------------------------------------------------
Summary of changes:
ChangeLog.mips | 4 ++++
sysdeps/mips/dl-lookup.c | 7 ++++---
2 files changed, 8 insertions(+), 3 deletions(-)
hooks/post-receive
--
Community source repository for glibc add-on ports