Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Revert "linux-user: Fix qemu-arm to run static armhf binaries"
This reverts commit 518f322.

It is causing similar segfaults at least on aarch64, ppc64el
and s390x. Let's revert this one for now and analyze what's
going on later.

Reopens: https://bugs.debian.org/1040981
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
  • Loading branch information
Michael Tokarev committed Jul 22, 2023
1 parent d1181d2 commit 4ea3fa9
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions linux-user/elfload.c
Expand Up @@ -3618,13 +3618,6 @@ int load_elf_binary(struct linux_binprm *bprm, struct image_info *info)

if (elf_interpreter) {
load_elf_interp(elf_interpreter, &interp_info, bprm->buf);
/*
* adjust brk address if the interpreter was loaded above the main
* executable, e.g. happens with static binaries on armhf
*/
if (interp_info.brk > info->brk) {
info->brk = interp_info.brk;
}

/* If the program interpreter is one of these two, then assume
an iBCS2 image. Otherwise assume a native linux image. */
Expand Down

0 comments on commit 4ea3fa9

Please sign in to comment.