Revert "linux-user: Fix qemu-arm to run static armhf binaries"
This reverts commit 518f32221af759a29500ac172c4c857bef142067. 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>
This commit is contained in:
parent
d1181d2937
commit
4ea3fa99be
@ -3618,13 +3618,6 @@ int load_elf_binary(struct linux_binprm *bprm, struct image_info *info)
|
|||||||
|
|
||||||
if (elf_interpreter) {
|
if (elf_interpreter) {
|
||||||
load_elf_interp(elf_interpreter, &interp_info, bprm->buf);
|
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
|
/* If the program interpreter is one of these two, then assume
|
||||||
an iBCS2 image. Otherwise assume a native linux image. */
|
an iBCS2 image. Otherwise assume a native linux image. */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user