aboutsummaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorFilippo Valsorda <filippo@golang.org>2021-02-24 15:49:21 +0100
committerFilippo Valsorda <filippo@golang.org>2021-02-24 15:49:21 +0100
commit03cd66617352fa0324cf5db90aedc6a6c1dff076 (patch)
tree5bd19d27221320dd2ce344d1eca16531f967948d /misc
parent0f210b75f9d8707f4e8a34ce23b778df33e9b501 (diff)
parent5b76343a1040571e3d2249168a00a4dc814e920a (diff)
downloadgo-03cd66617352fa0324cf5db90aedc6a6c1dff076.tar.xz
[dev.boringcrypto] all: merge master (5b76343) into dev.boringcrypto
Change-Id: I52c5b317a97c7723a7c077ae3cdfdc756fd3a1cf
Diffstat (limited to 'misc')
-rw-r--r--misc/cgo/test/callback.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/misc/cgo/test/callback.go b/misc/cgo/test/callback.go
index 814888e3ac..08dd9b39d8 100644
--- a/misc/cgo/test/callback.go
+++ b/misc/cgo/test/callback.go
@@ -182,7 +182,7 @@ func testCallbackCallers(t *testing.T) {
"runtime.cgocallbackg1",
"runtime.cgocallbackg",
"runtime.cgocallback",
- "runtime.asmcgocall",
+ "runtime.systemstack_switch",
"runtime.cgocall",
"test._Cfunc_callback",
"test.nestedCall.func1",