From: Henning Schild <henn...@hennsch.de> Find a hopefully proper patch attached. Take it or leave it.
Reviewed-by: Kevin Wolf <kw...@redhat.com> Signed-off-by: Henning Schild <henn...@hennsch.de> Signed-off-by: Aurelien Jarno <aurel...@aurel32.net> (cherry picked from commit 7e9c7ffe9fd9dfc3d0168dd584936db8144b230b) Signed-off-by: Michael Tokarev <m...@tls.msk.ru> --- hw/elf_ops.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hw/elf_ops.h b/hw/elf_ops.h index fa65ce2..731a983 100644 --- a/hw/elf_ops.h +++ b/hw/elf_ops.h @@ -269,6 +269,17 @@ static int glue(load_elf, SZ)(const char *name, int fd, addr = ph->p_paddr; } + /* the entry pointer in the ELF header is a virtual + * address, if the text segments paddr and vaddr differ + * we need to adjust the entry */ + if (pentry && !translate_fn && + ph->p_vaddr != ph->p_paddr && + ehdr.e_entry >= ph->p_vaddr && + ehdr.e_entry < ph->p_vaddr + ph->p_filesz && + ph->p_flags & PF_X) { + *pentry = ehdr.e_entry - ph->p_vaddr + ph->p_paddr; + } + snprintf(label, sizeof(label), "phdr #%d: %s", i, name); rom_add_blob_fixed(label, data, mem_size, addr); -- 1.7.10.4