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/procid | |
| parent | 02b4889106d6c4fe2b9d931c2525d6a55994e2e8 (diff) | |
| parent | 1ad382220048339cb1aeecef7d69b9ddffd9168c (diff) | |
Merge release-20210712.0-29-g1ad382220 (automated)
Diffstat (limited to 'pkg/procid')
| -rw-r--r-- | pkg/procid/procid.go | 3 | ||||
| -rw-r--r-- | pkg/procid/procid_amd64.s | 5 | ||||
| -rw-r--r-- | pkg/procid/procid_arm64.s | 5 | ||||
| -rw-r--r-- | pkg/procid/procid_state_autogen.go | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/pkg/procid/procid.go b/pkg/procid/procid.go index 78b92422c..e0d42819d 100644 --- a/pkg/procid/procid.go +++ b/pkg/procid/procid.go @@ -12,6 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build go1.1 +// +build go1.1 + // Package procid provides a way to get the current system thread identifier. package procid diff --git a/pkg/procid/procid_amd64.s b/pkg/procid/procid_amd64.s index c4307c523..b5bbfff90 100644 --- a/pkg/procid/procid_amd64.s +++ b/pkg/procid/procid_amd64.s @@ -12,9 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build amd64 -// +build go1.8 -// +build !go1.18 +//go:build amd64 && go1.8 && !go1.18 && go1.1 +// +build amd64,go1.8,!go1.18,go1.1 #include "textflag.h" diff --git a/pkg/procid/procid_arm64.s b/pkg/procid/procid_arm64.s index c1c409f3c..772d96289 100644 --- a/pkg/procid/procid_arm64.s +++ b/pkg/procid/procid_arm64.s @@ -12,9 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build arm64 -// +build go1.8 -// +build !go1.18 +//go:build arm64 && go1.8 && !go1.18 && go1.1 +// +build arm64,go1.8,!go1.18,go1.1 #include "textflag.h" diff --git a/pkg/procid/procid_state_autogen.go b/pkg/procid/procid_state_autogen.go index 662988d79..59cb991c0 100644 --- a/pkg/procid/procid_state_autogen.go +++ b/pkg/procid/procid_state_autogen.go @@ -1,3 +1,5 @@ // automatically generated by stateify. +// +build go1.1 + package procid |