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 <mail@eliasnaur.com>
Reviewed-by: Keith Randall <khr@golang.org>

diff --git a/src/cmd/link/internal/ld/macho.go b/src/cmd/link/internal/ld/macho.go
index 98c4d3d3a5bd0dc171e795b4e4e41e8796e27e74..1c54d59295dc3eda01bdd9b7f1f5dcee3328db9c 100644 (file)
--- a/src/cmd/link/internal/ld/macho.go
+++ b/src/cmd/link/internal/ld/macho.go
@@ -798,7 +798,7 @@ func machogenasmsym(ctxt *Link) {
                                        case "386":
                                                s.SetExtname(n + "$INODE64$UNIX2003")
                                        }
-                               case "readdir_r":
+                               case "readdir_r", "getfsstat":
                                        switch objabi.GOARCH {
                                        case "amd64", "386":
                                                s.SetExtname(n + "$INODE64")

diff --git a/src/syscall/syscall_darwin.go b/src/syscall/syscall_darwin.go
index 7fc96f8937fe5609d1c58cabb60374ef45b3aa92..e7a0967d362d7834541b308960210139140777c6 100644 (file)
--- a/src/syscall/syscall_darwin.go
+++ b/src/syscall/syscall_darwin.go
@@ -188,7 +188,7 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
                _p0 = unsafe.Pointer(&buf[0])
                bufsize = unsafe.Sizeof(Statfs_t{}) * uintptr(len(buf))
        }
-       r0, _, e1 := syscall(funcPC(libc_getfsstat64_trampoline), uintptr(_p0), bufsize, uintptr(flags))
+       r0, _, e1 := syscall(funcPC(libc_getfsstat_trampoline), uintptr(_p0), bufsize, uintptr(flags))
        n = int(r0)
        if e1 != 0 {
                err = e1
@@ -196,10 +196,10 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
        return
 }
 
-func libc_getfsstat64_trampoline()
+func libc_getfsstat_trampoline()
 
-//go:linkname libc_getfsstat64 libc_getfsstat64
-//go:cgo_import_dynamic libc_getfsstat64 getfsstat64 "/usr/lib/libSystem.B.dylib"
+//go:linkname libc_getfsstat libc_getfsstat
+//go:cgo_import_dynamic libc_getfsstat getfsstat "/usr/lib/libSystem.B.dylib"
 
 func setattrlistTimes(path string, times []Timespec) error {
        _p0, err := BytePtrFromString(path)

diff --git a/src/syscall/zsyscall_darwin_386.s b/src/syscall/zsyscall_darwin_386.s
index ba52e93fe9f79827aa4aa83ca31252fdacdf508f..a50c3ef4df3633027cd5069b1333fbae58604eea 100644 (file)
--- a/src/syscall/zsyscall_darwin_386.s
+++ b/src/syscall/zsyscall_darwin_386.s
@@ -3,8 +3,8 @@
 #include "textflag.h"
 TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0
        JMP     libc_getattrlist(SB)
-TEXT ·libc_getfsstat64_trampoline(SB),NOSPLIT,$0-0
-       JMP     libc_getfsstat64(SB)
+TEXT ·libc_getfsstat_trampoline(SB),NOSPLIT,$0-0
+       JMP     libc_getfsstat(SB)
 TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0
        JMP     libc_setattrlist(SB)
 TEXT ·libc_fdopendir_trampoline(SB),NOSPLIT,$0-0

diff --git a/src/syscall/zsyscall_darwin_amd64.s b/src/syscall/zsyscall_darwin_amd64.s
index 32c9e11456880e87a15986525e6c677fc0d13908..626cd752dbae7b1d4b539fbc1b8d9c160be39457 100644 (file)
--- a/src/syscall/zsyscall_darwin_amd64.s
+++ b/src/syscall/zsyscall_darwin_amd64.s
@@ -3,8 +3,8 @@
 #include "textflag.h"
 TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0
        JMP     libc_getattrlist(SB)
-TEXT ·libc_getfsstat64_trampoline(SB),NOSPLIT,$0-0
-       JMP     libc_getfsstat64(SB)
+TEXT ·libc_getfsstat_trampoline(SB),NOSPLIT,$0-0
+       JMP     libc_getfsstat(SB)
 TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0
        JMP     libc_setattrlist(SB)
 TEXT ·libc_fdopendir_trampoline(SB),NOSPLIT,$0-0

diff --git a/src/syscall/zsyscall_darwin_arm.s b/src/syscall/zsyscall_darwin_arm.s
index fc1a18400362393cf8043b26b120c00cb2e3be92..09634132660dfbfd5a7ca742a342897c5674e43a 100644 (file)
--- a/src/syscall/zsyscall_darwin_arm.s
+++ b/src/syscall/zsyscall_darwin_arm.s
@@ -3,8 +3,8 @@
 #include "textflag.h"
 TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0
        JMP     libc_getattrlist(SB)
-TEXT ·libc_getfsstat64_trampoline(SB),NOSPLIT,$0-0
-       JMP     libc_getfsstat64(SB)
+TEXT ·libc_getfsstat_trampoline(SB),NOSPLIT,$0-0
+       JMP     libc_getfsstat(SB)
 TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0
        JMP     libc_setattrlist(SB)
 TEXT ·libc_fdopendir_trampoline(SB),NOSPLIT,$0-0

diff --git a/src/syscall/zsyscall_darwin_arm64.s b/src/syscall/zsyscall_darwin_arm64.s
index 4df76084bc5ecb93a4832a939d8df05a86bf8ebf..23ddc8f53ca5b176034e98f3cbb29c8f493133b8 100644 (file)
--- a/src/syscall/zsyscall_darwin_arm64.s
+++ b/src/syscall/zsyscall_darwin_arm64.s
@@ -3,8 +3,8 @@
 #include "textflag.h"
 TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0
        JMP     libc_getattrlist(SB)
-TEXT ·libc_getfsstat64_trampoline(SB),NOSPLIT,$0-0
-       JMP     libc_getfsstat64(SB)
+TEXT ·libc_getfsstat_trampoline(SB),NOSPLIT,$0-0
+       JMP     libc_getfsstat(SB)
 TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0
        JMP     libc_setattrlist(SB)
 TEXT ·libc_fdopendir_trampoline(SB),NOSPLIT,$0-0