mirror of
git://sourceware.org/git/glibc.git
synced 2025-01-30 12:31:53 +08:00
(__dl_runtime_resolve): Update to use _dl_lookup_symbol_x. (elf_machine_runtime_link_map): Don't INTUSE _dl_signal_error.
This commit is contained in:
parent
b82276d1f5
commit
14c3321ee6
@ -254,7 +254,7 @@ elf_machine_runtime_link_map (ElfW(Addr) gpreg, ElfW(Addr) stub_pc)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
INTUSE (_dl_signal_error) (0, NULL, NULL, "cannot find runtime link map");
|
_dl_signal_error (0, NULL, NULL, "cannot find runtime link map");
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -366,17 +366,17 @@ __dl_runtime_resolve (ElfW(Word) sym_index, \
|
|||||||
\
|
\
|
||||||
if (version->hash != 0) \
|
if (version->hash != 0) \
|
||||||
{ \
|
{ \
|
||||||
value = _dl_lookup_versioned_symbol(strtab + sym->st_name, l, \
|
value = _dl_lookup_symbol_x (strtab + sym->st_name, l, \
|
||||||
&sym, l->l_scope, version,\
|
&sym, l->l_scope, version, \
|
||||||
ELF_RTYPE_CLASS_PLT, 0); \
|
ELF_RTYPE_CLASS_PLT, 0, 0); \
|
||||||
break; \
|
break; \
|
||||||
} \
|
} \
|
||||||
/* Fall through. */ \
|
/* Fall through. */ \
|
||||||
} \
|
} \
|
||||||
case 0: \
|
case 0: \
|
||||||
value = _dl_lookup_symbol (strtab + sym->st_name, l, &sym, \
|
value = _dl_lookup_symbol_x (strtab + sym->st_name, l, &sym, \
|
||||||
l->l_scope, ELF_RTYPE_CLASS_PLT, \
|
l->l_scope, 0, ELF_RTYPE_CLASS_PLT, \
|
||||||
DL_LOOKUP_ADD_DEPENDENCY); \
|
DL_LOOKUP_ADD_DEPENDENCY, 0); \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
/* Currently value contains the base load address of the object \
|
/* Currently value contains the base load address of the object \
|
||||||
|
Loading…
Reference in New Issue
Block a user