summaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-07-24 17:38:14 +0000
committerUlrich Drepper <drepper@redhat.com>1999-07-24 17:38:14 +0000
commitd3ac2d47127235018a8be730a92aabd13f4a3f9f (patch)
tree9924dd102f9fda7f67963cf866aec6ff064c6452 /elf
parent05a6acd0b0bfdf75ee0cb7a50e518efd2d8c7e52 (diff)
downloadglibc-d3ac2d47127235018a8be730a92aabd13f4a3f9f.tar.gz
(dl_main): Adopt to changed _dl_lookup_symbol interface.
Diffstat (limited to 'elf')
-rw-r--r--elf/rtld.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/elf/rtld.c b/elf/rtld.c
index 33c26269fc..808cc9df96 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -159,8 +159,7 @@ _dl_start (void *arg)
/* Read our own dynamic section and fill in the info array. */
bootstrap_map.l_ld = (void *) bootstrap_map.l_addr + elf_machine_dynamic ();
- elf_get_dynamic_info (bootstrap_map.l_ld, bootstrap_map.l_addr,
- bootstrap_map.l_info);
+ elf_get_dynamic_info (&bootstrap_map);
#ifdef ELF_MACHINE_BEFORE_RTLD_RELOC
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)
{
/* Extract the contents of the dynamic section for easy access. */
- elf_get_dynamic_info (_dl_loaded->l_ld, _dl_loaded->l_addr,
- _dl_loaded->l_info);
+ elf_get_dynamic_info (_dl_loaded);
if (_dl_loaded->l_info[DT_HASH])
/* Set up our cache of pointers into the hash table. */
_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)
{
const ElfW(Sym) *ref = NULL;
- ElfW(Addr) loadbase = _dl_lookup_symbol (_dl_argv[i], &ref,
- _dl_loaded->l_scope,
- "argument",
+ ElfW(Addr) loadbase = _dl_lookup_symbol (_dl_argv[i], _dl_loaded,
+ &ref, _dl_loaded->l_scope,
ELF_MACHINE_JMP_SLOT);
char buf[20], *bp;
buf[sizeof buf - 1] = '\0';