Skip to content

Commit 54d2441

Browse files
randall77randall77
committed
unix: remove Getdirentries on iOS
This system call doesn't exist on iOS. Update golang/go#28984 Change-Id: I92eb6fd3eb263863a31338bc18c9826a2242434b Reviewed-on: https://go-review.googlesource.com/c/154659 Reviewed-by: Brad Fitzpatrick <[email protected]>
1 parent 8b8312a commit 54d2441

17 files changed

+90
-161
lines changed

‎unix/syscall_darwin.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,6 @@ func Uname(uname *Utsname) error {
437437
//sys Fpathconf(fd int, name int) (val int, err error)
438438
//sys Fsync(fd int) (err error)
439439
//sys Ftruncate(fd int, length int64) (err error)
440-
//sys Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) = SYS_GETDIRENTRIES64
441440
//sys Getdtablesize() (size int)
442441
//sysnb Getegid() (egid int)
443442
//sysnb Geteuid() (uid int)

‎unix/syscall_darwin_386.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ const SYS___SYSCTL = SYS_SYSCTL
7070
//sys Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
7171
//sys Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) = SYS_FSTATAT64
7272
//sys Fstatfs(fd int, stat *Statfs_t) (err error) = SYS_FSTATFS64
73+
//sys Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) = SYS_GETDIRENTRIES64
7374
//sys Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
7475
//sys Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
7576
//sys Statfs(path string, stat *Statfs_t) (err error) = SYS_STATFS64

‎unix/syscall_darwin_amd64.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ const SYS___SYSCTL = SYS_SYSCTL
7070
//sys Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
7171
//sys Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) = SYS_FSTATAT64
7272
//sys Fstatfs(fd int, stat *Statfs_t) (err error) = SYS_FSTATFS64
73+
//sys Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) = SYS_GETDIRENTRIES64
7374
//sys Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
7475
//sys Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
7576
//sys Statfs(path string, stat *Statfs_t) (err error) = SYS_STATFS64

‎unix/syscall_darwin_arm.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,7 @@ const SYS___SYSCTL = SYS_SYSCTL
7171
//sys Lstat(path string, stat *Stat_t) (err error)
7272
//sys Stat(path string, stat *Stat_t) (err error)
7373
//sys Statfs(path string, stat *Statfs_t) (err error)
74+
75+
func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
76+
return 0, ENOSYS
77+
}

‎unix/syscall_darwin_arm64.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,7 @@ const SYS___SYSCTL = SYS_SYSCTL
7373
//sys Lstat(path string, stat *Stat_t) (err error)
7474
//sys Stat(path string, stat *Stat_t) (err error)
7575
//sys Statfs(path string, stat *Statfs_t) (err error)
76+
77+
func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
78+
return 0, ENOSYS
79+
}

‎unix/zsyscall_darwin_386.1_12.go

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unix/zsyscall_darwin_386.go

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unix/zsyscall_darwin_386.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,6 @@ TEXT ·libc_fsync_trampoline(SB),NOSPLIT,$0-0
134134
JMP libc_fsync(SB)
135135
TEXT ·libc_ftruncate_trampoline(SB),NOSPLIT,$0-0
136136
JMP libc_ftruncate(SB)
137-
TEXT ·libc___getdirentries64_trampoline(SB),NOSPLIT,$0-0
138-
JMP libc___getdirentries64(SB)
139137
TEXT ·libc_getdtablesize_trampoline(SB),NOSPLIT,$0-0
140138
JMP libc_getdtablesize(SB)
141139
TEXT ·libc_getegid_trampoline(SB),NOSPLIT,$0-0
@@ -268,6 +266,8 @@ TEXT ·libc_fstatat64_trampoline(SB),NOSPLIT,$0-0
268266
JMP libc_fstatat64(SB)
269267
TEXT ·libc_fstatfs64_trampoline(SB),NOSPLIT,$0-0
270268
JMP libc_fstatfs64(SB)
269+
TEXT ·libc___getdirentries64_trampoline(SB),NOSPLIT,$0-0
270+
JMP libc___getdirentries64(SB)
271271
TEXT ·libc_lstat64_trampoline(SB),NOSPLIT,$0-0
272272
JMP libc_lstat64(SB)
273273
TEXT ·libc_stat64_trampoline(SB),NOSPLIT,$0-0

‎unix/zsyscall_darwin_amd64.1_12.go

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unix/zsyscall_darwin_amd64.go

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unix/zsyscall_darwin_amd64.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,6 @@ TEXT ·libc_fsync_trampoline(SB),NOSPLIT,$0-0
134134
JMP libc_fsync(SB)
135135
TEXT ·libc_ftruncate_trampoline(SB),NOSPLIT,$0-0
136136
JMP libc_ftruncate(SB)
137-
TEXT ·libc___getdirentries64_trampoline(SB),NOSPLIT,$0-0
138-
JMP libc___getdirentries64(SB)
139137
TEXT ·libc_getdtablesize_trampoline(SB),NOSPLIT,$0-0
140138
JMP libc_getdtablesize(SB)
141139
TEXT ·libc_getegid_trampoline(SB),NOSPLIT,$0-0
@@ -268,6 +266,8 @@ TEXT ·libc_fstatat64_trampoline(SB),NOSPLIT,$0-0
268266
JMP libc_fstatat64(SB)
269267
TEXT ·libc_fstatfs64_trampoline(SB),NOSPLIT,$0-0
270268
JMP libc_fstatfs64(SB)
269+
TEXT ·libc___getdirentries64_trampoline(SB),NOSPLIT,$0-0
270+
JMP libc___getdirentries64(SB)
271271
TEXT ·libc_lstat64_trampoline(SB),NOSPLIT,$0-0
272272
JMP libc_lstat64(SB)
273273
TEXT ·libc_stat64_trampoline(SB),NOSPLIT,$0-0

‎unix/zsyscall_darwin_arm.1_12.go

Lines changed: 0 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unix/zsyscall_darwin_arm.go

Lines changed: 0 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unix/zsyscall_darwin_arm.s

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,6 @@ TEXT ·libc_fsync_trampoline(SB),NOSPLIT,$0-0
134134
JMP libc_fsync(SB)
135135
TEXT ·libc_ftruncate_trampoline(SB),NOSPLIT,$0-0
136136
JMP libc_ftruncate(SB)
137-
TEXT ·libc___getdirentries64_trampoline(SB),NOSPLIT,$0-0
138-
JMP libc___getdirentries64(SB)
139137
TEXT ·libc_getdtablesize_trampoline(SB),NOSPLIT,$0-0
140138
JMP libc_getdtablesize(SB)
141139
TEXT ·libc_getegid_trampoline(SB),NOSPLIT,$0-0

‎unix/zsyscall_darwin_arm64.1_12.go

Lines changed: 0 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unix/zsyscall_darwin_arm64.go

Lines changed: 0 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)