runtime,syscall: simplify openbsd related build tags

openbsd/mips64 is now the only openbsd port that uses non-libc syscall - revise
build tags to reflect this.

Update #36435

Change-Id: I357b2dd2926d058e25e618fcca42c388587598a8
Reviewed-on: https://go-review.googlesource.com/c/go/+/317919
Trust: Joel Sing <joel@sing.id.au>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Run-TryBot: Cherry Mui <cherryyz@google.com>
TryBot-Result: Go Bot <gobot@golang.org>

diff --git a/src/runtime/os_openbsd_libc.go b/src/runtime/os_openbsd_libc.go
index 8150753796bd9b5259fb04871b1589455d820a26..0a342e553398a6f4d34df1030371204ad81a73a5 100644 (file)
--- a/src/runtime/os_openbsd_libc.go
+++ b/src/runtime/os_openbsd_libc.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build (openbsd && 386) || (openbsd && amd64) || (openbsd && arm) || (openbsd && arm64)
-// +build openbsd,386 openbsd,amd64 openbsd,arm openbsd,arm64
+//go:build openbsd && !mips64
+// +build openbsd,!mips64
 
 package runtime
 

diff --git a/src/runtime/os_openbsd_syscall.go b/src/runtime/os_openbsd_syscall.go
index 94e851cde8da0a62ef1404e232f423496ade64e9..3cdcb6c707bfe2dfb08986e19ade174ca717d742 100644 (file)
--- a/src/runtime/os_openbsd_syscall.go
+++ b/src/runtime/os_openbsd_syscall.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build openbsd && !386 && openbsd && !amd64 && openbsd && !arm && openbsd && !arm64
-// +build openbsd,!386,openbsd,!amd64,openbsd,!arm,openbsd,!arm64
+//go:build openbsd && mips64
+// +build openbsd,mips64
 
 package runtime
 

diff --git a/src/runtime/os_openbsd_syscall1.go b/src/runtime/os_openbsd_syscall1.go
index f8f666890aa16efae127d05a815b20aa555f148a..c20ee8300e3001a8771133b6d73c2b5ad38fade0 100644 (file)
--- a/src/runtime/os_openbsd_syscall1.go
+++ b/src/runtime/os_openbsd_syscall1.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build openbsd && !386 && !amd64 && !arm && !arm64
-// +build openbsd,!386,!amd64,!arm,!arm64
+//go:build openbsd && mips64
+// +build openbsd,mips64
 
 package runtime
 

diff --git a/src/runtime/os_openbsd_syscall2.go b/src/runtime/os_openbsd_syscall2.go
index 84543acec4a3321774e49576f385083f44b2775d..af1997131feba964e06521a75f99ae5a2d8d0486 100644 (file)
--- a/src/runtime/os_openbsd_syscall2.go
+++ b/src/runtime/os_openbsd_syscall2.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build openbsd && !386 && !amd64 && !arm && !arm64
-// +build openbsd,!386,!amd64,!arm,!arm64
+//go:build openbsd && mips64
+// +build openbsd,mips64
 
 package runtime
 

diff --git a/src/runtime/sys_libc.go b/src/runtime/sys_libc.go
index 346b1ab28507beb5f642217182fd5d7122090bb6..b1a9f8b5365709d2862057877815ff4056cb942c 100644 (file)
--- a/src/runtime/sys_libc.go
+++ b/src/runtime/sys_libc.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build darwin || (openbsd && 386) || (openbsd && amd64) || (openbsd && arm) || (openbsd && arm64)
-// +build darwin openbsd,386 openbsd,amd64 openbsd,arm openbsd,arm64
+//go:build darwin || (openbsd && !mips64)
+// +build darwin openbsd,!mips64
 
 package runtime
 

diff --git a/src/runtime/sys_openbsd.go b/src/runtime/sys_openbsd.go
index 89203bf85f4aa81a10fed73c0ebb631eba25b7f6..ab3149558b3087156446c32d9f01a958019d2ad8 100644 (file)
--- a/src/runtime/sys_openbsd.go
+++ b/src/runtime/sys_openbsd.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build (openbsd && 386) || (openbsd && amd64) || (openbsd && arm) || (openbsd && arm64)
-// +build openbsd,386 openbsd,amd64 openbsd,arm openbsd,arm64
+//go:build openbsd && !mips64
+// +build openbsd,!mips64
 
 package runtime
 

