target/i386: Use env_cpu, env_archcpu

[mirror_qemu.git] / linux-user / flatload.c

diff --git a/linux-user/flatload.c b/linux-user/flatload.c
index 2eefe55e500059384dc4ee95aa39a803c47b4328..0122ab3afe65ce2113afb7d0f5e1532bd70bf3db 100644 (file)
--- a/linux-user/flatload.c
+++ b/linux-user/flatload.c
@@ -771,10 +771,10 @@ int load_flt_binary(struct linux_binprm *bprm, struct image_info *info)
     /* Enforce final stack alignment of 16 bytes.  This is sufficient
        for all current targets, and excess alignment is harmless.  */
     stack_len = bprm->envc + bprm->argc + 2;
-    stack_len += 3;    /* argc, arvg, argp */
+    stack_len += flat_argvp_envp_on_stack() ? 2 : 0; /* arvg, argp */
+    stack_len += 1; /* argc */
     stack_len *= sizeof(abi_ulong);
-    if ((sp + stack_len) & 15)
-        sp -= 16 - ((sp + stack_len) & 15);
+    sp -= (sp - stack_len) & 15;
     sp = loader_build_argptr(bprm->envc, bprm->argc, sp, p,
                              flat_argvp_envp_on_stack());