[release-branch.go1.17] cmd/dist: skip internal linking tests on arm64

The previous workaround for issue #39466 only disabled this test for
Linux. However, the issue manifests for all arm64 systems with gcc 9.4
and above. The new netbsd-arm64 builder uses NetBSD-current with gcc
10.3, so it fails in the same way.

Updates #39466.
For #53050.

Change-Id: I276a99a5e60914e5c22f74a680e461bea17cfe92
Reviewed-on: https://go-review.googlesource.com/c/go/+/383554
Trust: Benny Siegert <bsiegert@gmail.com>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
(cherry picked from commit 1d6051380c1faa3e515db73c4cfe14f807e2c686)
Reviewed-on: https://go-review.googlesource.com/c/go/+/415074
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>

diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index beb7c4650c312ccb22216d01b75b1f4316b5d1a5..a6ea64b495cb991ffa0dfbac8f41b7aa8b0b1135 100644 (file)
--- a/src/cmd/dist/test.go
+++ b/src/cmd/dist/test.go
@@ -1140,9 +1140,9 @@ func (t *tester) cgoTest(dt *distTest) error {
        cmd := t.addCmd(dt, "misc/cgo/test", t.goTest())
        setEnv(cmd, "GOFLAGS", "-ldflags=-linkmode=auto")
 
-       // Skip internal linking cases on linux/arm64 to support GCC-9.4 and above.
+       // Skip internal linking cases on arm64 to support GCC-9.4 and above.
        // See issue #39466.
-       skipInternalLink := goarch == "arm64" && goos == "linux"
+       skipInternalLink := goarch == "arm64" && goos != "windows"
 
        if t.internalLink() && !skipInternalLink {
                cmd := t.addCmd(dt, "misc/cgo/test", t.goTest(), "-tags=internal")