diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-05-12 22:47:35 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-05-12 22:47:35 +0000 |
| commit | 5a0a2ba18252e0cc3d7af0813b8ac7ce5ec39db5 (patch) | |
| tree | f0e1a490732f50dce12b96c8e700d80021925d2e | |
| parent | beb54fcaf40594fad39bbeb212f066aecef26112 (diff) | |
| parent | 9854e5ac4d7f80a7db10270313bce7e485ce6f9b (diff) | |
Merge release-20210503.0-51-g9854e5ac4 (automated)
| -rw-r--r-- | pkg/atomicbitops/aligned_32bit_unsafe.go | 2 | ||||
| -rw-r--r-- | pkg/atomicbitops/aligned_64bit.go | 6 | ||||
| -rw-r--r-- | pkg/atomicbitops/atomicbitops_32bit_unsafe_state_autogen.go | 2 | ||||
| -rw-r--r-- | pkg/atomicbitops/atomicbitops_64bit_state_autogen.go | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/pkg/atomicbitops/aligned_32bit_unsafe.go b/pkg/atomicbitops/aligned_32bit_unsafe.go index 776da53b0..df706b453 100644 --- a/pkg/atomicbitops/aligned_32bit_unsafe.go +++ b/pkg/atomicbitops/aligned_32bit_unsafe.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build arm 386 +// +build arm mips 386 package atomicbitops diff --git a/pkg/atomicbitops/aligned_64bit.go b/pkg/atomicbitops/aligned_64bit.go index 869ba40cd..1544c7814 100644 --- a/pkg/atomicbitops/aligned_64bit.go +++ b/pkg/atomicbitops/aligned_64bit.go @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build amd64 arm64 +// +build !arm,!mips,!386 package atomicbitops import "sync/atomic" // AlignedAtomicInt64 is an atomic int64 that is guaranteed to be 64-bit -// aligned, even on 32-bit systems. On 64-bit machines, it's just a regular +// aligned, even on 32-bit systems. On most architectures, it's just a regular // int64. // // See aligned_unsafe.go in this directory for justification. @@ -45,7 +45,7 @@ func (aa *AlignedAtomicInt64) Add(v int64) int64 { } // AlignedAtomicUint64 is an atomic uint64 that is guaranteed to be 64-bit -// aligned, even on 32-bit systems. On 64-bit machines, it's just a regular +// aligned, even on 32-bit systems. On most architectures, it's just a regular // uint64. // // See aligned_unsafe.go in this directory for justification. diff --git a/pkg/atomicbitops/atomicbitops_32bit_unsafe_state_autogen.go b/pkg/atomicbitops/atomicbitops_32bit_unsafe_state_autogen.go index 61eca1a6d..ae32b0c59 100644 --- a/pkg/atomicbitops/atomicbitops_32bit_unsafe_state_autogen.go +++ b/pkg/atomicbitops/atomicbitops_32bit_unsafe_state_autogen.go @@ -1,6 +1,6 @@ // automatically generated by stateify. -// +build arm 386 +// +build arm mips 386 package atomicbitops diff --git a/pkg/atomicbitops/atomicbitops_64bit_state_autogen.go b/pkg/atomicbitops/atomicbitops_64bit_state_autogen.go index cfec0ec7b..a084f4c57 100644 --- a/pkg/atomicbitops/atomicbitops_64bit_state_autogen.go +++ b/pkg/atomicbitops/atomicbitops_64bit_state_autogen.go @@ -1,6 +1,6 @@ // automatically generated by stateify. -// +build amd64 arm64 +// +build !arm,!mips,!386 package atomicbitops |