Index: gcc/go/gofrontend/MERGE
===================================================================
--- gcc/go/gofrontend/MERGE	(revision 249575)
+++ gcc/go/gofrontend/MERGE	(working copy)
@@ -1,4 +1,4 @@
-27204e41643f4549c5ed97d48e17912f64c0aa71
+55b2b2dee55bd495a770347daaf858634057ecb0
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
Index: libgo/go/runtime/proc.go
===================================================================
--- libgo/go/runtime/proc.go	(revision 249565)
+++ libgo/go/runtime/proc.go	(working copy)
@@ -37,6 +37,9 @@ import (
 //go:linkname globrunqput runtime.globrunqput
 //go:linkname pidleget runtime.pidleget
 
+// Exported for test (see runtime/testdata/testprogcgo/dropm_stub.go).
+//go:linkname getm runtime.getm
+
 // Function called by misc/cgo/test.
 //go:linkname lockedOSThread runtime.lockedOSThread