diff options
| author | Michael Pratt <mpratt@google.com> | 2021-08-05 15:22:28 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-08-05 15:25:00 -0700 |
| commit | 99325baf5dfc23e54aea3acf8aaabb1996f5338e (patch) | |
| tree | 7c97fd8ba1e92e72d6d85ba832fe9530d5f121eb | |
| parent | caf9403f62fd59698dd3d5ae1596c8cbe472397b (diff) | |
Bump gVisor build tags to go1.19
Go's dev.typeparams branch already claims to be Go 1.18, so our !go1.18 build
tags breaking testing gVisor with that branch.
Normally I would not want to bump the build tags this early, but I plan to
extend checklinkname to check the assumptions in these files and remove the
build tags ASAP. So we just go ahead and bump the tags until then to unblock
testing.
PiperOrigin-RevId: 389037239
| -rw-r--r-- | pkg/gohacks/gohacks_unsafe.go | 4 | ||||
| -rw-r--r-- | pkg/goid/goid.go | 4 | ||||
| -rw-r--r-- | pkg/procid/procid_amd64.s | 4 | ||||
| -rw-r--r-- | pkg/procid/procid_arm64.s | 4 | ||||
| -rw-r--r-- | pkg/sync/mutex_unsafe.go | 4 | ||||
| -rw-r--r-- | pkg/sync/runtime_unsafe.go | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/pkg/gohacks/gohacks_unsafe.go b/pkg/gohacks/gohacks_unsafe.go index bd8ceba19..a055b3e8d 100644 --- a/pkg/gohacks/gohacks_unsafe.go +++ b/pkg/gohacks/gohacks_unsafe.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build go1.13 && !go1.18 -// +build go1.13,!go1.18 +//go:build go1.13 && !go1.19 +// +build go1.13,!go1.19 // //go:linkname directives type-checked by checklinkname. Any other // non-linkname assumptions outside the Go 1 compatibility guarantee should diff --git a/pkg/goid/goid.go b/pkg/goid/goid.go index 85fb2f6d4..0887f79ab 100644 --- a/pkg/goid/goid.go +++ b/pkg/goid/goid.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build go1.12 && !go1.18 -// +build go1.12,!go1.18 +//go:build go1.12 && !go1.19 +// +build go1.12,!go1.19 // Check type signatures when updating Go version. diff --git a/pkg/procid/procid_amd64.s b/pkg/procid/procid_amd64.s index 74a8de42c..7073a0810 100644 --- a/pkg/procid/procid_amd64.s +++ b/pkg/procid/procid_amd64.s @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build amd64 && go1.8 && !go1.18 && go1.1 -// +build amd64,go1.8,!go1.18,go1.1 +//go:build amd64 && go1.8 && !go1.19 && go1.1 +// +build amd64,go1.8,!go1.19,go1.1 // //go:linkname directives type-checked by checklinkname. Any other // non-linkname assumptions outside the Go 1 compatibility guarantee should diff --git a/pkg/procid/procid_arm64.s b/pkg/procid/procid_arm64.s index 48182c4a9..bdc3bdcb0 100644 --- a/pkg/procid/procid_arm64.s +++ b/pkg/procid/procid_arm64.s @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build arm64 && go1.8 && !go1.18 && go1.1 -// +build arm64,go1.8,!go1.18,go1.1 +//go:build arm64 && go1.8 && !go1.19 && go1.1 +// +build arm64,go1.8,!go1.19,go1.1 // //go:linkname directives type-checked by checklinkname. Any other // non-linkname assumptions outside the Go 1 compatibility guarantee should diff --git a/pkg/sync/mutex_unsafe.go b/pkg/sync/mutex_unsafe.go index e00d9467d..e4701b464 100644 --- a/pkg/sync/mutex_unsafe.go +++ b/pkg/sync/mutex_unsafe.go @@ -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.18 -// +build go1.13,!go1.18 +//go:build go1.13 && !go1.19 +// +build go1.13,!go1.19 // When updating the build constraint (above), check that syncMutex matches the // standard library sync.Mutex definition. diff --git a/pkg/sync/runtime_unsafe.go b/pkg/sync/runtime_unsafe.go index 49d4109a9..f6e6a4f7b 100644 --- a/pkg/sync/runtime_unsafe.go +++ b/pkg/sync/runtime_unsafe.go @@ -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.18 -// +build go1.13,!go1.18 +//go:build go1.13 && !go1.19 +// +build go1.13,!go1.19 // //go:linkname directives type-checked by checklinkname. Any other // non-linkname assumptions outside the Go 1 compatibility guarantee should |