diff options
author | Ulrich Drepper <drepper@redhat.com> | 1996-12-04 01:41:39 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1996-12-04 01:41:39 +0000 |
commit | 4770745624b7f7f25623f1f10d46a4c4d6aec25c (patch) | |
tree | 0b278b62f5486313ca69360800755575487fb0f8 /elf | |
parent | d88554f033adab5d22b9860fc36bc3cb37f39b02 (diff) | |
download | glibc-4770745624b7f7f25623f1f10d46a4c4d6aec25c.tar glibc-4770745624b7f7f25623f1f10d46a4c4d6aec25c.tar.gz glibc-4770745624b7f7f25623f1f10d46a4c4d6aec25c.tar.bz2 glibc-4770745624b7f7f25623f1f10d46a4c4d6aec25c.zip |
update from main archive 961203
Tue Dec 3 08:38:15 1996 Richard Henderson <rth@tamu.edu>
* sysdeps/unix/alpha/sysdep.S: Remove definition of __errno_location.
Reformat copyright.
* elf/rtld.c (_dl_start): Don't dereference the value returned by
elf_machine_got to get _DYNAMIC, instead call new function
elf_machine_dynamic.
* sysdeps/alpha/dl-machine.h: Permute elf_machine_got to
elf_machine_dynamic. Reformat copyright.
* sysdeps/i386/dl-machine.h: Likewise.
* sysdeps/m68k/dl-machine.h: Likewise.
* sysdeps/mips/dl-machine.h: Likewise.
* sysdeps/sparc/dl-machine.h: Likewise.
* sysdeps/stub/dl-machine.h: Likewise.
Tue Oct 15 23:46:00 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* MakeTAGS (sysdep_dirs): Include add-on sysdep directories.
Tue Dec 3 02:06:18 1996 Ulrich Drepper <drepper@cygnus.com>
* Makerules ($(libdir)/libc.so): Make first line of generated
link script contain `/* GNU ld script'. This will be used in
ldconfig to check for linker scripts.
* sysdeps/mach/hurd/libc-ldscript: Likewise.
* sysdeps/mach/hurd/libc_p-ldscript: Likewise.
* stdlib/getsubopt.c: Update copyright. Correct typo in comment.
Diffstat (limited to 'elf')
-rw-r--r-- | elf/dl-lookup.c | 1 | ||||
-rw-r--r-- | elf/rtld.c | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c index 717ac83f7a..1000a52e0d 100644 --- a/elf/dl-lookup.c +++ b/elf/dl-lookup.c @@ -187,7 +187,6 @@ _dl_lookup_symbol_skip (const char *undef_name, const ElfW(Sym) **ref, struct link_map *skip_map, int flags) { - int found_entry = 0; const unsigned long int hash = _dl_elf_hash (undef_name); struct sym_val current_value = { 0, NULL }; struct link_map **scope; diff --git a/elf/rtld.c b/elf/rtld.c index 0ce903a036..f65bd80954 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -83,10 +83,8 @@ _dl_start (void *arg) /* Figure out the run-time load address of the dynamic linker itself. */ bootstrap_map.l_addr = elf_machine_load_address (); - /* Read our own dynamic section and fill in the info array. - Conveniently, the first element of the GOT contains the - offset of _DYNAMIC relative to the run-time load address. */ - bootstrap_map.l_ld = (void *) bootstrap_map.l_addr + *elf_machine_got (); + /* 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_info); #ifdef ELF_MACHINE_BEFORE_RTLD_RELOC |