Skip to content

Commit

Permalink
Fix missing reloc dependency
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Ulrich Drepper committed Sep 28, 2009
1 parent 0d18040 commit 4fd8946
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
9 changes: 3 additions & 6 deletions elf/dl-reloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 4fd8946

Please sign in to comment.