summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMichael Pratt <mpratt@google.com>2021-02-18 15:29:15 -0800
committergVisor bot <gvisor-bot@google.com>2021-02-18 15:30:58 -0800
commitf80a857a4f5f57908c64a22f5de0e07df722227d (patch)
treebd74f0ed6e6fa060d08f6276d88a38bbe9a1ebc8
parentec20f4f38ef49efc8756595e6ec3fb3e578cc097 (diff)
Bump build constraints to Go 1.18
These are bumped to allow early testing of Go 1.17. Use will be audited closer to the 1.17 release. PiperOrigin-RevId: 358278615
-rw-r--r--pkg/gohacks/gohacks_unsafe.go2
-rw-r--r--pkg/goid/goid.go2
-rw-r--r--pkg/procid/procid_amd64.s2
-rw-r--r--pkg/procid/procid_arm64.s2
-rw-r--r--pkg/sentry/platform/kvm/bluepill_unsafe.go2
-rw-r--r--pkg/sentry/platform/kvm/machine_unsafe.go2
-rw-r--r--pkg/sentry/platform/ptrace/subprocess_unsafe.go2
-rw-r--r--pkg/sync/goyield_unsafe.go2
-rw-r--r--pkg/sync/mutex_unsafe.go2
-rw-r--r--pkg/sync/runtime_unsafe.go6
-rw-r--r--pkg/tcpip/link/rawfile/blockingpoll_yield_unsafe.go2
-rw-r--r--pkg/tcpip/time_unsafe.go2
12 files changed, 15 insertions, 13 deletions
diff --git a/pkg/gohacks/gohacks_unsafe.go b/pkg/gohacks/gohacks_unsafe.go
index d26c1ac05..10bbb1f58 100644
--- a/pkg/gohacks/gohacks_unsafe.go
+++ b/pkg/gohacks/gohacks_unsafe.go
@@ -13,7 +13,7 @@
// limitations under the License.
// +build go1.13
-// +build !go1.17
+// +build !go1.18
// Check type signatures when updating Go version.
diff --git a/pkg/goid/goid.go b/pkg/goid/goid.go
index 17c384cb0..193b2c2d4 100644
--- a/pkg/goid/goid.go
+++ b/pkg/goid/goid.go
@@ -13,7 +13,7 @@
// limitations under the License.
// +build go1.12
-// +build !go1.17
+// +build !go1.18
// Check type signatures when updating Go version.
diff --git a/pkg/procid/procid_amd64.s b/pkg/procid/procid_amd64.s
index a45920040..c4307c523 100644
--- a/pkg/procid/procid_amd64.s
+++ b/pkg/procid/procid_amd64.s
@@ -14,7 +14,7 @@
// +build amd64
// +build go1.8
-// +build !go1.17
+// +build !go1.18
#include "textflag.h"
diff --git a/pkg/procid/procid_arm64.s b/pkg/procid/procid_arm64.s
index 9d3b0666d..c1c409f3c 100644
--- a/pkg/procid/procid_arm64.s
+++ b/pkg/procid/procid_arm64.s
@@ -14,7 +14,7 @@
// +build arm64
// +build go1.8
-// +build !go1.17
+// +build !go1.18
#include "textflag.h"
diff --git a/pkg/sentry/platform/kvm/bluepill_unsafe.go b/pkg/sentry/platform/kvm/bluepill_unsafe.go
index 8c5369377..55da6dd95 100644
--- a/pkg/sentry/platform/kvm/bluepill_unsafe.go
+++ b/pkg/sentry/platform/kvm/bluepill_unsafe.go
@@ -13,7 +13,7 @@
// limitations under the License.
// +build go1.12
-// +build !go1.17
+// +build !go1.18
// Check go:linkname function signatures when updating Go version.
diff --git a/pkg/sentry/platform/kvm/machine_unsafe.go b/pkg/sentry/platform/kvm/machine_unsafe.go
index 1d6ca245a..c322551d2 100644
--- a/pkg/sentry/platform/kvm/machine_unsafe.go
+++ b/pkg/sentry/platform/kvm/machine_unsafe.go
@@ -13,7 +13,7 @@
// limitations under the License.
// +build go1.12
-// +build !go1.17
+// +build !go1.18
// Check go:linkname function signatures when updating Go version.
diff --git a/pkg/sentry/platform/ptrace/subprocess_unsafe.go b/pkg/sentry/platform/ptrace/subprocess_unsafe.go
index 7ee20d89a..38b7b1a5e 100644
--- a/pkg/sentry/platform/ptrace/subprocess_unsafe.go
+++ b/pkg/sentry/platform/ptrace/subprocess_unsafe.go
@@ -13,7 +13,7 @@
// limitations under the License.
// +build go1.12
-// +build !go1.17
+// +build !go1.18
// Check go:linkname function signatures when updating Go version.
diff --git a/pkg/sync/goyield_unsafe.go b/pkg/sync/goyield_unsafe.go
index 672ee274d..f3cc12163 100644
--- a/pkg/sync/goyield_unsafe.go
+++ b/pkg/sync/goyield_unsafe.go
@@ -4,7 +4,7 @@
// license that can be found in the LICENSE file.
// +build go1.14
-// +build !go1.17
+// +build !go1.18
// Check go:linkname function signatures when updating Go version.
diff --git a/pkg/sync/mutex_unsafe.go b/pkg/sync/mutex_unsafe.go
index 21084b857..4e49a9b89 100644
--- a/pkg/sync/mutex_unsafe.go
+++ b/pkg/sync/mutex_unsafe.go
@@ -4,7 +4,7 @@
// license that can be found in the LICENSE file.
// +build go1.13
-// +build !go1.17
+// +build !go1.18
// 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 e925e2e5b..119ff832a 100644
--- a/pkg/sync/runtime_unsafe.go
+++ b/pkg/sync/runtime_unsafe.go
@@ -4,9 +4,10 @@
// license that can be found in the LICENSE file.
// +build go1.13
-// +build !go1.17
+// +build !go1.18
-// Check function signatures and constants when updating Go version.
+// Check go:linkname function signatures, type definitions, and constants when
+// updating Go version.
package sync
@@ -95,6 +96,7 @@ func MapKeyHasher(m interface{}) func(unsafe.Pointer, uintptr) uintptr {
return mtyp.hasher
}
+// maptype is equivalent to the beginning of runtime.maptype.
type maptype struct {
size uintptr
ptrdata uintptr
diff --git a/pkg/tcpip/link/rawfile/blockingpoll_yield_unsafe.go b/pkg/tcpip/link/rawfile/blockingpoll_yield_unsafe.go
index 5db4bf12b..7f238102e 100644
--- a/pkg/tcpip/link/rawfile/blockingpoll_yield_unsafe.go
+++ b/pkg/tcpip/link/rawfile/blockingpoll_yield_unsafe.go
@@ -14,7 +14,7 @@
// +build linux,amd64 linux,arm64
// +build go1.12
-// +build !go1.17
+// +build !go1.18
// Check go:linkname function signatures when updating Go version.
diff --git a/pkg/tcpip/time_unsafe.go b/pkg/tcpip/time_unsafe.go
index 606363567..eeea97b12 100644
--- a/pkg/tcpip/time_unsafe.go
+++ b/pkg/tcpip/time_unsafe.go
@@ -13,7 +13,7 @@
// limitations under the License.
// +build go1.9
-// +build !go1.17
+// +build !go1.18
// Check go:linkname function signatures when updating Go version.