diff options
author | gVisor bot <gvisor-bot@google.com> | 2021-07-20 23:32:50 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2021-07-20 23:32:50 +0000 |
commit | db333ee70648eeb5627940a7b37304cc1051a0f4 (patch) | |
tree | 8d0f416662424bb5e1848cd717ee07a30342a7e1 /pkg/bits | |
parent | 02b4889106d6c4fe2b9d931c2525d6a55994e2e8 (diff) | |
parent | 1ad382220048339cb1aeecef7d69b9ddffd9168c (diff) |
Merge release-20210712.0-29-g1ad382220 (automated)
Diffstat (limited to 'pkg/bits')
-rw-r--r-- | pkg/bits/uint64_arch.go | 1 | ||||
-rw-r--r-- | pkg/bits/uint64_arch_amd64_asm.s | 1 | ||||
-rw-r--r-- | pkg/bits/uint64_arch_arm64_asm.s | 1 | ||||
-rw-r--r-- | pkg/bits/uint64_arch_generic.go | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/pkg/bits/uint64_arch.go b/pkg/bits/uint64_arch.go index 9f23eff77..fc5634167 100644 --- a/pkg/bits/uint64_arch.go +++ b/pkg/bits/uint64_arch.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build amd64 || arm64 // +build amd64 arm64 package bits diff --git a/pkg/bits/uint64_arch_amd64_asm.s b/pkg/bits/uint64_arch_amd64_asm.s index 8ff364181..2931b5d56 100644 --- a/pkg/bits/uint64_arch_amd64_asm.s +++ b/pkg/bits/uint64_arch_amd64_asm.s @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build amd64 // +build amd64 TEXT ·TrailingZeros64(SB),$0-16 diff --git a/pkg/bits/uint64_arch_arm64_asm.s b/pkg/bits/uint64_arch_arm64_asm.s index 814ba562d..eb8d4d280 100644 --- a/pkg/bits/uint64_arch_arm64_asm.s +++ b/pkg/bits/uint64_arch_arm64_asm.s @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build arm64 // +build arm64 TEXT ·TrailingZeros64(SB),$0-16 diff --git a/pkg/bits/uint64_arch_generic.go b/pkg/bits/uint64_arch_generic.go index 9dd2098d1..83b23a3fc 100644 --- a/pkg/bits/uint64_arch_generic.go +++ b/pkg/bits/uint64_arch_generic.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !amd64 && !arm64 // +build !amd64,!arm64 package bits |