diff options
| author | jdp <jdp@FreeBSD.org> | 1999-02-07 23:49:56 +0000 |
|---|---|---|
| committer | jdp <jdp@FreeBSD.org> | 1999-02-07 23:49:56 +0000 |
| commit | bbafa43d0d94b57b8a30d6b86b299ca10312fafa (patch) | |
| tree | 142fc50062ca65ff2943cc724a6ed77e19a8e188 /sys/kern/imgact_elf.c | |
| parent | 98732ec693124cdb1b12cb82c7cf62606842becd (diff) | |
| download | FreeBSD-src-bbafa43d0d94b57b8a30d6b86b299ca10312fafa.zip FreeBSD-src-bbafa43d0d94b57b8a30d6b86b299ca10312fafa.tar.gz | |
Change the load address of the ELF dynamic linker from "2L*MAXDSIZ"
to an architecture-specific value defined in <machine/elf.h>. This
solves problems on large-memory systems that have a high value for
MAXDSIZ.
The load address is controlled by a new macro ELF_RTLD_ADDR(vmspace).
On the i386 it is hard-wired to 0x08000000, which is the standard
SVR4 location for the dynamic linker.
On the Alpha, the dynamic linker is loaded MAXDSIZ bytes beyond
the start of the program's data segment. This is the same place
a userland mmap(0, ...) call would put it, so it ends up just below
all the shared libraries. The rationale behind the calculation is
that it allows room for the data segment to grow to its maximum
possible size.
These changes have been tested on the i386 for several months
without problems. They have been tested on the Alpha as well,
though not for nearly as long. I would like to merge the changes
into 3.1 within a week if no problems have surfaced as a result of
them.
Diffstat (limited to 'sys/kern/imgact_elf.c')
| -rw-r--r-- | sys/kern/imgact_elf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 38f70d9..6d9586e 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: imgact_elf.c,v 1.51 1999/02/05 22:24:26 jdp Exp $ + * $Id: imgact_elf.c,v 1.52 1999/02/07 21:48:21 dillon Exp $ */ #include "opt_rlimit.h" @@ -522,7 +522,7 @@ exec_elf_imgact(struct image_params *imgp) vmspace->vm_dsize = data_size >> PAGE_SHIFT; vmspace->vm_daddr = (caddr_t)(uintptr_t)data_addr; - addr = 2L*MAXDSIZ; /* May depend on OS type XXX */ + addr = ELF_RTLD_ADDR(vmspace); imgp->entry_addr = entry; |
