unix: delete darwin/386 and darwin/arm code

This repo supports two Go releases, Go 1.15 and 1.16 (and tip). The darwin/386 and darwin/arm ports are dropped in Go 1.15. And these ports already do not build even with Go 1.14. Delete them. Change-Id: Ib15e7c35059967803a1d5f086b00fbfed53a9b33 Reviewed-on: https://go-review.googlesource.com/c/sys/+/316769 Trust: Cherry Mui <cherryyz@google.com> Run-TryBot: Cherry Mui <cherryyz@google.com> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Ian Lance Taylor <iant@golang.org>
golang · May 7, 2021 · 30e306a · 30e306a
1 parent 0981d60
commit 30e306a
Show file tree

Hide file tree

Showing 21 changed files with 9 additions and 11,159 deletions.
diff --git a/unix/darwin_test.go b/unix/darwin_test.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build (darwin && go1.12 && amd64) || (darwin && go1.12 && 386)
-// +build darwin,go1.12,amd64 darwin,go1.12,386
+//go:build darwin && go1.12 && amd64
+// +build darwin,go1.12,amd64
 
 package unix
 

diff --git a/unix/mkall.sh b/unix/mkall.sh
@@ -70,23 +70,11 @@ aix_ppc64)
 	mksyscall="go run mksyscall_aix_ppc64.go -aix"
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
 	;;
-darwin_386)
-	mkerrors="$mkerrors -m32"
-	mksyscall="go run mksyscall.go -l32"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	mkasm="go run mkasm_darwin.go"
-	;;
 darwin_amd64)
 	mkerrors="$mkerrors -m64"
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
 	mkasm="go run mkasm_darwin.go"
 	;;
-darwin_arm)
-	mkerrors="$mkerrors"
-	mksyscall="go run mksyscall.go -l32"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	mkasm="go run mkasm_darwin.go"
-	;;
 darwin_arm64)
 	mkerrors="$mkerrors -m64"
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs"

diff --git a/unix/sendfile_test.go b/unix/sendfile_test.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build (darwin && amd64) || (darwin && 386) || dragonfly || freebsd || linux || solaris
-// +build darwin,amd64 darwin,386 dragonfly freebsd linux solaris
+//go:build (darwin && amd64) || dragonfly || freebsd || linux || solaris
+// +build darwin,amd64 dragonfly freebsd linux solaris
 
 package unix_test
 

diff --git a/unix/syscall_darwin_386.go b/unix/syscall_darwin_386.go
diff --git a/unix/syscall_darwin_arm.go b/unix/syscall_darwin_arm.go
diff --git a/unix/syscall_unix_test.go b/unix/syscall_unix_test.go
@@ -166,7 +166,7 @@ func TestFcntlFlock(t *testing.T) {
 // "-test.run=^TestPassFD$" and an environment variable used to signal
 // that the test should become the child process instead.
 func TestPassFD(t *testing.T) {
-	if (runtime.GOOS == "darwin" || runtime.GOOS == "ios") && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") {
+	if (runtime.GOOS == "darwin" || runtime.GOOS == "ios") && runtime.GOARCH == "arm64" {
 		t.Skip("cannot exec subprocess on iOS, skipping test")
 	}
 
@@ -488,7 +488,7 @@ func TestDup(t *testing.T) {
 
 func TestPoll(t *testing.T) {
 	if runtime.GOOS == "android" ||
-		((runtime.GOOS == "darwin" || runtime.GOOS == "ios") && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64")) {
+		((runtime.GOOS == "darwin" || runtime.GOOS == "ios") && runtime.GOARCH == "arm64") {
 		t.Skip("mkfifo syscall is not available on android and iOS, skipping test")
 	}
 
@@ -612,7 +612,7 @@ func TestGetwd(t *testing.T) {
 		dirs = []string{"/", "/system/bin"}
 	case "darwin", "ios":
 		switch runtime.GOARCH {
-		case "arm", "arm64":
+		case "arm64":
 			d1, err := ioutil.TempDir("", "d1")
 			if err != nil {
 				t.Fatalf("TempDir: %v", err)

diff --git a/unix/syscall_zos_test.go b/unix/syscall_zos_test.go
@@ -168,7 +168,7 @@ func TestFcntlFlock(t *testing.T) {
 // "-test.run=^TestPassFD$" and an environment variable used to signal
 // that the test should become the child process instead.
 func TestPassFD(t *testing.T) {
-	if runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") {
+	if runtime.GOOS == "darwin" && runtime.GOARCH == "arm64" {
 		t.Skip("cannot exec subprocess on iOS, skipping test")
 	}
 
@@ -493,7 +493,7 @@ func TestGetwd(t *testing.T) {
 		dirs = []string{"/", "/system/bin"}
 	case "darwin":
 		switch runtime.GOARCH {
-		case "arm", "arm64":
+		case "arm64":
 			d1, err := ioutil.TempDir("", "d1")
 			if err != nil {
 				t.Fatalf("TempDir: %v", err)