From: Russ Cox <rsc@golang.org>
Date: Wed, 27 May 2009 00:13:39 +0000 (-0700)
Subject: 32-bit stack switching bug fix
X-Git-Tag: weekly.2009-11-06~1539
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=5273868f6748bd5cba2eb01efc599994b7d068b0;p=gostls13.git

32-bit stack switching bug fix

R=ken
OCL=29412
CL=29412
---

diff --git a/src/runtime/386/asm.s b/src/runtime/386/asm.s
index 9dd9c11a98..b7138105f7 100644
--- a/src/runtime/386/asm.s
+++ b/src/runtime/386/asm.s
@@ -135,7 +135,7 @@ TEXT setspgoto(SB), 7, $0
 	MOVL	AX, SP
 	PUSHL	CX
 	JMP	BX
-	POPL	AX
+	POPL	AX	// not reached
 	RET
 
 // bool cas(int32 *val, int32 old, int32 new)
diff --git a/src/runtime/proc.c b/src/runtime/proc.c
index d52adf94c0..d51a6c013e 100644
--- a/src/runtime/proc.c
+++ b/src/runtime/proc.c
@@ -705,7 +705,7 @@ newstack(void)
 
 #pragma textflag 7
 void
-sys·morestack(uint64 u)
+sys·morestack(uintptr u)
 {
 	while(g == m->g0) {
 		// very bad news