diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-09-01 14:31:49 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-09-01 14:31:49 +0000 |
| commit | 052b6a6c94cc330dfbc09ff7b5f03c943deb7ca2 (patch) | |
| tree | 0ef4d2730e6e20141e3b669b8a3614193200f3fc /elf/rtld.c | |
| parent | 85c165befc61d049abe3cc443c275a210c569338 (diff) | |
| download | glibc-052b6a6c94cc330dfbc09ff7b5f03c943deb7ca2.tar glibc-052b6a6c94cc330dfbc09ff7b5f03c943deb7ca2.tar.gz glibc-052b6a6c94cc330dfbc09ff7b5f03c943deb7ca2.tar.bz2 glibc-052b6a6c94cc330dfbc09ff7b5f03c943deb7ca2.zip | |
Update.
1998-08-09 Geoff Keating <geoffk@ozemail.com.au>
* sysdeps/powerpc/Makefile [subdir=elf]: Add new files split out of
dl-machine.h.
* sysdeps/powerpc/dl-machine.c: New file.
* sysdeps/powerpc/dl-machine.h: Move much stuff into separate
files. Revise ELF_PREFERRED_ADDRESS to take account of
the new mapping information (fixes bug involving huge bloated
web browser). Set ELF_MACHINE_PLTREL_OVERLAP.
* sysdeps/powerpc/dl-start.S: New file.
* elf/dl-load.c (_dl_map_object_from_fd): Initialise l_map_start,
l_map_end.
* elf/do-rel.h: Call elf_machine_rel only once (to save space).
* elf/dynamic-link.h: Allow PLT relocs to be in the middle of the
others. Call elf_dynamic_do_##reloc only once (to save even more
space).
* elf/link.h: Add new members l_map_start and l_map_end to keep
track of the memory map.
* elf/rtld.c (_dl_start): Initialise l_map_start for ld.so and
the executable.
1998-09-01 11:53 Ulrich Drepper <drepper@cygnus.com>
* debug/Makefile (catchsegv): We need not rewrite SOVER anymore.
Reported by Andreas Jaeger.
* posix/glob.h: Use __size_t instead of size_t in definitions and
make sure this is defined.
* manual/locale.texi: Almost complete rewrite. Document more functions
Diffstat (limited to 'elf/rtld.c')
| -rw-r--r-- | elf/rtld.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/elf/rtld.c b/elf/rtld.c index 3ae51e68ab..b25fb20fd3 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -165,6 +165,10 @@ _dl_start (void *arg) _dl_rtld_map.l_info[DT_RPATH]->d_un.d_val); } +/* Don't bother trying to work out how ld.so is mapped in memory. */ + _dl_rtld_map.l_map_start = ~0; + _dl_rtld_map.l_map_end = ~0; + /* Call the OS-dependent function to set up life so we can do things like file access. It will call `dl_main' (below) to do all the real work of the dynamic linker, and then unwind our frame and run the user @@ -432,6 +436,11 @@ of this helper program; chances are you did not intend to run this program.\n\ information for the program. */ } + /* It is not safe to load stuff after the main program. */ + main_map->l_map_end = ~0; + /* Perhaps the executable has no PT_LOAD header entries at all. */ + main_map->l_map_start = ~0; + /* Scan the program header table for the dynamic section. */ for (ph = phdr; ph < &phdr[phent]; ++ph) switch (ph->p_type) @@ -474,6 +483,15 @@ of this helper program; chances are you did not intend to run this program.\n\ has_interp = 1; break; + case PT_LOAD: + /* Remember where the main program starts in memory. */ + { + ElfW(Addr) mapstart; + mapstart = main_map->l_addr + (ph->p_vaddr & ~(ph->p_align - 1)); + if (main_map->l_map_start > mapstart) + main_map->l_map_start = mapstart; + } + break; } if (! _dl_rtld_map.l_libname && _dl_rtld_map.l_name) { |