From 85ded85b78e881d826ed5a2e0cc1dcff8af71142 Mon Sep 17 00:00:00 2001 From: Adin Scannell Date: Wed, 8 Feb 2023 19:15:23 +0000 Subject: [PATCH] [release-branch.go1.20] runtime: fix signature for linked functions These functions are linked using go:linkname, but do not match the original declarations. This change brings these in sync. For #58442. Change-Id: I16651304c3dba2f9897c2c42e30555d2f7805c2a Reviewed-on: https://go-review.googlesource.com/c/go/+/466615 Reviewed-by: Michael Pratt Run-TryBot: Michael Pratt TryBot-Result: Gopher Robot Auto-Submit: Michael Pratt (cherry picked from commit 8fb9565832e6dbacaaa057ffabc251a9341f8d23) Reviewed-on: https://go-review.googlesource.com/c/go/+/466859 Reviewed-by: Ian Lance Taylor Reviewed-by: Austin Clements --- src/internal/poll/fd_poll_runtime.go | 2 +- src/sync/atomic/value.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/internal/poll/fd_poll_runtime.go b/src/internal/poll/fd_poll_runtime.go index 4d3cc78405..0a2e76d73f 100644 --- a/src/internal/poll/fd_poll_runtime.go +++ b/src/internal/poll/fd_poll_runtime.go @@ -23,7 +23,7 @@ func runtime_pollServerInit() func runtime_pollOpen(fd uintptr) (uintptr, int) func runtime_pollClose(ctx uintptr) func runtime_pollWait(ctx uintptr, mode int) int -func runtime_pollWaitCanceled(ctx uintptr, mode int) int +func runtime_pollWaitCanceled(ctx uintptr, mode int) func runtime_pollReset(ctx uintptr, mode int) int func runtime_pollSetDeadline(ctx uintptr, d int64, mode int) func runtime_pollUnblock(ctx uintptr) diff --git a/src/sync/atomic/value.go b/src/sync/atomic/value.go index 8c491b4616..a57b08a6b8 100644 --- a/src/sync/atomic/value.go +++ b/src/sync/atomic/value.go @@ -190,5 +190,5 @@ func (v *Value) CompareAndSwap(old, new any) (swapped bool) { } // Disable/enable preemption, implemented in runtime. -func runtime_procPin() +func runtime_procPin() int func runtime_procUnpin() -- 2.48.1