mirror of
https://github.com/golang/go.git
synced 2025-12-08 06:10:04 +00:00
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>
This commit is contained in:
parent
27ce6e4e26
commit
1d459c4357
4 changed files with 5 additions and 8 deletions
1
src/cmd/dist/test.go
vendored
1
src/cmd/dist/test.go
vendored
|
|
@ -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
|
||||
|
|
|
|||
5
src/cmd/dist/util.go
vendored
5
src/cmd/dist/util.go
vendored
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue