diff options
| author | qiulaidongfeng <2645477756@qq.com> | 2025-02-12 16:25:23 +0800 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2025-08-06 14:28:12 -0700 |
| commit | dc54d7b607488e71776ba0fa3d09398d65daf033 (patch) | |
| tree | 8bcce9de1ef183c015853f5676c0bb69420a07f4 /src/cmd/link | |
| parent | e0a1ea431c960c3ed740f9b32754e7c31737035c (diff) | |
| download | go-dc54d7b607488e71776ba0fa3d09398d65daf033.tar.xz | |
all: remove support for windows/arm
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>
Diffstat (limited to 'src/cmd/link')
| -rw-r--r-- | src/cmd/link/internal/arm/obj.go | 4 | ||||
| -rw-r--r-- | src/cmd/link/internal/ld/config.go | 2 | ||||
| -rw-r--r-- | src/cmd/link/internal/ld/pe.go | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/src/cmd/link/internal/arm/obj.go b/src/cmd/link/internal/arm/obj.go index 3a1830ce10..c17dca40b3 100644 --- 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 index b2d4ad7cb0..802fb35aee 100644 --- 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 index fbfd928e87..c290410b0e 100644 --- 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 } |