From f67f5511ee0f225bcc8943994ba6139eed375e85 Mon Sep 17 00:00:00 2001 From: Joel Sing Date: Sat, 27 Apr 2019 02:36:34 +1000 Subject: [PATCH] cmd/dist: add support for openbsd/arm64 Updates #31656 Change-Id: If481df050cd879f7c7c22a79c17c33af00a8b389 Reviewed-on: https://go-review.googlesource.com/c/go/+/174125 Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot Reviewed-by: Brad Fitzpatrick --- src/cmd/dist/build.go | 1 + src/cmd/dist/main.go | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go index 6b58a04946..5edff52f87 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go @@ -1514,6 +1514,7 @@ var cgoEnabled = map[string]bool{ "openbsd/386": true, "openbsd/amd64": true, "openbsd/arm": true, + "openbsd/arm64": false, "plan9/386": false, "plan9/amd64": false, "plan9/arm": false, diff --git a/src/cmd/dist/main.go b/src/cmd/dist/main.go index 55d5be3e43..9be2fff37a 100644 --- a/src/cmd/dist/main.go +++ b/src/cmd/dist/main.go @@ -71,8 +71,9 @@ func main() { case "openbsd": // The gcc available on OpenBSD armv7 is old/inadequate (for example, lacks // __sync_fetch_and_*/__sync_*_and_fetch) and will likely be removed in the - // not-to-distant future - use clang instead. - if runtime.GOARCH == "arm" { + // not-to-distant future - use clang instead. OpenBSD arm64 does not ship + // with gcc. + if runtime.GOARCH == "arm" || runtime.GOARCH == "arm64" { defaultclang = true } case "plan9": -- 2.50.0