From: Dave Cheney <dave@cheney.net>
Date: Mon, 3 Mar 2014 23:36:04 +0000 (+1100)
Subject: runtime: update CBARGS macro for nacl/amd64p32
X-Git-Tag: go1.3beta1~508
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=13ab78fdd995cf328c341d86cdcffd154e3441b7;p=gostls13.git

runtime: update CBARGS macro for nacl/amd64p32

CBARGS is unused on amd64p32 so make this explicit.

LGTM=bradfitz
R=rsc, bradfitz
CC=golang-codereviews
https://golang.org/cl/70940043
---

diff --git a/src/pkg/runtime/cgocall.c b/src/pkg/runtime/cgocall.c
index 9f8db3ae09..b61cc904c1 100644
--- a/src/pkg/runtime/cgocall.c
+++ b/src/pkg/runtime/cgocall.c
@@ -223,10 +223,9 @@ struct CallbackArgs
 #define CBARGS (CallbackArgs*)((byte*)m->g0->sched.sp+2*sizeof(void*))
 #endif
 
-// There is no cgo support for nacl/amd64p32 but we need to have something here 
-// so use the amd64 value as a placeholder.
+// Unimplemented on amd64p32
 #ifdef GOARCH_amd64p32
-#define CBARGS (CallbackArgs*)((byte*)m->g0->sched.sp+2*sizeof(void*))
+#define CBARGS (CallbackArgs*)(nil)
 #endif
 
 // On 386, stack frame is three words, plus caller PC.