From: Russ Cox <rsc@golang.org>
Date: Sat, 28 Jun 2014 00:13:16 +0000 (-0400)
Subject: runtime: fix nacl amd64p32 flakiness
X-Git-Tag: go1.4beta1~1206
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=84a36434d92e18eb12d8a86770bdb4936dff4703;p=gostls13.git

runtime: fix nacl amd64p32 flakiness

newproc takes two extra pointers, not two extra registers.
On amd64p32 (nacl) they are different.

We diagnosed this before the 1.3 cut but the tree was frozen.
I believe this is causing the random problems on the builder.

Fixes #8199.

TBR=r
CC=golang-codereviews
https://golang.org/cl/102710043
---

diff --git a/src/pkg/runtime/traceback_x86.c b/src/pkg/runtime/traceback_x86.c
index f21469ba59..0ecaecf9cf 100644
--- a/src/pkg/runtime/traceback_x86.c
+++ b/src/pkg/runtime/traceback_x86.c
@@ -214,7 +214,7 @@ runtime·gentraceback(uintptr pc0, uintptr sp0, uintptr lr0, G *gp, int32 skip,
 		// the SP is two words lower than normal.
 		sparg = frame.sp;
 		if(wasnewproc)
-			sparg += 2*sizeof(uintreg);
+			sparg += 2*sizeof(uintptr);
 
 		// Determine frame's 'continuation PC', where it can continue.
 		// Normally this is the return address on the stack, but if sigpanic