Skip to content

Commit 4fdeb73

Browse files
eliasnaureliasnaur
committed
cmd/link/internal/ld,syscall: replace getfsstat64 with getfsstat
getfsstat64 is deprecated but not yet caught by the App Store checks. Use the supported getfsstat$INODE64 form instead to ensure forward compatibility. Change-Id: I0d97e8a8b254debb3de1cfcb3778dbed3702c249 Reviewed-on: https://go-review.googlesource.com/c/go/+/174200 Run-TryBot: Elias Naur <[email protected]> Reviewed-by: Keith Randall <[email protected]>
1 parent 096ab3c commit 4fdeb73

6 files changed

Lines changed: 13 additions & 13 deletions

File tree

‎src/cmd/link/internal/ld/macho.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ func machogenasmsym(ctxt *Link) {
798798
case "386":
799799
s.SetExtname(n + "$INODE64$UNIX2003")
800800
}
801-
case "readdir_r":
801+
case "readdir_r", "getfsstat":
802802
switch objabi.GOARCH {
803803
case "amd64", "386":
804804
s.SetExtname(n + "$INODE64")

‎src/syscall/syscall_darwin.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,18 +188,18 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
188188
_p0 = unsafe.Pointer(&buf[0])
189189
bufsize = unsafe.Sizeof(Statfs_t{}) * uintptr(len(buf))
190190
}
191-
r0, _, e1 := syscall(funcPC(libc_getfsstat64_trampoline), uintptr(_p0), bufsize, uintptr(flags))
191+
r0, _, e1 := syscall(funcPC(libc_getfsstat_trampoline), uintptr(_p0), bufsize, uintptr(flags))
192192
n = int(r0)
193193
if e1 != 0 {
194194
err = e1
195195
}
196196
return
197197
}
198198

199-
func libc_getfsstat64_trampoline()
199+
func libc_getfsstat_trampoline()
200200

201-
//go:linkname libc_getfsstat64 libc_getfsstat64
202-
//go:cgo_import_dynamic libc_getfsstat64 getfsstat64 "/usr/lib/libSystem.B.dylib"
201+
//go:linkname libc_getfsstat libc_getfsstat
202+
//go:cgo_import_dynamic libc_getfsstat getfsstat "/usr/lib/libSystem.B.dylib"
203203

204204
func setattrlistTimes(path string, times []Timespec) error {
205205
_p0, err := BytePtrFromString(path)

‎src/syscall/zsyscall_darwin_386.s‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#include "textflag.h"
44
TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0
55
JMP libc_getattrlist(SB)
6-
TEXT ·libc_getfsstat64_trampoline(SB),NOSPLIT,$0-0
7-
JMP libc_getfsstat64(SB)
6+
TEXT ·libc_getfsstat_trampoline(SB),NOSPLIT,$0-0
7+
JMP libc_getfsstat(SB)
88
TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0
99
JMP libc_setattrlist(SB)
1010
TEXT ·libc_fdopendir_trampoline(SB),NOSPLIT,$0-0

‎src/syscall/zsyscall_darwin_amd64.s‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#include "textflag.h"
44
TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0
55
JMP libc_getattrlist(SB)
6-
TEXT ·libc_getfsstat64_trampoline(SB),NOSPLIT,$0-0
7-
JMP libc_getfsstat64(SB)
6+
TEXT ·libc_getfsstat_trampoline(SB),NOSPLIT,$0-0
7+
JMP libc_getfsstat(SB)
88
TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0
99
JMP libc_setattrlist(SB)
1010
TEXT ·libc_fdopendir_trampoline(SB),NOSPLIT,$0-0

‎src/syscall/zsyscall_darwin_arm.s‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#include "textflag.h"
44
TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0
55
JMP libc_getattrlist(SB)
6-
TEXT ·libc_getfsstat64_trampoline(SB),NOSPLIT,$0-0
7-
JMP libc_getfsstat64(SB)
6+
TEXT ·libc_getfsstat_trampoline(SB),NOSPLIT,$0-0
7+
JMP libc_getfsstat(SB)
88
TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0
99
JMP libc_setattrlist(SB)
1010
TEXT ·libc_fdopendir_trampoline(SB),NOSPLIT,$0-0

‎src/syscall/zsyscall_darwin_arm64.s‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#include "textflag.h"
44
TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0
55
JMP libc_getattrlist(SB)
6-
TEXT ·libc_getfsstat64_trampoline(SB),NOSPLIT,$0-0
7-
JMP libc_getfsstat64(SB)
6+
TEXT ·libc_getfsstat_trampoline(SB),NOSPLIT,$0-0
7+
JMP libc_getfsstat(SB)
88
TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0
99
JMP libc_setattrlist(SB)
1010
TEXT ·libc_fdopendir_trampoline(SB),NOSPLIT,$0-0

0 commit comments

Comments
 (0)