diff --git a/src/runtime/sys_openbsd1.go b/src/runtime/sys_openbsd1.go
index 1af48539faaa7dce6d40f2f6ae4af9a9a21bce24..6f9ad356d4432bf8e0e8213e3b67860c5f8b7746 100644 (file)
--- a/src/runtime/sys_openbsd1.go
+++ b/src/runtime/sys_openbsd1.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build (openbsd && 386) || (openbsd && amd64) || (openbsd && arm) || (openbsd && arm64)
-// +build openbsd,386 openbsd,amd64 openbsd,arm openbsd,arm64
+//go:build openbsd && !mips64
+// +build openbsd,!mips64
 
 package runtime
 

diff --git a/src/runtime/sys_openbsd2.go b/src/runtime/sys_openbsd2.go
index 2d53f67a6163dda93a7658f0cf3afa633cc2c813..cd1a4e879fb2df8bc946548b4cb7e917cfed0652 100644 (file)
--- a/src/runtime/sys_openbsd2.go
+++ b/src/runtime/sys_openbsd2.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build (openbsd && 386) || (openbsd && amd64) || (openbsd && arm) || (openbsd && arm64)
-// +build openbsd,386 openbsd,amd64 openbsd,arm openbsd,arm64
+//go:build openbsd && !mips64
+// +build openbsd,!mips64
 
 package runtime
 

diff --git a/src/runtime/sys_openbsd3.go b/src/runtime/sys_openbsd3.go
index 4ef0bdcf77f3076bb09ff3ae4b00f2e741387e3f..8d77a4b216e93136d8bcecc550aaf6fd1ef69f99 100644 (file)
--- a/src/runtime/sys_openbsd3.go
+++ b/src/runtime/sys_openbsd3.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build (openbsd && 386) || (openbsd && amd64) || (openbsd && arm) || (openbsd && arm64)
-// +build openbsd,386 openbsd,amd64 openbsd,arm openbsd,arm64
+//go:build openbsd && !mips64
+// +build openbsd,!mips64
 
 package runtime
 

diff --git a/src/syscall/exec_bsd.go b/src/syscall/exec_bsd.go
index 569dd675ed2f55f3501a3add0e335b352ce56f77..709066e809baa5306884ba03978ef933a899de2a 100644 (file)
--- a/src/syscall/exec_bsd.go
+++ b/src/syscall/exec_bsd.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build dragonfly || freebsd || netbsd || (openbsd && !386 && !amd64 && !arm && !arm64)
-// +build dragonfly freebsd netbsd openbsd,!386,!amd64,!arm,!arm64
+//go:build dragonfly || freebsd || netbsd || (openbsd && mips64)
+// +build dragonfly freebsd netbsd openbsd,mips64
 
 package syscall
 

diff --git a/src/syscall/exec_libc2.go b/src/syscall/exec_libc2.go
index 7442d59affc13701639c3a80298fad77c8b9ff94..b999754c2e81bf33c15accea3ab169841af96284 100644 (file)
--- a/src/syscall/exec_libc2.go
+++ b/src/syscall/exec_libc2.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build darwin || (openbsd && 386) || (openbsd && amd64) || (openbsd && arm) || (openbsd && arm64)
-// +build darwin openbsd,386 openbsd,amd64 openbsd,arm openbsd,arm64
+//go:build darwin || (openbsd && !mips64)
+// +build darwin openbsd,!mips64
 
 package syscall
 

diff --git a/src/syscall/syscall_openbsd1.go b/src/syscall/syscall_openbsd1.go
index 450f3848319eb3705e939ecc69442d638a8ee197..15870ce1ee1523289608e02f9a98f82b2a1c81be 100644 (file)
--- a/src/syscall/syscall_openbsd1.go
+++ b/src/syscall/syscall_openbsd1.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build openbsd && !386 && !amd64 && !arm && !arm64
-// +build openbsd,!386,!amd64,!arm,!arm64
+//go:build openbsd && mips64
+// +build openbsd,mips64
 
 package syscall
 

diff --git a/src/syscall/syscall_openbsd_libc.go b/src/syscall/syscall_openbsd_libc.go
index 2390912b0f5045a069dd454ecb2d659c33b56226..e67ee4e571c264eae8e1aea91d042666cab6c623 100644 (file)
--- a/src/syscall/syscall_openbsd_libc.go
+++ b/src/syscall/syscall_openbsd_libc.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build (openbsd && 386) || (openbsd && amd64) || (openbsd && arm) || (openbsd && arm64)
-// +build openbsd,386 openbsd,amd64 openbsd,arm openbsd,arm64
+//go:build openbsd && !mips64
+// +build openbsd,!mips64
 
 package syscall