Merge tag 'upstream/1.1.2' into debian-sid

Upstream version 1.1.2

1 files changed, 4 insertions, 0 deletions

diff --git a/misc/cgo/test/callback.go b/misc/cgo/test/callback.go
index b6e2e3c1c..c642d5f0f 100644
--- a/misc/cgo/test/callback.go
+++ b/misc/cgo/test/callback.go
@@ -142,6 +142,10 @@ func testBlocking(t *testing.T) {
 // Test that the stack can be unwound through a call out and call back
 // into Go.
 func testCallbackCallers(t *testing.T) {
+	if runtime.Compiler != "gc" {
+		// The exact function names are not going to be the same.
+		t.Skip("skipping for non-gc toolchain")
+	}
 	pc := make([]uintptr, 100)
 	n := 0
 	name := []string{