diff --git a/pkg/sync/BUILD b/pkg/sync/BUILD index 9ec511648f..be7c9f6f59 100644 --- a/pkg/sync/BUILD +++ b/pkg/sync/BUILD @@ -27,6 +27,7 @@ go_library( "runtime.go", "runtime_amd64.go", "runtime_constants_go125.go", + "runtime_constants_go126.go", "runtime_constants_not_go125.go", "runtime_exectracer2.go", "runtime_go121_unsafe.go", diff --git a/pkg/sync/runtime_constants_go126.go b/pkg/sync/runtime_constants_go126.go new file mode 100644 index 0000000000..da9bd18127 --- /dev/null +++ b/pkg/sync/runtime_constants_go126.go @@ -0,0 +1,25 @@ +// Copyright 2023 The gVisor Authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// https://go.dev/cl/688335 (1.26) reorders waitreason runtime constants, adjusting the values of waitReasonSemacquire et al. +//go:build go1.26 + +package sync + +// Values for the reason argument to gopark, from Go's src/runtime/runtime2.go. +const ( + WaitReasonSelect uint8 = 18 // +checkconst runtime waitReasonSelect + WaitReasonChanReceive uint8 = 19 // +checkconst runtime waitReasonChanReceive + WaitReasonSemacquire uint8 = 13 // +checkconst runtime waitReasonSemacquire +) diff --git a/pkg/sync/runtime_constants_not_go125.go b/pkg/sync/runtime_constants_not_go125.go index b27a8997de..9c50da2d6e 100644 --- a/pkg/sync/runtime_constants_not_go125.go +++ b/pkg/sync/runtime_constants_not_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/688335 (1.26) reorders waitreason runtime constants, adjusting the values of waitReasonSemacquire et al. +//go:build !go1.25 && !go1.26 package sync