[PULL for-8.1 0/1] revert "linux-user: Fix qemu-arm to run static armhf binaries"

[PULL for-8.1 0/1] revert "linux-user: Fix qemu-arm to run static armhf binaries"

[Michael Tokarev]

The following changes since commit 4ea3fa99bebe8f153e74cf625980183cfd2238f6:

  Revert "linux-user: Fix qemu-arm to run static armhf binaries" (2023-07-22 19:54:22 +0300)

are available in the Git repository at:

  https://gitlab.com/mjt0k/qemu.git/ tags/pull-revert-armhf-brk-fix

for you to fetch changes up to 4ea3fa99bebe8f153e74cf625980183cfd2238f6:

  Revert "linux-user: Fix qemu-arm to run static armhf binaries" (2023-07-22 19:54:22 +0300)

----------------------------------------------------------------
Revert "linux-user: Fix qemu-arm to run static armhf binaries"
----------------------------------------------------------------

Michael Tokarev (1):
  Revert "linux-user: Fix qemu-arm to run static armhf binaries"

 linux-user/elfload.c | 7 -------
 1 file changed, 7 deletions(-)

-- 
2.39.2

[PULL 1/1] Revert "linux-user: Fix qemu-arm to run static armhf binaries"

[Michael Tokarev]

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>
---
 linux-user/elfload.c | 7 -------
 1 file changed, 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.  */
-- 
2.39.2

Re: [PULL for-8.1 0/1] revert "linux-user: Fix qemu-arm to run static armhf binaries"

[Peter Maydell]

On Sat, 22 Jul 2023 at 17:59, Michael Tokarev <mjt@tls.msk.ru> wrote:
>
> The following changes since commit 4ea3fa99bebe8f153e74cf625980183cfd2238f6:
>
>   Revert "linux-user: Fix qemu-arm to run static armhf binaries" (2023-07-22 19:54:22 +0300)
>
> are available in the Git repository at:
>
>   https://gitlab.com/mjt0k/qemu.git/ tags/pull-revert-armhf-brk-fix
>
> for you to fetch changes up to 4ea3fa99bebe8f153e74cf625980183cfd2238f6:
>
>   Revert "linux-user: Fix qemu-arm to run static armhf binaries" (2023-07-22 19:54:22 +0300)
>
> ----------------------------------------------------------------
> Revert "linux-user: Fix qemu-arm to run static armhf binaries"
> ----------------------------------------------------------------
>
> Michael Tokarev (1):
>   Revert "linux-user: Fix qemu-arm to run static armhf binaries"
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/8.1
for any user-visible changes.

-- PMM