From 6495a044575c01aee960c54e8a138ac51ed8a835 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Thu, 22 Apr 2010 17:24:58 -0700 Subject: linux-user: Remove ELFLOAD32. The ABI-specific types used by linux_binprm and image_info are different after forcing TARGET_ABI32 on. Which means that the parameters that load_elf_binary_multi sees are not those that loader_exec passed. This is inherently broken and is more trouble than it's worth fixing. Signed-off-by: Richard Henderson Signed-off-by: Blue Swirl --- linux-user/linuxload.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'linux-user/linuxload.c') diff --git a/linux-user/linuxload.c b/linux-user/linuxload.c index 2d778a2ced..13ad9aaebe 100644 --- a/linux-user/linuxload.c +++ b/linux-user/linuxload.c @@ -184,11 +184,7 @@ int loader_exec(const char * filename, char ** argv, char ** envp, && bprm->buf[1] == 'E' && bprm->buf[2] == 'L' && bprm->buf[3] == 'F') { -#ifndef TARGET_HAS_ELFLOAD32 - retval = load_elf_binary(bprm,regs,infop); -#else - retval = load_elf_binary_multi(bprm, regs, infop); -#endif + retval = load_elf_binary(bprm, regs, infop); #if defined(TARGET_HAS_BFLT) } else if (bprm->buf[0] == 'b' && bprm->buf[1] == 'F' -- cgit v1.2.3