From 66de003e19642b5d6eb6d3f7660ad638271f3477 Mon Sep 17 00:00:00 2001
From: Kevin Krakauer <krakauer@google.com>
Date: Thu, 6 May 2021 15:01:09 -0700
Subject: fix build constraints

---
 pkg/atomicbitops/aligned_64bit.go | 2 +-
 tools/bazeldefs/tags.bzl          | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/atomicbitops/aligned_64bit.go b/pkg/atomicbitops/aligned_64bit.go
index 0f3da590f..869ba40cd 100644
--- a/pkg/atomicbitops/aligned_64bit.go
+++ b/pkg/atomicbitops/aligned_64bit.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build !arm,!386
+// +build amd64 arm64
 
 package atomicbitops
 
diff --git a/tools/bazeldefs/tags.bzl b/tools/bazeldefs/tags.bzl
index f5d7a7b21..6564c3b25 100644
--- a/tools/bazeldefs/tags.bzl
+++ b/tools/bazeldefs/tags.bzl
@@ -33,6 +33,10 @@ archs = [
     "_s390x",
     "_sparc64",
     "_x86",
+
+    # Pseudo-architectures to group by word side.
+    "_32bit",
+    "_64bit",
 ]
 
 oses = [
-- 
cgit v1.2.3