diff -r 7f23829c36dc libgo/runtime/proc.c
--- a/libgo/runtime/proc.c	Mon Jul 15 23:35:05 2013 -0700
+++ b/libgo/runtime/proc.c	Tue Jul 16 08:43:21 2013 -0700
@@ -1666,7 +1666,11 @@
 				       &g->gcnext_segment, &g->gcnext_sp,
 				       &g->gcinitial_sp);
 #else
-	g->gcnext_sp = (byte *) &v;
+	{
+		uint32 v;
+
+		g->gcnext_sp = (byte *) &v;
+	}
 #endif
 
 	// Save the registers in the g structure so that any pointers
@@ -1713,7 +1717,7 @@
 				       &g->gcnext_segment, &g->gcnext_sp,
 				       &g->gcinitial_sp);
 #else
-	g->gcnext_sp = (byte *) &v;
+	g->gcnext_sp = (byte *) &p;
 #endif
 
 	// Save the registers in the g structure so that any pointers