From: ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 22 Jun 2017 22:12:50 +0000 (+0000)
Subject:     runtime: uncomment check for gchelper on g0 stack
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c61088bf6da8824d3dc784842ac51b7481bf9d4;p=thirdparty%2Fgcc.git

runtime: uncomment check for gchelper on g0 stack

    Now that systemstack changes to the g0 stack, this check passes.

    Reviewed-on: https://go-review.googlesource.com/46460


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@249578 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 3f42df630569..b6037a68150f 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-c5aa42107d116c9121de447d214297c88dd9f5fa
+385efb8947af70b8425c833a1ab68ba5f357dfae
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/go/runtime/mgc.go b/libgo/go/runtime/mgc.go
index ebb00e155d02..a4fc2be803c8 100644
--- a/libgo/go/runtime/mgc.go
+++ b/libgo/go/runtime/mgc.go
@@ -1923,10 +1923,9 @@ func gchelperstart() {
 	if _g_.m.helpgc < 0 || _g_.m.helpgc >= _MaxGcproc {
 		throw("gchelperstart: bad m->helpgc")
 	}
-	// For gccgo we run gchelper on the normal g stack.
-	// if _g_ != _g_.m.g0 {
-	// 	throw("gchelper not running on g0 stack")
-	// }
+	if _g_ != _g_.m.g0 {
+		throw("gchelper not running on g0 stack")
+	}
 }
 
 // itoaDiv formats val/(10**dec) into buf.