From c9edeca8b88d20afa80143302be64e2e625e707a Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Wed, 10 Jan 2018 15:04:21 +0000
Subject: runtime: fix makemap calls in __go_construct_map

    The signature of makemap changed with the update to 1.10beta1,
    but I forgot to update the call from C code.

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

From-SVN: r256431
---
 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 18c23cf..6f8fa9c 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-c18c6bd80e0995827ad3396eb1c2401451de88fd
+c22eb29a62b4fd72ad2ea09ebe5fcea5b8ed78b8
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
-- 
cgit v1.1