Skip to content

Commit 6fcdbc0

Browse files
committed
unix: drop support for pre-1.12 direct syscalls on darwin
Go 1.12 and newer are using libSystem for syscalls on darwin. Go 1.11 is the last release to use direct syscalls. It hasn't been supported since the release of Go 1.13 in September 2019, so drop support for direct syscalls. Change-Id: I2baf6f3d1031de8e474dc770369a25147e5efe2a Reviewed-on: https://go-review.googlesource.com/c/sys/+/250437 Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
1 parent f9321e4 commit 6fcdbc0

17 files changed

+0
-8990
lines changed

unix/mkall.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,26 +73,22 @@ aix_ppc64)
7373
darwin_386)
7474
mkerrors="$mkerrors -m32"
7575
mksyscall="go run mksyscall.go -l32"
76-
mksysnum="go run mksysnum.go $(xcrun --show-sdk-path --sdk macosx)/usr/include/sys/syscall.h"
7776
mktypes="GOARCH=$GOARCH go tool cgo -godefs"
7877
mkasm="go run mkasm_darwin.go"
7978
;;
8079
darwin_amd64)
8180
mkerrors="$mkerrors -m64"
82-
mksysnum="go run mksysnum.go $(xcrun --show-sdk-path --sdk macosx)/usr/include/sys/syscall.h"
8381
mktypes="GOARCH=$GOARCH go tool cgo -godefs"
8482
mkasm="go run mkasm_darwin.go"
8583
;;
8684
darwin_arm)
8785
mkerrors="$mkerrors"
8886
mksyscall="go run mksyscall.go -l32"
89-
mksysnum="go run mksysnum.go $(xcrun --show-sdk-path --sdk iphoneos)/usr/include/sys/syscall.h"
9087
mktypes="GOARCH=$GOARCH go tool cgo -godefs"
9188
mkasm="go run mkasm_darwin.go"
9289
;;
9390
darwin_arm64)
9491
mkerrors="$mkerrors -m64"
95-
mksysnum="go run mksysnum.go $(xcrun --show-sdk-path --sdk iphoneos)/usr/include/sys/syscall.h"
9692
mktypes="GOARCH=$GOARCH go tool cgo -godefs"
9793
mkasm="go run mkasm_darwin.go"
9894
;;
@@ -226,8 +222,6 @@ esac
226222
# aix/ppc64 script generates files instead of writing to stdin.
227223
echo "$mksyscall -tags $GOOS,$GOARCH $syscall_goos $GOOSARCH_in && gofmt -w zsyscall_$GOOSARCH.go && gofmt -w zsyscall_"$GOOSARCH"_gccgo.go && gofmt -w zsyscall_"$GOOSARCH"_gc.go " ;
228224
elif [ "$GOOS" == "darwin" ]; then
229-
# pre-1.12, direct syscalls
230-
echo "$mksyscall -tags $GOOS,$GOARCH,!go1.12 $syscall_goos syscall_darwin_${GOARCH}.1_11.go $GOOSARCH_in |gofmt >zsyscall_$GOOSARCH.1_11.go";
231225
# 1.12 and later, syscalls via libSystem
232226
echo "$mksyscall -tags $GOOS,$GOARCH,go1.12 $syscall_goos $GOOSARCH_in |gofmt >zsyscall_$GOOSARCH.go";
233227
# 1.13 and later, syscalls via libSystem (including syscallPtr)

unix/syscall_darwin_386.1_11.go

Lines changed: 0 additions & 9 deletions
This file was deleted.

unix/syscall_darwin_386.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ func (cmsg *Cmsghdr) SetLen(length int) {
4444

4545
func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
4646

47-
// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
48-
// of darwin/386 the syscall is called sysctl instead of __sysctl.
49-
const SYS___SYSCTL = SYS_SYSCTL
50-
5147
//sys Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
5248
//sys Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) = SYS_FSTATAT64
5349
//sys Fstatfs(fd int, stat *Statfs_t) (err error) = SYS_FSTATFS64

unix/syscall_darwin_amd64.1_11.go

Lines changed: 0 additions & 9 deletions
This file was deleted.

unix/syscall_darwin_amd64.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ func (cmsg *Cmsghdr) SetLen(length int) {
4444

4545
func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
4646

47-
// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
48-
// of darwin/amd64 the syscall is called sysctl instead of __sysctl.
49-
const SYS___SYSCTL = SYS_SYSCTL
50-
5147
//sys Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
5248
//sys Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) = SYS_FSTATAT64
5349
//sys Fstatfs(fd int, stat *Statfs_t) (err error) = SYS_FSTATFS64

unix/syscall_darwin_arm.1_11.go

Lines changed: 0 additions & 11 deletions
This file was deleted.

unix/syscall_darwin_arm.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ func (cmsg *Cmsghdr) SetLen(length int) {
4444

4545
func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno) // sic
4646

47-
// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
48-
// of darwin/arm the syscall is called sysctl instead of __sysctl.
49-
const SYS___SYSCTL = SYS_SYSCTL
50-
5147
//sys Fstat(fd int, stat *Stat_t) (err error)
5248
//sys Fstatat(fd int, path string, stat *Stat_t, flags int) (err error)
5349
//sys Fstatfs(fd int, stat *Statfs_t) (err error)

unix/syscall_darwin_arm64.1_11.go

Lines changed: 0 additions & 11 deletions
This file was deleted.

unix/syscall_darwin_arm64.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ func (cmsg *Cmsghdr) SetLen(length int) {
4646

4747
func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno) // sic
4848

49-
// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
50-
// of darwin/arm64 the syscall is called sysctl instead of __sysctl.
51-
const SYS___SYSCTL = SYS_SYSCTL
52-
5349
//sys Fstat(fd int, stat *Stat_t) (err error)
5450
//sys Fstatat(fd int, path string, stat *Stat_t, flags int) (err error)
5551
//sys Fstatfs(fd int, stat *Statfs_t) (err error)

0 commit comments

Comments
 (0)