diff options
| author | Richard Henderson <rth@twiddle.net> | 2010-04-22 17:24:58 -0700 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2010-04-25 12:59:30 +0000 |
| commit | 6495a044575c01aee960c54e8a138ac51ed8a835 (patch) | |
| tree | bd4d4c36fa6e083ffb003874a5d0cae3bdc2dbf4 /linux-user/linuxload.c | |
| parent | e23886a91d954aac08b8b1dd0ff08ce4dbb842be (diff) | |
| download | qemu-6495a044575c01aee960c54e8a138ac51ed8a835.tar.gz | |
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 <rth@twiddle.net>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'linux-user/linuxload.c')
| -rw-r--r-- | linux-user/linuxload.c | 6 |
1 files changed, 1 insertions, 5 deletions
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' |