runtime: export getm function

    Use go:linkname to export the getm function. This makes it visible to
    runtime/testdata/testprogcgo/dropm_stub.go, which uses it as part of
    the TestEnsureDropM test in runtime/crash_cgo_test.go. That test is
    not run today, but it will be soon.

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

From-SVN: r249576

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index e3fcdb8cc2f70ac5203858ba7e9cd536f17aa9bc..fb6b7be02c10506f205664ea41658c24e83b4ddc 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -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.

diff --git a/libgo/go/runtime/proc.go b/libgo/go/runtime/proc.go
index cb1e974eb53613a3fbd1a4ad93f8d6985323f561..bdf7144ee0c63272adbe1c291184d2a9823cc4b4 100644 (file)
--- a/libgo/go/runtime/proc.go
+++ b/libgo/go/runtime/proc.go
@@ -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