qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Ulrich Drepper 2009-09-28 03:19:58 -07:00
parent 0d1804061a
commit 4fd894620f
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2009-09-28 Samuel Thibault <samuel.thibault@ens-lyon.org>
* bits/termios.h [__USE_UNIX98] (IXANY): Define macro. * bits/termios.h [__USE_UNIX98] (IXANY): Define macro.

9
elf/dl-reloc.c
View File

@ -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.type_class = _tc; \
l->l_lookup_cache.sym = (*ref); \ l->l_lookup_cache.sym = (*ref); \
const struct r_found_version *v = NULL; \ const struct r_found_version *v = NULL; \
int flags = DL_LOOKUP_ADD_DEPENDENCY; \
if ((version) != NULL && (version)->hash != 0) \ if ((version) != NULL && (version)->hash != 0) \
{ \ v = (version); \
v = (version); \
flags = 0; \
} \
_lr = _dl_lookup_symbol_x (strtab + (*ref)->st_name, l, (ref), \ _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.ret = (*ref); \
l->l_lookup_cache.value = _lr; })) \ l->l_lookup_cache.value = _lr; })) \
: l) : l)