diff options
| author | Andreas Schwab <schwab@redhat.com> | 2009-09-28 13:40:23 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-09-28 13:40:23 +0200 |
| commit | a28acf6b523879e05a15769058e4bc8e9d7b9fbd (patch) | |
| tree | 81107037e619f01a58789804a5cd07d04af8cac5 /elf/dl-reloc.c | |
| parent | 490aaca42704cddd0f5dea5c1f0271b13dc9d10e (diff) | |
| parent | f450806e22be467a8d613f9a811508ccb87a5d1a (diff) | |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'elf/dl-reloc.c')
| -rw-r--r-- | elf/dl-reloc.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c index 680caadd65..6c0069147d 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) |