all: remove support for windows/arm

qiulaidongfeng · gopherbot · commit dc54d7b60748 · 2025-08-06T14:28:12.000-07:00
Also CL 690655 for golang.org/x/sys. For #71671 Change-Id: Iceb369dec5affb944a39d07cdabfd7add6f1f319 Reviewed-on: https://go-review.googlesource.com/c/go/+/648795 Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org> Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org> Reviewed-by: Quim Muntal <quimmuntal@gmail.com> Reviewed-by: Mark Freeman <markfreeman@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
diff --git a/doc/next/7-ports.md b/doc/next/7-ports.md
@@ -1,2 +1,6 @@
 ## Ports {#ports}
 
+### Windows
+
+<!-- go.dev/issue/71671 -->
+As [announced](/doc/go1.25#windows) in the Go 1.25 release notes, the [broken](/doc/go1.24#windows) 32-bit windows/arm port (`GOOS=windows` `GOARCH=arm`) is removed.
diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
@@ -1819,7 +1819,6 @@ var cgoEnabled = map[string]bool{
 	"solaris/amd64":   true,
 	"windows/386":     true,
 	"windows/amd64":   true,
-	"windows/arm":     false,
 	"windows/arm64":   true,
 }
 
@@ -1831,7 +1830,6 @@ var broken = map[string]bool{
 	"freebsd/riscv64": true, // Broken: go.dev/issue/73568.
 	"linux/sparc64":   true, // An incomplete port. See CL 132155.
 	"openbsd/mips64":  true, // Broken: go.dev/issue/58110.
-	"windows/arm":     true, // Broken: go.dev/issue/68552.
 }
 
 // List of platforms which are first class ports. See go.dev/issue/38874.
diff --git a/src/cmd/dist/sys_windows.go b/src/cmd/dist/sys_windows.go
@@ -33,7 +33,6 @@ type systeminfo struct {
 const (
 	PROCESSOR_ARCHITECTURE_AMD64 = 9
 	PROCESSOR_ARCHITECTURE_INTEL = 0
-	PROCESSOR_ARCHITECTURE_ARM   = 5
 	PROCESSOR_ARCHITECTURE_ARM64 = 12
 	PROCESSOR_ARCHITECTURE_IA64  = 6
 )
@@ -47,8 +46,6 @@ func sysinit() {
 		gohostarch = "amd64"
 	case PROCESSOR_ARCHITECTURE_INTEL:
 		gohostarch = "386"
-	case PROCESSOR_ARCHITECTURE_ARM:
-		gohostarch = "arm"
 	case PROCESSOR_ARCHITECTURE_ARM64:
 		gohostarch = "arm64"
 	default:
diff --git a/src/cmd/internal/objfile/pe.go b/src/cmd/internal/objfile/pe.go
@@ -174,8 +174,6 @@ func (f *peFile) goarch() string {
 		return "386"
 	case pe.IMAGE_FILE_MACHINE_AMD64:
 		return "amd64"
-	case pe.IMAGE_FILE_MACHINE_ARMNT:
-		return "arm"
 	case pe.IMAGE_FILE_MACHINE_ARM64:
 		return "arm64"
 	default:
diff --git a/src/cmd/link/internal/arm/obj.go b/src/cmd/link/internal/arm/obj.go
@@ -105,9 +105,5 @@ func archinit(ctxt *ld.Link) {
 		if *ld.FlagTextAddr == -1 {
 			*ld.FlagTextAddr = ld.Rnd(0x10000, *ld.FlagRound) + int64(ld.HEADR)
 		}
-
-	case objabi.Hwindows: /* PE executable */
-		// ld.HEADR, ld.FlagTextAddr, ld.FlagRound are set in ld.Peinit
-		return
 	}
 }
diff --git a/src/cmd/link/internal/ld/config.go b/src/cmd/link/internal/ld/config.go
@@ -34,7 +34,7 @@ func (mode *BuildMode) Set(s string) error {
 		return fmt.Errorf("invalid buildmode: %q", s)
 	case "exe":
 		switch buildcfg.GOOS + "/" + buildcfg.GOARCH {
-		case "darwin/arm64", "windows/arm", "windows/arm64": // On these platforms, everything is PIE
+		case "darwin/arm64", "windows/arm64": // On these platforms, everything is PIE
 			*mode = BuildModePIE
 		default:
 			*mode = BuildModeExe
diff --git a/src/cmd/link/internal/ld/pe.go b/src/cmd/link/internal/ld/pe.go
@@ -913,8 +913,6 @@ func (f *peFile) writeFileHeader(ctxt *Link) {
 		fh.Machine = pe.IMAGE_FILE_MACHINE_AMD64
 	case sys.I386:
 		fh.Machine = pe.IMAGE_FILE_MACHINE_I386
-	case sys.ARM:
-		fh.Machine = pe.IMAGE_FILE_MACHINE_ARMNT
 	case sys.ARM64:
 		fh.Machine = pe.IMAGE_FILE_MACHINE_ARM64
 	}
diff --git a/src/internal/platform/supported.go b/src/internal/platform/supported.go
@@ -194,7 +194,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
@@ -226,7 +226,7 @@ func InternalLinkPIESupported(goos, goarch string) bool {
 	case "android/arm64",
 		"darwin/amd64", "darwin/arm64",
 		"linux/amd64", "linux/arm64", "linux/loong64", "linux/ppc64le",
-		"windows/386", "windows/amd64", "windows/arm", "windows/arm64":
+		"windows/386", "windows/amd64", "windows/arm64":
 		return true
 	}
 	return false
diff --git a/src/internal/platform/zosarch.go b/src/internal/platform/zosarch.go
diff --git a/src/runtime/asm_arm.s b/src/runtime/asm_arm.s
@@ -794,9 +794,6 @@ TEXT setg<>(SB),NOSPLIT|NOFRAME,$0-0
 	MOVW	R0, g
 
 	// Save g to thread-local storage.
-#ifdef GOOS_windows
-	B	runtime·save_g(SB)
-#else
 #ifdef GOOS_openbsd
 	B	runtime·save_g(SB)
 #else
@@ -808,7 +805,6 @@ TEXT setg<>(SB),NOSPLIT|NOFRAME,$0-0
 	MOVW	g, R0
 	RET
 #endif
-#endif
 
 TEXT runtime·emptyfunc(SB),0,$0-0
 	RET
diff --git a/src/runtime/pprof/pprof_test.go b/src/runtime/pprof/pprof_test.go
@@ -635,10 +635,6 @@ func TestCPUProfileWithFork(t *testing.T) {
 		// Use smaller size for Android to avoid crash.
 		heap = 100 << 20
 	}
-	if runtime.GOOS == "windows" && runtime.GOARCH == "arm" {
-		// Use smaller heap for Windows/ARM to avoid crash.
-		heap = 100 << 20
-	}
 	if testing.Short() {
 		heap = 100 << 20
 	}
diff --git a/src/runtime/rt0_windows_arm.s b/src/runtime/rt0_windows_arm.s
diff --git a/src/runtime/signal_windows.go b/src/runtime/signal_windows.go
@@ -39,7 +39,7 @@ func enableWER() {
 	}
 }
 
-// in sys_windows_386.s, sys_windows_amd64.s, sys_windows_arm.s, and sys_windows_arm64.s
+// in sys_windows_386.s, sys_windows_amd64.s, and sys_windows_arm64.s
 func exceptiontramp()
 func firstcontinuetramp()
 func lastcontinuetramp()
@@ -64,10 +64,9 @@ func initExceptionHandler() {
 //go:nosplit
 func isAbort(r *context) bool {
 	pc := r.ip()
-	if GOARCH == "386" || GOARCH == "amd64" || GOARCH == "arm" {
+	if GOARCH == "386" || GOARCH == "amd64" {
 		// In the case of an abort, the exception IP is one byte after
-		// the INT3 (this differs from UNIX OSes). Note that on ARM,
-		// this means that the exception IP is no longer aligned.
+		// the INT3 (this differs from UNIX OSes).
 		pc--
 	}
 	return isAbortPC(pc)
diff --git a/src/runtime/syscall_windows.go b/src/runtime/syscall_windows.go
@@ -236,7 +236,7 @@ func callbackasm()
 // and we want callback to arrive at
 // correspondent call instruction instead of start of
 // runtime.callbackasm.
-// On ARM, runtime.callbackasm is a series of mov and branch instructions.
+// On ARM64, runtime.callbackasm is a series of mov and branch instructions.
 // R12 is loaded with the callback index. Each entry is two instructions,
 // hence 8 bytes.
 func callbackasmAddr(i int) uintptr {
@@ -246,8 +246,8 @@ func callbackasmAddr(i int) uintptr {
 		panic("unsupported architecture")
 	case "386", "amd64":
 		entrySize = 5
-	case "arm", "arm64":
-		// On ARM and ARM64, each entry is a MOV instruction
+	case "arm64":
+		// On ARM64, each entry is a MOV instruction
 		// followed by a branch instruction
 		entrySize = 8
 	}
diff --git a/src/runtime/time_windows_arm.s b/src/runtime/time_windows_arm.s
diff --git a/src/runtime/wincallback.go b/src/runtime/wincallback.go
@@ -47,34 +47,6 @@ TEXT runtime·callbackasm(SB),NOSPLIT|NOFRAME,$0
 	}
 }
 
-func genasmArm() {
-	var buf bytes.Buffer
-
-	buf.WriteString(`// Code generated by wincallback.go using 'go generate'. DO NOT EDIT.
-
-// External code calls into callbackasm at an offset corresponding
-// to the callback index. Callbackasm is a table of MOV and B instructions.
-// The MOV instruction loads R12 with the callback index, and the
-// B instruction branches to callbackasm1.
-// callbackasm1 takes the callback index from R12 and
-// indexes into an array that stores information about each callback.
-// It then calls the Go implementation for that callback.
-#include "textflag.h"
-
-TEXT runtime·callbackasm(SB),NOSPLIT|NOFRAME,$0
-`)
-	for i := 0; i < maxCallback; i++ {
-		fmt.Fprintf(&buf, "\tMOVW\t$%d, R12\n", i)
-		buf.WriteString("\tB\truntime·callbackasm1(SB)\n")
-	}
-
-	err := os.WriteFile("zcallback_windows_arm.s", buf.Bytes(), 0666)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "wincallback: %s\n", err)
-		os.Exit(2)
-	}
-}
-
 func genasmArm64() {
 	var buf bytes.Buffer
 
@@ -121,7 +93,6 @@ const cb_max = %d // maximum number of windows callbacks allowed
 
 func main() {
 	genasm386Amd64()
-	genasmArm()
 	genasmArm64()
 	gengo()
 }
diff --git a/src/runtime/zcallback_windows_arm.s b/src/runtime/zcallback_windows_arm.s
diff --git a/src/syscall/syscall_windows.go b/src/syscall/syscall_windows.go
diff --git a/src/syscall/types_windows_arm.go b/src/syscall/types_windows_arm.go

Original file line number	Diff line number	Diff line change
`@@ -1819,7 +1819,6 @@ var cgoEnabled = map[string]bool{`
`1819`	`1819`	`"solaris/amd64": true,`
`1820`	`1820`	`"windows/386": true,`
`1821`	`1821`	`"windows/amd64": true,`
`1822`		`- "windows/arm": false,`
`1823`	`1822`	`"windows/arm64": true,`
`1824`	`1823`	`}`
`1825`	`1824`
`@@ -1831,7 +1830,6 @@ var broken = map[string]bool{`
`1831`	`1830`	`"freebsd/riscv64": true, // Broken: go.dev/issue/73568.`
`1832`	`1831`	`"linux/sparc64": true, // An incomplete port. See CL 132155.`
`1833`	`1832`	`"openbsd/mips64": true, // Broken: go.dev/issue/58110.`
`1834`		`- "windows/arm": true, // Broken: go.dev/issue/68552.`
`1835`	`1833`	`}`
`1836`	`1834`
`1837`	`1835`	`// List of platforms which are first class ports. See go.dev/issue/38874.`
Original file line number	Diff line number	Diff line change
`@@ -105,9 +105,5 @@ func archinit(ctxt *ld.Link) {`
`105`	`105`	`if *ld.FlagTextAddr == -1 {`
`106`	`106`	`ld.FlagTextAddr = ld.Rnd(0x10000, ld.FlagRound) + int64(ld.HEADR)`
`107`	`107`	`}`
`108`		`-`
`109`		`- case objabi.Hwindows: /* PE executable */`
`110`		`- // ld.HEADR, ld.FlagTextAddr, ld.FlagRound are set in ld.Peinit`
`111`		`- return`
`112`	`108`	`}`
`113`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -913,8 +913,6 @@ func (f peFile) writeFileHeader(ctxt Link) {`
`913`	`913`	`fh.Machine = pe.IMAGE_FILE_MACHINE_AMD64`
`914`	`914`	`case sys.I386:`
`915`	`915`	`fh.Machine = pe.IMAGE_FILE_MACHINE_I386`
`916`		`- case sys.ARM:`
`917`		`- fh.Machine = pe.IMAGE_FILE_MACHINE_ARMNT`
`918`	`916`	`case sys.ARM64:`
`919`	`917`	`fh.Machine = pe.IMAGE_FILE_MACHINE_ARM64`
`920`	`918`	`}`