aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2018-01-11 19:58:55 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-01-11 19:58:55 +0000
commitfbea3c33e89371ae2ee633d645eaabdc4d9e7020 (patch)
treed05fcc4b41049751e0fc32fc5ec9d873f6c67497 /gcc/go
parentc5269263b072de87f9b4476ef87499e7408f7cd6 (diff)
downloadgcc-fbea3c33e89371ae2ee633d645eaabdc4d9e7020.zip
gcc-fbea3c33e89371ae2ee633d645eaabdc4d9e7020.tar.gz
gcc-fbea3c33e89371ae2ee633d645eaabdc4d9e7020.tar.bz2
re PR go/83794 (misc/cgo/test uses gigabytes of memory)
PR go/83794 misc/cgo/test: avoid endless loop when we can't parse notes Reviewed-on: https://go-review.googlesource.com/87416 From-SVN: r256553
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 2e8a992..35bebbb 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-1176dd2b53f2d2b826b599a126f3f9828283cec3
+fe8481db9f5b37eb9a0c329673789eaaf1335598
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.