diff options
| author | Roland McGrath <roland@gnu.org> | 1995-06-12 09:00:13 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1995-06-12 09:00:13 +0000 |
| commit | f2b0f935d7c8de544408181350c13d8a4db690ca (patch) | |
| tree | 658304e442dad6ff4c31f1d1d6a3293b7509f20d /elf/dl-reloc.c | |
| parent | 5bf62f2d3a8af353fac661b224fc1604d4de51ea (diff) | |
| download | glibc-f2b0f935d7c8de544408181350c13d8a4db690ca.zip glibc-f2b0f935d7c8de544408181350c13d8a4db690ca.tar.gz glibc-f2b0f935d7c8de544408181350c13d8a4db690ca.tar.bz2 | |
* elf/dl-load.c (_dl_map_object): Add MAP_INHERIT flag in mmap
from zero fill.
* elf/dl-lookup.c (_dl_lookup_symbol): Take new flag arg NOSELF;
if nonzero, don't let *REF satisfy the reference itself.
* elf/link.h (_dl_lookup_symbol): Add new arg NOSELF in decl.
* sysdeps/i386/dl-runtime.c (_dl_runtime_resolve): Pass new arg to
_dl_lookup_symbol.
* elf/do-rel.h (elf_dynamic_do_rel): Pass new second arg of
R->r_offset to RESOLVE callback.
* elf/dl-reloc.c (_dl_relocate_object: resolve): Don't let *REF
satisfy the reference itself if its value equals the reloc's
offset.
* elf/rtld.c (dl_main): Write a newline in fatal msg.
* Makerules (lib%.so: lib%_pic.a): Pass $(LDFLAGS.so).
Diffstat (limited to 'elf/dl-reloc.c')
| -rw-r--r-- | elf/dl-reloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c index 7cbed38..7e4f499 100644 --- a/elf/dl-reloc.c +++ b/elf/dl-reloc.c @@ -60,10 +60,10 @@ _dl_relocate_object (struct link_map *l, int lazy) = ((void *) l->l_addr + l->l_info[DT_STRTAB]->d_un.d_ptr); - Elf32_Addr resolve (const Elf32_Sym **ref) + Elf32_Addr resolve (const Elf32_Sym **ref, Elf32_Addr r_offset) { return _dl_lookup_symbol (strtab + (*ref)->st_name, ref, scope, - l->l_name); + l->l_name, (*ref)->st_value == r_offset); } real_next = l->l_next; |