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/elfload32.c | |
parent | e23886a91d954aac08b8b1dd0ff08ce4dbb842be (diff) | |
download | hqemu-6495a044575c01aee960c54e8a138ac51ed8a835.zip hqemu-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/elfload32.c')
-rw-r--r-- | linux-user/elfload32.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/linux-user/elfload32.c b/linux-user/elfload32.c deleted file mode 100644 index 4b4648c..0000000 --- a/linux-user/elfload32.c +++ /dev/null @@ -1,30 +0,0 @@ -#define TARGET_ABI32 -#define load_elf_binary load_elf_binary32 -#define do_init_thread do_init_thread32 - -#include "elfload.c" - -#undef load_elf_binary -#undef do_init_thread - -int load_elf_binary(struct linux_binprm *bprm, struct target_pt_regs *regs, - struct image_info *info); - -int load_elf_binary_multi(struct linux_binprm *bprm, - struct target_pt_regs *regs, - struct image_info *info) -{ - struct elfhdr *elf_ex; - int retval; - - elf_ex = (struct elfhdr *) bprm->buf; /* exec-header */ - if (elf_ex->e_ident[EI_CLASS] == ELFCLASS64) { - retval = load_elf_binary(bprm, regs, info); - } else { - retval = load_elf_binary32(bprm, regs, info); - if (personality(info->personality) == PER_LINUX) - info->personality = PER_LINUX32; - } - - return retval; -} |