diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 18c23cf86fb..6f8fa9c4d0d 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.
diff --git a/libgo/runtime/go-construct-map.c b/libgo/runtime/go-construct-map.c
index 9a48d5733ea..0e71ba93aa2 100644
--- a/libgo/runtime/go-construct-map.c
+++ b/libgo/runtime/go-construct-map.c
@@ -11,8 +11,8 @@
 #include "runtime.h"
 #include "go-type.h"
 
-extern void *makemap (const struct __go_map_type *, int64_t hint,
-		      void *, void *)
+extern void *makemap (const struct __go_map_type *, intgo hint,
+		      void *)
   __asm__ (GOSYM_PREFIX "runtime.makemap");
 
 extern void *mapassign (const struct __go_map_type *, void *hmap,
@@ -29,7 +29,7 @@ __go_construct_map (const struct __go_map_type *type,
   uintptr_t i;
   void *p;
 
-  ret = makemap(type, (int64_t) count, NULL, NULL);
+  ret = makemap(type, (intgo) count, NULL);
 
   entries = (const unsigned char *) ventries;
   for (i = 0; i < count; ++i)