summaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2019-11-21 01:06:47 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2019-11-21 01:06:47 +0000
commitb4b7464b57190287cb1bfc5eb56f63148a508f0c (patch)
tree57815f6863346324fa074231896232fe07351a9e /gcc/go
parent025f56b7d3061631ce5210520beb0cb7d2764e47 (diff)
re PR go/92605 (r278509 causes/reveals issue in building go library)
PR go/92605 runtime: declare runtime_usestackmaps in stack.c, not runtime.h Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/208161 From-SVN: r278540
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 7050d78103e..27e74e5cf68 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-9cc7092b84c38d77d98ed856f1f613a6ca27122d
+017830d2a4bd2efbddf5e841ba9ccff8acf9d7c8
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.