d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

On the i386, load the ELF dynamic linker where an mmap(0, ...) would

Browse Source 
put it, just like on the Alpha.  It was wrong to load it at the
fixed address 0x08000000.  That should only be done if the dynamic
linker is an executable (not a shared object) with a specific load
address encoded in the object file itself.

This fixes the recent breakage in the Linux emulator.
This commit is contained in:
jdp 1999-02-19 01:30:43 +00:00
parent a2bf462593
commit 4a2c0be6fd
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/amd64/include/elf.h
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: elf.h,v 1.5 1998/10/18 15:31:23 peter Exp $
* $Id: elf.h,v 1.6 1999/02/07 23:49:55 jdp Exp $
*/
#ifndef _MACHINE_ELF_H_
@ -121,11 +121,13 @@ __ElfType(Auxinfo);
#ifdef KERNEL
/*
* On the i386 we load the dynamic linker at a fixed address,
* below where the executable itself is loaded. This is the
* standard SVR4 location for it.
* On the i386 we load the dynamic linker where a userland call
* to mmap(0, ...) would put it. The rationale behind this
* calculation is that it leaves room for the heap to grow to
* its maximum allowed size.
*/
#define ELF_RTLD_ADDR(vmspace) 0x08000000
#define ELF_RTLD_ADDR(vmspace) \
(round_page((vm_offset_t)(vmspace)->vm_daddr + MAXDSIZ))
#endif /* KERNEL */
#endif /* !_MACHINE_ELF_H_ */

12
sys/i386/include/elf.h
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: elf.h,v 1.5 1998/10/18 15:31:23 peter Exp $
* $Id: elf.h,v 1.6 1999/02/07 23:49:55 jdp Exp $
*/
#ifndef _MACHINE_ELF_H_
@ -121,11 +121,13 @@ __ElfType(Auxinfo);
#ifdef KERNEL
/*
* On the i386 we load the dynamic linker at a fixed address,
* below where the executable itself is loaded. This is the
* standard SVR4 location for it.
* On the i386 we load the dynamic linker where a userland call
* to mmap(0, ...) would put it. The rationale behind this
* calculation is that it leaves room for the heap to grow to
* its maximum allowed size.
*/
#define ELF_RTLD_ADDR(vmspace) 0x08000000
#define ELF_RTLD_ADDR(vmspace) \
(round_page((vm_offset_t)(vmspace)->vm_daddr + MAXDSIZ))
#endif /* KERNEL */
#endif /* !_MACHINE_ELF_H_ */