Commit 4fdeb73f authored by Elias Naur's avatar Elias Naur

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: default avatarKeith Randall <khr@golang.org>
parent 096ab3c2
...@@ -798,7 +798,7 @@ func machogenasmsym(ctxt *Link) { ...@@ -798,7 +798,7 @@ func machogenasmsym(ctxt *Link) {
case "386": case "386":
s.SetExtname(n + "$INODE64$UNIX2003") s.SetExtname(n + "$INODE64$UNIX2003")
} }
case "readdir_r": case "readdir_r", "getfsstat":
switch objabi.GOARCH { switch objabi.GOARCH {
case "amd64", "386": case "amd64", "386":
s.SetExtname(n + "$INODE64") s.SetExtname(n + "$INODE64")
......
...@@ -188,7 +188,7 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) { ...@@ -188,7 +188,7 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
_p0 = unsafe.Pointer(&buf[0]) _p0 = unsafe.Pointer(&buf[0])
bufsize = unsafe.Sizeof(Statfs_t{}) * uintptr(len(buf)) 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) n = int(r0)
if e1 != 0 { if e1 != 0 {
err = e1 err = e1
...@@ -196,10 +196,10 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) { ...@@ -196,10 +196,10 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
return return
} }
func libc_getfsstat64_trampoline() func libc_getfsstat_trampoline()
//go:linkname libc_getfsstat64 libc_getfsstat64 //go:linkname libc_getfsstat libc_getfsstat
//go:cgo_import_dynamic libc_getfsstat64 getfsstat64 "/usr/lib/libSystem.B.dylib" //go:cgo_import_dynamic libc_getfsstat getfsstat "/usr/lib/libSystem.B.dylib"
func setattrlistTimes(path string, times []Timespec) error { func setattrlistTimes(path string, times []Timespec) error {
_p0, err := BytePtrFromString(path) _p0, err := BytePtrFromString(path)
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
#include "textflag.h" #include "textflag.h"
TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0 TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0
JMP libc_getattrlist(SB) JMP libc_getattrlist(SB)
TEXT ·libc_getfsstat64_trampoline(SB),NOSPLIT,$0-0 TEXT ·libc_getfsstat_trampoline(SB),NOSPLIT,$0-0
JMP libc_getfsstat64(SB) JMP libc_getfsstat(SB)
TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0 TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0
JMP libc_setattrlist(SB) JMP libc_setattrlist(SB)
TEXT ·libc_fdopendir_trampoline(SB),NOSPLIT,$0-0 TEXT ·libc_fdopendir_trampoline(SB),NOSPLIT,$0-0
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
#include "textflag.h" #include "textflag.h"
TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0 TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0
JMP libc_getattrlist(SB) JMP libc_getattrlist(SB)
TEXT ·libc_getfsstat64_trampoline(SB),NOSPLIT,$0-0 TEXT ·libc_getfsstat_trampoline(SB),NOSPLIT,$0-0
JMP libc_getfsstat64(SB) JMP libc_getfsstat(SB)
TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0 TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0
JMP libc_setattrlist(SB) JMP libc_setattrlist(SB)
TEXT ·libc_fdopendir_trampoline(SB),NOSPLIT,$0-0 TEXT ·libc_fdopendir_trampoline(SB),NOSPLIT,$0-0
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
#include "textflag.h" #include "textflag.h"
TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0 TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0
JMP libc_getattrlist(SB) JMP libc_getattrlist(SB)
TEXT ·libc_getfsstat64_trampoline(SB),NOSPLIT,$0-0 TEXT ·libc_getfsstat_trampoline(SB),NOSPLIT,$0-0
JMP libc_getfsstat64(SB) JMP libc_getfsstat(SB)
TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0 TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0
JMP libc_setattrlist(SB) JMP libc_setattrlist(SB)
TEXT ·libc_fdopendir_trampoline(SB),NOSPLIT,$0-0 TEXT ·libc_fdopendir_trampoline(SB),NOSPLIT,$0-0
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
#include "textflag.h" #include "textflag.h"
TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0 TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0
JMP libc_getattrlist(SB) JMP libc_getattrlist(SB)
TEXT ·libc_getfsstat64_trampoline(SB),NOSPLIT,$0-0 TEXT ·libc_getfsstat_trampoline(SB),NOSPLIT,$0-0
JMP libc_getfsstat64(SB) JMP libc_getfsstat(SB)
TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0 TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0
JMP libc_setattrlist(SB) JMP libc_setattrlist(SB)
TEXT ·libc_fdopendir_trampoline(SB),NOSPLIT,$0-0 TEXT ·libc_fdopendir_trampoline(SB),NOSPLIT,$0-0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment