diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 3576668188a3..bcc8136745de 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-00f87806635655339dbbca59e6ae2ea8231cf9b1
+17325c96ccbee4ad6bed1cd3d9517f7dfbdf3ea7
 
 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-fieldtrack.c b/libgo/runtime/go-fieldtrack.c
index 7be259e45054..4ac0a34ea243 100644
--- a/libgo/runtime/go-fieldtrack.c
+++ b/libgo/runtime/go-fieldtrack.c
@@ -46,7 +46,9 @@ extern void *mapassign (const struct __go_map_type *, void *hmap,
   __asm__ (GOSYM_PREFIX "runtime.mapassign");
 
 // The type descriptor for map[string] bool.  */
-extern const char __go_td_MN6_string__N4_bool[] __attribute__ ((weak));
+extern const char map_string_bool[] __attribute__ ((weak));
+extern const char map_string_bool[]
+  __asm__ (GOSYM_PREFIX "type..map.6string.7bool");
 
 void runtime_Fieldtrack (void *) __asm__ (GOSYM_PREFIX "runtime.Fieldtrack");
 
@@ -58,7 +60,7 @@ runtime_Fieldtrack (void *m)
   const char *prefix;
   size_t prefix_len;
 
-  if (__go_td_MN6_string__N4_bool == NULL)
+  if (map_string_bool == NULL)
     return;
 
   p = __data_start;
@@ -107,7 +109,7 @@ runtime_Fieldtrack (void *m)
 
 	  s.str = (const byte *) q1;
 	  s.len = q2 - q1;
-	  p = mapassign((const void*) __go_td_MN6_string__N4_bool, m, &s);
+	  p = mapassign((const void*) map_string_bool, m, &s);
 	  *(_Bool*)p = 1;
 	}