From 1d459c4357e51e593ade896055db0fc794776143 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Tue, 26 Aug 2025 14:25:49 +0200 Subject: [PATCH] all: delete more windows/arm remnants Updates #71671 Change-Id: I663c4a659ad45bcebfc03d6eb4783e5f5d3afa0d Reviewed-on: https://go-review.googlesource.com/c/go/+/699176 Auto-Submit: Tobias Klauser Reviewed-by: Quim Muntal Reviewed-by: Cherry Mui Reviewed-by: Carlos Amedee LUCI-TryBot-Result: Go LUCI --- src/cmd/dist/test.go | 1 - src/cmd/dist/util.go | 5 ++--- src/net/http/client_test.go | 6 +++--- src/runtime/memclr_arm.s | 1 - 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go index 5f3a66ed04..6200363ce2 100644 --- a/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go @@ -1835,7 +1835,6 @@ func (t *tester) fipsSupported() bool { switch { case goarch == "wasm", goos == "windows" && goarch == "386", - goos == "windows" && goarch == "arm", goos == "openbsd", goos == "aix": return false diff --git a/src/cmd/dist/util.go b/src/cmd/dist/util.go index 7db06f86ea..121c2dc62c 100644 --- a/src/cmd/dist/util.go +++ b/src/cmd/dist/util.go @@ -366,9 +366,8 @@ func xgetgoarm() string { // If we're building on an actual arm system, and not building // a cross-compiling toolchain, try to exec ourselves // to detect whether VFP is supported and set the default GOARM. - // Windows requires ARMv7, so we can skip the check. - // We've always assumed Android is ARMv7 too. - if gohostarch == "arm" && goarch == "arm" && goos == gohostos && goos != "windows" && goos != "android" { + // We've always assumed Android is ARMv7. + if gohostarch == "arm" && goarch == "arm" && goos == gohostos && goos != "android" { // Try to exec ourselves in a mode to detect VFP support. // Seeing how far it gets determines which instructions failed. // The test is OS-agnostic. diff --git a/src/net/http/client_test.go b/src/net/http/client_test.go index 8f88e29ad2..94fddb508e 100644 --- a/src/net/http/client_test.go +++ b/src/net/http/client_test.go @@ -1227,7 +1227,7 @@ func testClientTimeout(t *testing.T, mode testMode) { t.Logf("timeout before response received") continue } - if runtime.GOOS == "windows" && strings.HasPrefix(runtime.GOARCH, "arm") { + if runtime.GOOS == "windows" && runtime.GOARCH == "arm64" { testenv.SkipFlaky(t, 43120) } t.Fatal(err) @@ -1256,7 +1256,7 @@ func testClientTimeout(t *testing.T, mode testMode) { t.Errorf("ReadAll error = %q; expected some context.DeadlineExceeded", err) } if got := ne.Error(); !strings.Contains(got, "(Client.Timeout") { - if runtime.GOOS == "windows" && strings.HasPrefix(runtime.GOARCH, "arm") { + if runtime.GOOS == "windows" && runtime.GOARCH == "arm64" { testenv.SkipFlaky(t, 43120) } t.Errorf("error string = %q; missing timeout substring", got) @@ -1302,7 +1302,7 @@ func testClientTimeout_Headers(t *testing.T, mode testMode) { t.Errorf("ReadAll error = %q; expected some context.DeadlineExceeded", err) } if got := ne.Error(); !strings.Contains(got, "Client.Timeout exceeded") { - if runtime.GOOS == "windows" && strings.HasPrefix(runtime.GOARCH, "arm") { + if runtime.GOOS == "windows" && runtime.GOARCH == "arm64" { testenv.SkipFlaky(t, 43120) } t.Errorf("error string = %q; missing timeout substring", got) diff --git a/src/runtime/memclr_arm.s b/src/runtime/memclr_arm.s index f02d058ead..f113a1aa2d 100644 --- a/src/runtime/memclr_arm.s +++ b/src/runtime/memclr_arm.s @@ -33,7 +33,6 @@ // See memclrNoHeapPointers Go doc for important implementation constraints. // func memclrNoHeapPointers(ptr unsafe.Pointer, n uintptr) -// Also called from assembly in sys_windows_arm.s without g (but using Go stack convention). TEXT runtime·memclrNoHeapPointers(SB),NOSPLIT,$0-8 MOVW ptr+0(FP), TO MOVW n+4(FP), N -- 2.52.0