diff options
| author | Alberto Donizetti <alb.donizetti@gmail.com> | 2025-08-22 11:49:53 +0200 |
|---|---|---|
| committer | Alberto Donizetti <alb.donizetti@gmail.com> | 2025-08-22 08:07:55 -0700 |
| commit | 98238fd495a2a16a2cd90197c6f41352760e4ccb (patch) | |
| tree | 232e59cf7f07e0e66465d46bef02b9889677cce7 /src | |
| parent | 1ad30844d9cc0d5792b055f44a6e98759587bbfb (diff) | |
| download | go-98238fd495a2a16a2cd90197c6f41352760e4ccb.tar.xz | |
all: delete remaining windows/arm code
Fixes #43800
Updates #71671
Change-Id: Ib7aafe3a3f6ae48f23fa23f03103820e9fcf5161
Reviewed-on: https://go-review.googlesource.com/c/go/+/698415
Reviewed-by: Quim Muntal <quimmuntal@gmail.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: Filippo Valsorda <filippo@golang.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/dist/test.go | 2 | ||||
| -rw-r--r-- | src/cmd/internal/obj/fips140.go | 10 | ||||
| -rw-r--r-- | src/crypto/internal/fips140/fips140.go | 1 | ||||
| -rw-r--r-- | src/runtime/signal_windows_test.go | 11 |
4 files changed, 6 insertions, 18 deletions
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go index aa09d1eba3..5f3a66ed04 100644 --- a/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go @@ -1773,7 +1773,7 @@ func buildModeSupported(compiler, buildmode, goos, goarch string) bool { "ios/amd64", "ios/arm64", "aix/ppc64", "openbsd/arm64", - "windows/386", "windows/amd64", "windows/arm", "windows/arm64": + "windows/386", "windows/amd64", "windows/arm64": return true } return false diff --git a/src/cmd/internal/obj/fips140.go b/src/cmd/internal/obj/fips140.go index ea36849a21..da18b64178 100644 --- a/src/cmd/internal/obj/fips140.go +++ b/src/cmd/internal/obj/fips140.go @@ -196,14 +196,8 @@ func EnableFIPS() bool { // Perhaps the default should be changed back to -buildmode=exe, // after which we could remove this case, but until then, // skip FIPS on windows-386. - // - // We don't know whether arm works, because it is too hard to get builder - // time to test it. Disable since it's not important right now. - if buildcfg.GOOS == "windows" { - switch buildcfg.GOARCH { - case "386", "arm": - return false - } + if buildcfg.GOOS == "windows" && buildcfg.GOARCH == "386" { + return false } // AIX doesn't just work, and it's not worth fixing. diff --git a/src/crypto/internal/fips140/fips140.go b/src/crypto/internal/fips140/fips140.go index 050967f480..fd265718e0 100644 --- a/src/crypto/internal/fips140/fips140.go +++ b/src/crypto/internal/fips140/fips140.go @@ -46,7 +46,6 @@ func Supported() error { switch { case runtime.GOARCH == "wasm", runtime.GOOS == "windows" && runtime.GOARCH == "386", - runtime.GOOS == "windows" && runtime.GOARCH == "arm", runtime.GOOS == "openbsd", // due to -fexecute-only, see #70880 runtime.GOOS == "aix": return errors.New("FIPS 140-3 mode is not supported on " + runtime.GOOS + "-" + runtime.GOARCH) diff --git a/src/runtime/signal_windows_test.go b/src/runtime/signal_windows_test.go index 9318ff9c00..7a9afcce22 100644 --- a/src/runtime/signal_windows_test.go +++ b/src/runtime/signal_windows_test.go @@ -79,12 +79,7 @@ func TestVectoredHandlerDontCrashOnLibrary(t *testing.T) { if *flagQuick { t.Skip("-quick") } - if runtime.GOARCH == "arm" { - //TODO: remove this skip and update testwinlib/main.c - // once windows/arm supports c-shared buildmode. - // See go.dev/issues/43800. - t.Skip("this test can't run on windows/arm") - } + testenv.MustHaveGoBuild(t) testenv.MustHaveCGO(t) testenv.MustHaveExecPath(t, "gcc") @@ -115,8 +110,8 @@ func TestVectoredHandlerDontCrashOnLibrary(t *testing.T) { t.Fatalf("failure while running executable: %s\n%s", err, out) } var expectedOutput string - if runtime.GOARCH == "arm64" || runtime.GOARCH == "arm" { - // TODO: remove when windows/arm64 and windows/arm support SEH stack unwinding. + if runtime.GOARCH == "arm64" { + // TODO: remove when windows/arm64 support SEH stack unwinding. expectedOutput = "exceptionCount: 1\ncontinueCount: 1\nunhandledCount: 0\n" } else { expectedOutput = "exceptionCount: 1\ncontinueCount: 1\nunhandledCount: 1\n" |