diff options
| author | Joel Sing <joel@sing.id.au> | 2023-08-04 21:27:20 +1000 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2023-08-05 18:04:17 +0000 |
| commit | 9fc3feb441d660d63409c83574803d8efe01b351 (patch) | |
| tree | 4b2be7a7a226f780fecb20bfd1a742ec3365d3a1 /src | |
| parent | 5d5305026ec51ff3aaa6e7a7c18a815a3ac787c7 (diff) | |
| download | go-9fc3feb441d660d63409c83574803d8efe01b351.tar.xz | |
runtime,syscall: invert openbsd architecture tests
Rather than testing for architectures that use libc-based system calls,
test that it is not the single architecture that Go is still using direct
system calls. This reduces the number of changes needed for new openbsd
ports.
Updates #36435
Updates #61546
Change-Id: I79c4597c629b8b372e9efcda79e8f6ff778b9e8e
Reviewed-on: https://go-review.googlesource.com/c/go/+/516016
Reviewed-by: Ian Lance Taylor <iant@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Run-TryBot: Ian Lance Taylor <iant@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Run-TryBot: Joel Sing <joel@sing.id.au>
TryBot-Result: Gopher Robot <gobot@golang.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/runtime/proc.go | 7 | ||||
| -rw-r--r-- | src/syscall/exec_unix.go | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/runtime/proc.go b/src/runtime/proc.go index 047b359d3d..fafab7f58c 100644 --- a/src/runtime/proc.go +++ b/src/runtime/proc.go @@ -1497,7 +1497,7 @@ func usesLibcall() bool { case "aix", "darwin", "illumos", "ios", "solaris", "windows": return true case "openbsd": - return GOARCH == "386" || GOARCH == "amd64" || GOARCH == "arm" || GOARCH == "arm64" + return GOARCH != "mips64" } return false } @@ -1509,10 +1509,7 @@ func mStackIsSystemAllocated() bool { case "aix", "darwin", "plan9", "illumos", "ios", "solaris", "windows": return true case "openbsd": - switch GOARCH { - case "386", "amd64", "arm", "arm64": - return true - } + return GOARCH != "mips64" } return false } diff --git a/src/syscall/exec_unix.go b/src/syscall/exec_unix.go index 9a5f2d3295..206c0ab32b 100644 --- a/src/syscall/exec_unix.go +++ b/src/syscall/exec_unix.go @@ -293,7 +293,7 @@ func Exec(argv0 string, argv []string, envv []string) (err error) { } else if runtime.GOOS == "darwin" || runtime.GOOS == "ios" { // Similarly on Darwin. err1 = execveDarwin(argv0p, &argvp[0], &envvp[0]) - } else if runtime.GOOS == "openbsd" && (runtime.GOARCH == "386" || runtime.GOARCH == "amd64" || runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") { + } else if runtime.GOOS == "openbsd" && runtime.GOARCH != "mips64" { // Similarly on OpenBSD. err1 = execveOpenBSD(argv0p, &argvp[0], &envvp[0]) } else { |