diff options
| author | Austin Clements <austin@google.com> | 2020-04-03 12:22:27 -0400 |
|---|---|---|
| committer | Austin Clements <austin@google.com> | 2020-04-08 18:35:49 +0000 |
| commit | f7e6ab44b410ef56bb89da182948a451d3cca34c (patch) | |
| tree | 9d49b461aff716c2d398e720c9bee93c20e1898e /src/syscall | |
| parent | da8591b61c141ca58e4b3eae382d2827006344fd (diff) | |
| download | go-f7e6ab44b410ef56bb89da182948a451d3cca34c.tar.xz | |
all: remove scattered remnants of darwin/arm
This removes all conditions and conditional code (that I could find)
that depended on darwin/arm.
Fixes #35439 (since that only happened on darwin/arm)
Fixes #37611.
Change-Id: Ia4c32a5a4368ed75231075832b0b5bfb1ad11986
Reviewed-on: https://go-review.googlesource.com/c/go/+/227198
Run-TryBot: Austin Clements <austin@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Diffstat (limited to 'src/syscall')
| -rwxr-xr-x | src/syscall/mkall.sh | 7 | ||||
| -rw-r--r-- | src/syscall/syscall_unix_test.go | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/syscall/mkall.sh b/src/syscall/mkall.sh index aa6706c82e..7e624c5a21 100755 --- a/src/syscall/mkall.sh +++ b/src/syscall/mkall.sh @@ -142,13 +142,6 @@ darwin_arm64) mktypes="GOARCH=$GOARCH go tool cgo -godefs" mkasm="go run mkasm_darwin.go" ;; -darwin_arm) - mkerrors="$mkerrors -m32" - mksyscall="./mksyscall.pl -l32 -darwin" - mksysnum="./mksysnum_darwin.pl /usr/include/sys/syscall.h" - mktypes="GOARCH=$GOARCH go tool cgo -godefs" - mkasm="go run mkasm_darwin.go" - ;; dragonfly_amd64) mkerrors="$mkerrors -m64" mksyscall="./mksyscall.pl -dragonfly" diff --git a/src/syscall/syscall_unix_test.go b/src/syscall/syscall_unix_test.go index ff47a0c81a..13b79ca8d8 100644 --- a/src/syscall/syscall_unix_test.go +++ b/src/syscall/syscall_unix_test.go @@ -70,7 +70,7 @@ func _() { // Thus this test also verifies that the Flock_t structure can be // roundtripped with F_SETLK and F_GETLK. func TestFcntlFlock(t *testing.T) { - if runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") { + if runtime.GOOS == "darwin" && runtime.GOARCH == "arm64" { t.Skip("skipping; no child processes allowed on iOS") } flock := syscall.Flock_t{ |