aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-09-20 00:33:29 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-09-20 00:33:29 +0000
commit8fca13953b551bb75af0a31d737a297de97676a7 (patch)
treee54ea762823ee955d7cd3ef3ae2b8bd4e97b5cf9 /gcc/go
parent9bd25fc4e2119dd08257f7326c7115c4371f98df (diff)
downloadgcc-8fca13953b551bb75af0a31d737a297de97676a7.zip
gcc-8fca13953b551bb75af0a31d737a297de97676a7.tar.gz
gcc-8fca13953b551bb75af0a31d737a297de97676a7.tar.bz2
runtime: restore "goroutine in C code" message
In the 1.9 upgrade I took out the word "goroutine" from a traceback showing a goroutine running in C code, to let TestCgoNumGoroutine pass. However, it turns out that some code is actually checking for that string; for example, https://github.com/grpc/grpc-go/blob/master/test/leakcheck/leakcheck.go#L44 So keep the message the same, and change the test. Reviewed-on: https://go-review.googlesource.com/64850 From-SVN: r252991
Diffstat (limited to 'gcc/go')
-rw-r--r--gcc/go/gofrontend/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 27bcb6e..f6b5361 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-be69546afcac182cc93c569bc96665f0ef72d66a
+5fb74cd7192123a9ea06dcae0d5d8d0b3538db8f
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.