aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-06-22 22:08:50 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-06-22 22:08:50 +0000
commitf384e12acc5b5b06d5fcc9a40ea6cffb8c0aa4c8 (patch)
tree1f81f46bd48db07f10c7abea72ccf21948f73a05
parent61fbdfbe1b1efc68dd02f03b0d915dc2ded0e076 (diff)
downloadgcc-f384e12acc5b5b06d5fcc9a40ea6cffb8c0aa4c8.zip
gcc-f384e12acc5b5b06d5fcc9a40ea6cffb8c0aa4c8.tar.gz
gcc-f384e12acc5b5b06d5fcc9a40ea6cffb8c0aa4c8.tar.bz2
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
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/go/runtime/proc.go3
2 files changed, 4 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index e3fcdb8..fb6b7be 100644
--- 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 cb1e974..bdf7144 100644
--- 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