Skip to content

Bump gVisor build tags to go1.20 #7252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/gohacks/gohacks_unsafe.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build go1.13 && !go1.19
// +build go1.13,!go1.19
//go:build go1.13 && !go1.20
// +build go1.13,!go1.20

// //go:linkname directives type-checked by checklinkname. Any other
// non-linkname assumptions outside the Go 1 compatibility guarantee should
Expand Down
4 changes: 2 additions & 2 deletions pkg/goid/goid.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build go1.12 && !go1.19
// +build go1.12,!go1.19
//go:build go1.12 && !go1.20
// +build go1.12,!go1.20

// Check type signatures when updating Go version.

Expand Down
4 changes: 2 additions & 2 deletions pkg/procid/procid_amd64.s
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build amd64 && go1.8 && !go1.19 && go1.1
// +build amd64,go1.8,!go1.19,go1.1
//go:build amd64 && go1.8 && !go1.20 && go1.1
// +build amd64,go1.8,!go1.20,go1.1

// //go:linkname directives type-checked by checklinkname. Any other
// non-linkname assumptions outside the Go 1 compatibility guarantee should
Expand Down
4 changes: 2 additions & 2 deletions pkg/procid/procid_arm64.s
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build arm64 && go1.8 && !go1.19 && go1.1
// +build arm64,go1.8,!go1.19,go1.1
//go:build arm64 && go1.8 && !go1.20 && go1.1
// +build arm64,go1.8,!go1.20,go1.1

// //go:linkname directives type-checked by checklinkname. Any other
// non-linkname assumptions outside the Go 1 compatibility guarantee should
Expand Down
4 changes: 2 additions & 2 deletions pkg/sync/mutex_unsafe.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:build go1.13 && !go1.19
// +build go1.13,!go1.19
//go:build go1.13 && !go1.20
// +build go1.13,!go1.20

// When updating the build constraint (above), check that syncMutex matches the
// standard library sync.Mutex definition.
Expand Down
4 changes: 2 additions & 2 deletions pkg/sync/runtime_amd64.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:build amd64 && go1.8 && !go1.19 && !goexperiment.staticlockranking
// +build amd64,go1.8,!go1.19,!goexperiment.staticlockranking
//go:build amd64 && go1.8 && !go1.20 && !goexperiment.staticlockranking
// +build amd64,go1.8,!go1.20,!goexperiment.staticlockranking

package sync

Expand Down
4 changes: 2 additions & 2 deletions pkg/sync/runtime_amd64.s
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build amd64 && go1.8 && !go1.19 && !goexperiment.staticlockranking
// +build amd64,go1.8,!go1.19,!goexperiment.staticlockranking
//go:build amd64 && go1.14 && !go1.20 && !goexperiment.staticlockranking
// +build amd64,go1.14,!go1.20,!goexperiment.staticlockranking

#include "textflag.h"

Expand Down
4 changes: 2 additions & 2 deletions pkg/sync/runtime_unsafe.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:build go1.13 && !go1.19
// +build go1.13,!go1.19
//go:build go1.13 && !go1.20
// +build go1.13,!go1.20

// //go:linkname directives type-checked by checklinkname. Any other
// non-linkname assumptions outside the Go 1 compatibility guarantee should
Expand Down