From 7ff74af46e246f08a64cea4267e83365355d37d5 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Tue, 30 Jan 2024 12:10:04 +0100 Subject: [PATCH] unix: drop go version tags for unsupported versions go.mod specifies go 1.18. Drop go1.n version tags for older, unsupported versions. Change-Id: I8563bd2cc8e86bd560a45b885a9aa2e6bcc95c47 Reviewed-on: https://go-review.googlesource.com/c/sys/+/559415 Reviewed-by: Than McIntosh Auto-Submit: Tobias Klauser LUCI-TryBot-Result: Go LUCI Reviewed-by: Ian Lance Taylor --- unix/aliases.go | 2 +- unix/darwin_amd64_test.go | 2 +- unix/darwin_arm64_test.go | 2 +- unix/darwin_test.go | 2 +- unix/dev_linux_test.go | 2 -- unix/mkasm.go | 2 +- unix/syscall_darwin_libSystem.go | 2 +- 7 files changed, 6 insertions(+), 8 deletions(-) diff --git a/unix/aliases.go b/unix/aliases.go index e7d3df4b..b0e41985 100644 --- a/unix/aliases.go +++ b/unix/aliases.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build (aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos) && go1.9 +//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos package unix diff --git a/unix/darwin_amd64_test.go b/unix/darwin_amd64_test.go index b547a628..b58e1383 100644 --- a/unix/darwin_amd64_test.go +++ b/unix/darwin_amd64_test.go @@ -1,7 +1,7 @@ // go run mkasm.go darwin amd64 // Code generated by the command above; DO NOT EDIT. -//go:build darwin && go1.12 +//go:build darwin package unix diff --git a/unix/darwin_arm64_test.go b/unix/darwin_arm64_test.go index b0df8c74..9e537a39 100644 --- a/unix/darwin_arm64_test.go +++ b/unix/darwin_arm64_test.go @@ -1,7 +1,7 @@ // go run mkasm.go darwin arm64 // Code generated by the command above; DO NOT EDIT. -//go:build darwin && go1.12 +//go:build darwin package unix diff --git a/unix/darwin_test.go b/unix/darwin_test.go index 6f801f6c..8edde104 100644 --- a/unix/darwin_test.go +++ b/unix/darwin_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build darwin && go1.12 +//go:build darwin package unix diff --git a/unix/dev_linux_test.go b/unix/dev_linux_test.go index bf86fd0e..da1069cf 100644 --- a/unix/dev_linux_test.go +++ b/unix/dev_linux_test.go @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build go1.7 - package unix_test import ( diff --git a/unix/mkasm.go b/unix/mkasm.go index 9fd62822..cdafc717 100644 --- a/unix/mkasm.go +++ b/unix/mkasm.go @@ -80,7 +80,7 @@ func generateASMFile(goos, arch string, inFileNames []string, outFileName string const darwinTestTemplate = `// go run mkasm.go %s // Code generated by the command above; DO NOT EDIT. -//go:build darwin && go1.12 +//go:build darwin package unix diff --git a/unix/syscall_darwin_libSystem.go b/unix/syscall_darwin_libSystem.go index 16dc6993..2f0fa76e 100644 --- a/unix/syscall_darwin_libSystem.go +++ b/unix/syscall_darwin_libSystem.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build darwin && go1.12 +//go:build darwin package unix