Commit 8e78064e authored by Richard Henderson's avatar Richard Henderson Committed by Riku Voipio
Browse files

ppc64-linux-user: Properly interpret the entry function descriptor. 



Don't confuse the load address with the load bias.  They're equal
for ET_DYN objects (i.e. ld.so) but different for ET_EXEC objects
(i.e. statically linked).

Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarRiku Voipio <riku.voipio@linaro.org>
parent 7cd393ac

linux-user/elfload.c

+4 −4
Original line number Diff line number Diff line
@@ -618,8 +618,8 @@ static inline void init_thread(struct target_pt_regs *_regs, struct image_info * 
{

    _regs->gpr[1] = infop->start_stack;

#if defined(TARGET_PPC64) && !defined(TARGET_ABI32)

    _regs->gpr[2] = ldq_raw(infop->entry + 8) + infop->load_addr;

    infop->entry = ldq_raw(infop->entry) + infop->load_addr;

    _regs->gpr[2] = ldq_raw(infop->entry + 8) + infop->load_bias;

    infop->entry = ldq_raw(infop->entry) + infop->load_bias;

#endif

    _regs->nip = infop->entry;

}
@@ -1884,11 +1884,11 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, 
    info->start_stack = bprm->p;



    /* If we have an interpreter, set that as the program's entry point.

       Copy the load_addr as well, to help PPC64 interpret the entry

       Copy the load_bias as well, to help PPC64 interpret the entry

       point as a function descriptor.  Do this after creating elf tables

       so that we copy the original program entry point into the AUXV.  */

    if (elf_interpreter) {

        info->load_addr = interp_info.load_addr;

        info->load_bias = interp_info.load_bias;

        info->entry = interp_info.entry;

        free(elf_interpreter);

    }