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 <tobias.klauser@gmail.com>
Reviewed-by: Quim Muntal <quimmuntal@gmail.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Reviewed-by: Carlos Amedee <carlos@golang.org>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>

diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index 5f3a66ed042d7b888fa7110da538d0819ac1c936..6200363ce241f5b682c901cf1663713965a62b9d 100644 (file)
--- 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 7db06f86ea7297ad5f535869e5531e771e7a5021..121c2dc62cf7a4bda117820c6fa23d81d3dc758f 100644 (file)
--- 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 8f88e29ad2470c904ef5e41bf3b9f723df07dad8..94fddb508e0e386da144c326915d8a2bbcda19b8 100644 (file)
--- 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 f02d058ead8b157625464ca2726eeb08c89f8b77..f113a1aa2dd9ffd559dcfde1185e6e645e8e13e7 100644 (file)
--- 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