From: Andrew Gerrand <adg@golang.org>
Date: Mon, 11 Aug 2014 23:29:29 +0000 (+1000)
Subject: [release-branch.go1.3] runtime: fix nacl amd64p32 flakiness
X-Git-Tag: go1.3.1~13
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=0752bc8f26dffccbe536aaa7a5131ca26477c0d6;p=gostls13.git

[release-branch.go1.3] runtime: fix nacl amd64p32 flakiness

««« CL 102710043 / 5640e19d768d
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
»»»

TBR=rsc
CC=golang-codereviews
https://golang.org/cl/124120044
---

diff --git a/src/pkg/runtime/traceback_x86.c b/src/pkg/runtime/traceback_x86.c
index 851504f529..7359cfcc96 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