9os

commit 6ac1693c0e295333e45065c1cb5af55a62ee0b1c
parent 35fadba85fff514859f57d63b2879fb04d68227f
Author: Dimitris Papastamos <dimitris.papastamos@arm.com>
Date:   Thu, 22 Nov 2018 10:42:49 +0000

Merge "[arch/amd64] Fix environ"
Diffstat:
M
arch/amd64/crt.s
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/amd64/crt.s b/arch/amd64/crt.s
@@ -29,7 +29,7 @@ _start:
 	/* load argc, argv, envp from stack */
 	movq	(%rbp),%rdi             /* argc */
 	leaq	8(%rbp),%rsi            /* argv */
-	leaq	16(%rbp,%rax,8),%rcx    /* envp = argv + 8*argc + 8 */
+	leaq	16(%rbp,%rdi,8),%rdx    /* envp = argv + 8*argc + 8 */
 	movq	%rdx,_environ
 
 	call	main