From 974792ae18cf19f555a35d3bf7b23a8ed9e9385c Mon Sep 17 00:00:00 2001
From: Michael Pratt <mpratt@google.com>
Date: Wed, 3 Aug 2022 08:28:37 -0700
Subject: [PATCH] Bump negative build tag constraints to go1.21

PiperOrigin-RevId: 465062413
---
 pkg/gohacks/gohacks_unsafe.go | 4 ++--
 pkg/goid/goid.go              | 4 ++--
 pkg/procid/procid_amd64.s     | 4 ++--
 pkg/procid/procid_arm64.s     | 4 ++--
 pkg/sync/mutex_unsafe.go      | 4 ++--
 pkg/sync/runtime_amd64.go     | 4 ++--
 pkg/sync/runtime_amd64.s      | 4 ++--
 pkg/sync/runtime_unsafe.go    | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkg/gohacks/gohacks_unsafe.go b/pkg/gohacks/gohacks_unsafe.go
index c183a6ac9..0711de9d2 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.20
-// +build go1.13,!go1.20
+//go:build go1.13 && !go1.21
+// +build go1.13,!go1.21
 
 // //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 d92d09e56..c4eacdf8c 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.20
-// +build go1.12,!go1.20
+//go:build go1.12 && !go1.21
+// +build go1.12,!go1.21
 
 // Check type signatures when updating Go version.
 
diff --git a/pkg/procid/procid_amd64.s b/pkg/procid/procid_amd64.s
index 29569fb79..54a2f6162 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.20 && go1.1
-// +build amd64,go1.8,!go1.20,go1.1
+//go:build amd64 && go1.8 && !go1.21 && go1.1
+// +build amd64,go1.8,!go1.21,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 6d783b234..78736df39 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.20 && go1.1
-// +build arm64,go1.8,!go1.20,go1.1
+//go:build arm64 && go1.8 && !go1.21 && go1.1
+// +build arm64,go1.8,!go1.21,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 079b39b79..f0a471da4 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.20
-// +build go1.13,!go1.20
+//go:build go1.13 && !go1.21
+// +build go1.13,!go1.21
 
 // When updating the build constraint (above), check that syncMutex matches the
 // standard library sync.Mutex definition.
diff --git a/pkg/sync/runtime_amd64.go b/pkg/sync/runtime_amd64.go
index 9d714e01b..a9d883e4c 100644
--- a/pkg/sync/runtime_amd64.go
+++ b/pkg/sync/runtime_amd64.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 amd64 && go1.8 && !go1.20 && !goexperiment.staticlockranking
-// +build amd64,go1.8,!go1.20,!goexperiment.staticlockranking
+//go:build amd64 && go1.8 && !go1.21 && !goexperiment.staticlockranking
+// +build amd64,go1.8,!go1.21,!goexperiment.staticlockranking
 
 package sync
 
diff --git a/pkg/sync/runtime_amd64.s b/pkg/sync/runtime_amd64.s
index b30442cd0..252dda1bb 100644
--- a/pkg/sync/runtime_amd64.s
+++ b/pkg/sync/runtime_amd64.s
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build amd64 && go1.14 && !go1.20 && !goexperiment.staticlockranking
-// +build amd64,go1.14,!go1.20,!goexperiment.staticlockranking
+//go:build amd64 && go1.14 && !go1.21 && !goexperiment.staticlockranking
+// +build amd64,go1.14,!go1.21,!goexperiment.staticlockranking
 
 #include "textflag.h"
 
diff --git a/pkg/sync/runtime_unsafe.go b/pkg/sync/runtime_unsafe.go
index 16e09417d..fc3241c5d 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.20
-// +build go1.13,!go1.20
+//go:build go1.13 && !go1.21
+// +build go1.13,!go1.21
 
 // //go:linkname directives type-checked by checklinkname. Any other
 // non-linkname assumptions outside the Go 1 compatibility guarantee should