[v2] linux-user: Split up elfload.c

[PATCH v2 28/95] linux-user/arm: Remove a.out startup remenents

Posted by Richard Henderson 3 months, 2 weeks ago

The setting of r1/r2 was removed in kernel commit acfdd4b1f7590d0
("ARM: 7791/1: a.out: remove partial a.out support"), and the
kernel commit message explains the history.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 linux-user/arm/cpu_loop.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c
index 739e1607e3..9aeb9b0087 100644
--- a/linux-user/arm/cpu_loop.c
+++ b/linux-user/arm/cpu_loop.c
@@ -492,10 +492,6 @@ void init_main_thread(CPUState *cs, struct image_info *info)
     env->regs[15] = entry & 0xfffffffe;
     env->regs[13] = stack;
 
-    /* FIXME - what to for failure of get_user()? */
-    get_user_ual(env->regs[2], stack + 8); /* envp */
-    get_user_ual(env->regs[1], stack + 4); /* envp */
-
     /*
      * Per the SVR4 ABI, r0 contains a pointer to a function to be
      * registered with atexit.  A value of 0 means we have no such handler.
-- 
2.43.0

Re: [PATCH v2 28/95] linux-user/arm: Remove a.out startup remenents

Posted by Peter Maydell 3 months, 1 week ago

On Sun, 3 Aug 2025 at 00:11, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> The setting of r1/r2 was removed in kernel commit acfdd4b1f7590d0
> ("ARM: 7791/1: a.out: remove partial a.out support"), and the
> kernel commit message explains the history.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>  linux-user/arm/cpu_loop.c | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c
> index 739e1607e3..9aeb9b0087 100644
> --- a/linux-user/arm/cpu_loop.c
> +++ b/linux-user/arm/cpu_loop.c
> @@ -492,10 +492,6 @@ void init_main_thread(CPUState *cs, struct image_info *info)
>      env->regs[15] = entry & 0xfffffffe;
>      env->regs[13] = stack;
>
> -    /* FIXME - what to for failure of get_user()? */
> -    get_user_ual(env->regs[2], stack + 8); /* envp */
> -    get_user_ual(env->regs[1], stack + 4); /* envp */
> -
>      /*
>       * Per the SVR4 ABI, r0 contains a pointer to a function to be
>       * registered with atexit.  A value of 0 means we have no such handler.
> --
> 2.43.0

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM