This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch, master, updated. glibc-2.10-342-g4fd8946


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  4fd894620f22dc189d3f8339e39c630c4d05421b (commit)
      from  0d1804061a2c27ffe511a5f9df572ad9748d8219 (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=4fd894620f22dc189d3f8339e39c630c4d05421b

commit 4fd894620f22dc189d3f8339e39c630c4d05421b
Author: Ulrich Drepper <drepper@redhat.com>
Date:   Mon Sep 28 03:19:58 2009 -0700

    Fix missing reloc dependency
    
    When DL_LOOKUP_ADD_DEPENDENCY was introduced a few callers of
    _dl_lookup_versioned_symbol were not properly adjusted.  One of them
    survived until now.

diff --git a/ChangeLog b/ChangeLog
index 5dcdbfc..db2c0a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-25  Andreas Schwab  <schwab@redhat.com>
+
+	* elf/dl-reloc.c (RESOLVE_MAP): Always pass
+	DL_LOOKUP_ADD_DEPENDENCY to _dl_lookup_symbol_x.
+
 2009-09-28  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
 	* bits/termios.h [__USE_UNIX98] (IXANY): Define macro.
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c
index 680caad..6c00691 100644
--- a/elf/dl-reloc.c
+++ b/elf/dl-reloc.c
@@ -254,14 +254,11 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],
 	     l->l_lookup_cache.type_class = _tc;			      \
 	     l->l_lookup_cache.sym = (*ref);				      \
 	     const struct r_found_version *v = NULL;			      \
-	     int flags = DL_LOOKUP_ADD_DEPENDENCY;			      \
 	     if ((version) != NULL && (version)->hash != 0)		      \
-	       {							      \
-		 v = (version);						      \
-		 flags = 0;						      \
-	       }							      \
+	       v = (version);						      \
 	     _lr = _dl_lookup_symbol_x (strtab + (*ref)->st_name, l, (ref),   \
-					scope, v, _tc, flags, NULL);	      \
+					scope, v, _tc,			      \
+					DL_LOOKUP_ADD_DEPENDENCY, NULL);      \
 	     l->l_lookup_cache.ret = (*ref);				      \
 	     l->l_lookup_cache.value = _lr; }))				      \
      : l)

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog      |    5 +++++
 elf/dl-reloc.c |    9 +++------
 2 files changed, 8 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]