OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(dl_main): Adopt to changed _dl_lookup_symbol interface.

This commit is contained in:
Ulrich Drepper 1999-07-24 17:38:14 +00:00
parent 05a6acd0b0
commit d3ac2d4712
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
elf/rtld.c
View File

@ -159,8 +159,7 @@ _dl_start (void *arg)
/* Read our own dynamic section and fill in the info array. */ /* Read our own dynamic section and fill in the info array. */
bootstrap_map.l_ld = (void *) bootstrap_map.l_addr + elf_machine_dynamic (); bootstrap_map.l_ld = (void *) bootstrap_map.l_addr + elf_machine_dynamic ();
elf_get_dynamic_info (bootstrap_map.l_ld, bootstrap_map.l_addr, elf_get_dynamic_info (&bootstrap_map);
bootstrap_map.l_info);
#ifdef ELF_MACHINE_BEFORE_RTLD_RELOC #ifdef ELF_MACHINE_BEFORE_RTLD_RELOC
ELF_MACHINE_BEFORE_RTLD_RELOC (bootstrap_map.l_info); ELF_MACHINE_BEFORE_RTLD_RELOC (bootstrap_map.l_info);
@ -594,8 +593,7 @@ of this helper program; chances are you did not intend to run this program.\n\
if (! rtld_is_main) if (! rtld_is_main)
{ {
/* Extract the contents of the dynamic section for easy access. */ /* Extract the contents of the dynamic section for easy access. */
elf_get_dynamic_info (_dl_loaded->l_ld, _dl_loaded->l_addr, elf_get_dynamic_info (_dl_loaded);
_dl_loaded->l_info);
if (_dl_loaded->l_info[DT_HASH]) if (_dl_loaded->l_info[DT_HASH])
/* Set up our cache of pointers into the hash table. */ /* Set up our cache of pointers into the hash table. */
_dl_setup_hash (_dl_loaded); _dl_setup_hash (_dl_loaded);
@ -861,9 +859,8 @@ of this helper program; chances are you did not intend to run this program.\n\
for (i = 1; i < _dl_argc; ++i) for (i = 1; i < _dl_argc; ++i)
{ {
const ElfW(Sym) *ref = NULL; const ElfW(Sym) *ref = NULL;
ElfW(Addr) loadbase = _dl_lookup_symbol (_dl_argv[i], &ref, ElfW(Addr) loadbase = _dl_lookup_symbol (_dl_argv[i], _dl_loaded,
_dl_loaded->l_scope, &ref, _dl_loaded->l_scope,
"argument",
ELF_MACHINE_JMP_SLOT); ELF_MACHINE_JMP_SLOT);
char buf[20], *bp; char buf[20], *bp;
buf[sizeof buf - 1] = '\0'; buf[sizeof buf - 1] = '\0';