===================================================================
@@ -1,4 +1,4 @@
-70ceba5e95716653b9f829a457a44a829175d4da
+0e51b7e9c03c6f6bc3d06343f2050f17349ccdc3
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
===================================================================
@@ -65,7 +65,7 @@ static void gscanstack(G*);
#define __thread
#endif
-static __thread G *g;
+__thread G *g __asm__(GOSYM_PREFIX "runtime.g");
#ifndef SETCONTEXT_CLOBBERS_TLS
@@ -320,7 +320,7 @@ runtime_mcall(FuncVal *fv)
if(gp != nil) {
#ifdef USING_SPLIT_STACK
- __splitstack_getcontext((void*)(&g->stackcontext[0]));
+ __splitstack_getcontext((void*)(&gp->stackcontext[0]));
#else
// We have to point to an address on the stack that is
// below the saved registers.