aboutsummaryrefslogtreecommitdiff
path: root/linux-user/elfload.c
diff options
context:
space:
mode:
authorMichael Tokarev <mjt@tls.msk.ru>2023-07-22 19:54:22 +0300
committerMichael Tokarev <mjt@tls.msk.ru>2023-07-22 19:54:22 +0300
commit4ea3fa99bebe8f153e74cf625980183cfd2238f6 (patch)
treec970ccafed31c09ab4f01387596cd2dec1d263e8 /linux-user/elfload.c
parentd1181d29370a4318a9f11ea92065bea6bb159f83 (diff)
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>
Diffstat (limited to 'linux-user/elfload.c')
-rw-r--r--linux-user/elfload.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 88c6861d7d..861ec07abc 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -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. */