From fbea3c33e89371ae2ee633d645eaabdc4d9e7020 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Thu, 11 Jan 2018 19:58:55 +0000
Subject: 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
---
 gcc/go/gofrontend/MERGE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc/go')

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.
-- 
cgit v1.1