diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2023-07-24 11:34:08 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2023-07-24 11:34:08 +0100 |
| commit | a74e39f67462a5b4897e95c1ed1d42598b448362 (patch) | |
| tree | e48320be70a69381b48567ccec6acd0f2773eb80 | |
| parent | c5216b69545ec391c6099a0816fc537c49ad0063 (diff) | |
| parent | 4ea3fa99bebe8f153e74cf625980183cfd2238f6 (diff) | |
| download | qemu-a74e39f67462a5b4897e95c1ed1d42598b448362.zip qemu-a74e39f67462a5b4897e95c1ed1d42598b448362.tar.gz qemu-a74e39f67462a5b4897e95c1ed1d42598b448362.tar.bz2 | |
Merge tag 'pull-revert-armhf-brk-fix' of https://gitlab.com/mjt0k/qemu into staging
Revert "linux-user: Fix qemu-arm to run static armhf binaries"
# -----BEGIN PGP SIGNATURE-----
#
# iQFDBAABCAAtFiEEe3O61ovnosKJMUsicBtPaxppPlkFAmS8Cj4PHG1qdEB0bHMu
# bXNrLnJ1AAoJEHAbT2saaT5ZLdsH/A7uTAODHopQnUGySPpHAT9uPjf6A21eZnnE
# MAcd3w+iEnrleJbpSftaZfKBKEUEN/vPPXg8nfCxhtfvgWUoHlglR3EoeTU+viFG
# cW7YO2LG9EbITL62uWDM6blVJzh7OHq+IjUf9xYuErnpREyXMvmGGAlRRjAN2yUz
# 3TMQ35JBNuSay2hwvC12jj4AqsmCEFBxvUiJkrrQTFeCVa+Gj/A9xoH7NWSrkW5F
# YE1qIfc2lCQFuWag3+Iag1PtTmj4oeW2LmLCJpxc75XnRqcl7MKK2mNhNJ012kun
# YZtySEG35t4x4Pyf11dhydtv4fbe5K+L0OjMf444zzEcW7TJ840=
# =Cp7j
# -----END PGP SIGNATURE-----
# gpg: Signature made Sat 22 Jul 2023 17:56:30 BST
# gpg: using RSA key 7B73BAD68BE7A2C289314B22701B4F6B1A693E59
# gpg: issuer "mjt@tls.msk.ru"
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>" [full]
# gpg: aka "Michael Tokarev <mjt@corpit.ru>" [full]
# gpg: aka "Michael Tokarev <mjt@debian.org>" [full]
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5
# Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931 4B22 701B 4F6B 1A69 3E59
* tag 'pull-revert-armhf-brk-fix' of https://gitlab.com/mjt0k/qemu:
Revert "linux-user: Fix qemu-arm to run static armhf binaries"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | linux-user/elfload.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 88c6861..861ec07 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. */ |