This libgo patch by Cherry Zhang changes the runtime to set up g
early.  runtime.throw needs a g to work properly.  Set up g early, to
ensure that if something goes wrong in the runtime startup (e.g.
runtime.check fails), the program terminates in a reasonable way.
Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu.  Committed
to mainline.

Ian
Index: gcc/go/gofrontend/MERGE
===================================================================
--- gcc/go/gofrontend/MERGE     (revision 271074)
+++ gcc/go/gofrontend/MERGE     (working copy)
@@ -1,4 +1,4 @@
-76ab85364745e445498fe53f9ca8e37b49650779
+5c2c4743980556c041561533ef31762f524737ca
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
Index: libgo/go/runtime/proc.go
===================================================================
--- libgo/go/runtime/proc.go    (revision 270877)
+++ libgo/go/runtime/proc.go    (working copy)
@@ -18,6 +18,7 @@ import (
 //go:linkname acquirep runtime.acquirep
 //go:linkname releasep runtime.releasep
 //go:linkname incidlelocked runtime.incidlelocked
+//go:linkname ginit runtime.ginit
 //go:linkname schedinit runtime.schedinit
 //go:linkname ready runtime.ready
 //go:linkname stopm runtime.stopm
@@ -515,6 +516,15 @@ func cpuinit() {
        cpu.Initialize(env)
 }
 
+func ginit() {
+       _m_ := &m0
+       _g_ := &g0
+       _m_.g0 = _g_
+       _m_.curg = _g_
+       _g_.m = _m_
+       setg(_g_)
+}
+
 // The bootstrap sequence is:
 //
 //     call osinit
@@ -524,13 +534,7 @@ func cpuinit() {
 //
 // The new G calls runtimeĀ·main.
 func schedinit() {
-       _m_ := &m0
-       _g_ := &g0
-       _m_.g0 = _g_
-       _m_.curg = _g_
-       _g_.m = _m_
-       setg(_g_)
-
+       _g_ := getg()
        sched.maxmcount = 10000
 
        usestackmaps = probestackmaps()
Index: libgo/runtime/go-libmain.c
===================================================================
--- libgo/runtime/go-libmain.c  (revision 270877)
+++ libgo/runtime/go-libmain.c  (working copy)
@@ -225,6 +225,7 @@ gostart (void *arg)
     return NULL;
   runtime_isstarted = true;
 
+  runtime_ginit ();
   runtime_check ();
   runtime_args (a->argc, (byte **) a->argv);
   setncpu (getproccount ());
Index: libgo/runtime/go-main.c
===================================================================
--- libgo/runtime/go-main.c     (revision 270877)
+++ libgo/runtime/go-main.c     (working copy)
@@ -48,6 +48,7 @@ main (int argc, char **argv)
     setIsCgo ();
 
   __go_end = (uintptr)_end;
+  runtime_ginit ();
   runtime_cpuinit ();
   runtime_check ();
   runtime_args (argc, (byte **) argv);
Index: libgo/runtime/runtime.h
===================================================================
--- libgo/runtime/runtime.h     (revision 270877)
+++ libgo/runtime/runtime.h     (working copy)
@@ -240,6 +240,8 @@ int32       runtime_snprintf(byte*, int32, con
 #define runtime_memmove(a, b, s) __builtin_memmove((a), (b), (s))
 String runtime_gostringnocopy(const byte*)
   __asm__ (GOSYM_PREFIX "runtime.gostringnocopy");
+void   runtime_ginit(void)
+  __asm__ (GOSYM_PREFIX "runtime.ginit");
 void   runtime_schedinit(void)
   __asm__ (GOSYM_PREFIX "runtime.schedinit");
 void   runtime_initsig(bool)

Reply via email to