From ecdf8459ce8b5f256ba05e6b0d0acde9d9781c59 Mon Sep 17 00:00:00 2001 From: Koichi Shiraishi Date: Wed, 17 Dec 2025 23:44:03 +0900 Subject: [PATCH] sync: fix go1.26 build constraints Signed-off-by: Koichi Shiraishi --- pkg/sync/runtime_constants_go125.go | 3 ++- pkg/sync/runtime_spinning_amd64.s | 3 +-- pkg/sync/runtime_spinning_go126_amd64.s | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/sync/runtime_constants_go125.go b/pkg/sync/runtime_constants_go125.go index 1dcd70cfe3..cbcee85abc 100644 --- a/pkg/sync/runtime_constants_go125.go +++ b/pkg/sync/runtime_constants_go125.go @@ -13,7 +13,8 @@ // limitations under the License. // https://go.dev/cl/670497 (1.25) adds a new wait reason, adjusting the value of waitReasonSemacquire. -//go:build go1.25 +// https://go.dev/cl/714800 (1.26) changes size of the schedt.midle field. +//go:build go1.25 && !go1.26 package sync diff --git a/pkg/sync/runtime_spinning_amd64.s b/pkg/sync/runtime_spinning_amd64.s index 71da8ba694..b238c8dd0d 100644 --- a/pkg/sync/runtime_spinning_amd64.s +++ b/pkg/sync/runtime_spinning_amd64.s @@ -13,8 +13,7 @@ // limitations under the License. // https://go.dev/cl/669235 (1.25) adds a new schedt field prior to nmspinning. -// https://go.dev/cl/714800 (1.26) changes size of the schedt.midle field. -//go:build amd64 && !go1.25 && !go1.26 +//go:build amd64 && !go1.25 #include "textflag.h" diff --git a/pkg/sync/runtime_spinning_go126_amd64.s b/pkg/sync/runtime_spinning_go126_amd64.s index c7e6f32323..173cc07424 100644 --- a/pkg/sync/runtime_spinning_go126_amd64.s +++ b/pkg/sync/runtime_spinning_go126_amd64.s @@ -12,9 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// https://go.dev/cl/669235 (1.25) adds a new schedt field prior to nmspinning. // https://go.dev/cl/714800 (1.26) changes size of the schedt.midle field. -//go:build amd64 && go1.25 && go1.26 +//go:build amd64 && go1.26 #include "textflag.h"