Use the _np variant

This commit is contained in:
Edoardo Spadolini
2024-07-01 22:15:46 +02:00
parent a14d2c64dc
commit bc02d6d44b
7 changed files with 40 additions and 40 deletions

View File

@@ -7,8 +7,6 @@ package unix
// All the _trampoline functions in zsyscall_darwin_amd64.s.
var darwinTests = [...]darwinTest{
{"__pthread_chdir", libc___pthread_chdir_trampoline_addr},
{"__pthread_fchdir", libc___pthread_fchdir_trampoline_addr},
{"accept", libc_accept_trampoline_addr},
{"access", libc_access_trampoline_addr},
{"adjtime", libc_adjtime_trampoline_addr},
@@ -103,6 +101,8 @@ var darwinTests = [...]darwinTest{
{"pipe", libc_pipe_trampoline_addr},
{"poll", libc_poll_trampoline_addr},
{"pread", libc_pread_trampoline_addr},
{"pthread_chdir_np", libc_pthread_chdir_np_trampoline_addr},
{"pthread_fchdir_np", libc_pthread_fchdir_np_trampoline_addr},
{"ptrace", libc_ptrace_trampoline_addr},
{"pwrite", libc_pwrite_trampoline_addr},
{"read", libc_read_trampoline_addr},

View File

@@ -7,8 +7,6 @@ package unix
// All the _trampoline functions in zsyscall_darwin_arm64.s.
var darwinTests = [...]darwinTest{
{"__pthread_chdir", libc___pthread_chdir_trampoline_addr},
{"__pthread_fchdir", libc___pthread_fchdir_trampoline_addr},
{"accept", libc_accept_trampoline_addr},
{"access", libc_access_trampoline_addr},
{"adjtime", libc_adjtime_trampoline_addr},
@@ -103,6 +101,8 @@ var darwinTests = [...]darwinTest{
{"pipe", libc_pipe_trampoline_addr},
{"poll", libc_poll_trampoline_addr},
{"pread", libc_pread_trampoline_addr},
{"pthread_chdir_np", libc_pthread_chdir_np_trampoline_addr},
{"pthread_fchdir_np", libc_pthread_fchdir_np_trampoline_addr},
{"ptrace", libc_ptrace_trampoline_addr},
{"pwrite", libc_pwrite_trampoline_addr},
{"read", libc_read_trampoline_addr},

View File

@@ -542,16 +542,16 @@ func SysctlKinfoProcSlice(name string, args ...int) ([]KinfoProc, error) {
}
}
//sys __pthread_chdir(path string) (err error)
//sys pthread_chdir_np(path string) (err error)
func PthreadChdir(path string) (err error) {
return __pthread_chdir(path)
return pthread_chdir_np(path)
}
//sys __pthread_fchdir(fd int) (err error)
//sys pthread_fchdir_np(fd int) (err error)
func PthreadFchdir(fd int) (err error) {
return __pthread_fchdir(fd)
return pthread_fchdir_np(fd)
}
//sys sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error)

View File

@@ -760,36 +760,36 @@ var libc_sysctl_trampoline_addr uintptr
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func __pthread_chdir(path string) (err error) {
func pthread_chdir_np(path string) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
return
}
_, _, e1 := syscall_syscall(libc___pthread_chdir_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
_, _, e1 := syscall_syscall(libc_pthread_chdir_np_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
if e1 != 0 {
err = errnoErr(e1)
}
return
}
var libc___pthread_chdir_trampoline_addr uintptr
var libc_pthread_chdir_np_trampoline_addr uintptr
//go:cgo_import_dynamic libc___pthread_chdir __pthread_chdir "/usr/lib/libSystem.B.dylib"
//go:cgo_import_dynamic libc_pthread_chdir_np pthread_chdir_np "/usr/lib/libSystem.B.dylib"
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func __pthread_fchdir(fd int) (err error) {
_, _, e1 := syscall_syscall(libc___pthread_fchdir_trampoline_addr, uintptr(fd), 0, 0)
func pthread_fchdir_np(fd int) (err error) {
_, _, e1 := syscall_syscall(libc_pthread_fchdir_np_trampoline_addr, uintptr(fd), 0, 0)
if e1 != 0 {
err = errnoErr(e1)
}
return
}
var libc___pthread_fchdir_trampoline_addr uintptr
var libc_pthread_fchdir_np_trampoline_addr uintptr
//go:cgo_import_dynamic libc___pthread_fchdir __pthread_fchdir "/usr/lib/libSystem.B.dylib"
//go:cgo_import_dynamic libc_pthread_fchdir_np pthread_fchdir_np "/usr/lib/libSystem.B.dylib"
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT

View File

@@ -228,15 +228,15 @@ TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0
GLOBL ·libc_sysctl_trampoline_addr(SB), RODATA, $8
DATA ·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB)
TEXT libc___pthread_chdir_trampoline<>(SB),NOSPLIT,$0-0
JMP libc___pthread_chdir(SB)
GLOBL ·libc___pthread_chdir_trampoline_addr(SB), RODATA, $8
DATA ·libc___pthread_chdir_trampoline_addr(SB)/8, $libc___pthread_chdir_trampoline<>(SB)
TEXT libc_pthread_chdir_np_trampoline<>(SB),NOSPLIT,$0-0
JMP libc_pthread_chdir_np(SB)
GLOBL ·libc_pthread_chdir_np_trampoline_addr(SB), RODATA, $8
DATA ·libc_pthread_chdir_np_trampoline_addr(SB)/8, $libc_pthread_chdir_np_trampoline<>(SB)
TEXT libc___pthread_fchdir_trampoline<>(SB),NOSPLIT,$0-0
JMP libc___pthread_fchdir(SB)
GLOBL ·libc___pthread_fchdir_trampoline_addr(SB), RODATA, $8
DATA ·libc___pthread_fchdir_trampoline_addr(SB)/8, $libc___pthread_fchdir_trampoline<>(SB)
TEXT libc_pthread_fchdir_np_trampoline<>(SB),NOSPLIT,$0-0
JMP libc_pthread_fchdir_np(SB)
GLOBL ·libc_pthread_fchdir_np_trampoline_addr(SB), RODATA, $8
DATA ·libc_pthread_fchdir_np_trampoline_addr(SB)/8, $libc_pthread_fchdir_np_trampoline<>(SB)
TEXT libc_sendfile_trampoline<>(SB),NOSPLIT,$0-0
JMP libc_sendfile(SB)

View File

@@ -760,36 +760,36 @@ var libc_sysctl_trampoline_addr uintptr
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func __pthread_chdir(path string) (err error) {
func pthread_chdir_np(path string) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
return
}
_, _, e1 := syscall_syscall(libc___pthread_chdir_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
_, _, e1 := syscall_syscall(libc_pthread_chdir_np_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
if e1 != 0 {
err = errnoErr(e1)
}
return
}
var libc___pthread_chdir_trampoline_addr uintptr
var libc_pthread_chdir_np_trampoline_addr uintptr
//go:cgo_import_dynamic libc___pthread_chdir __pthread_chdir "/usr/lib/libSystem.B.dylib"
//go:cgo_import_dynamic libc_pthread_chdir_np pthread_chdir_np "/usr/lib/libSystem.B.dylib"
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func __pthread_fchdir(fd int) (err error) {
_, _, e1 := syscall_syscall(libc___pthread_fchdir_trampoline_addr, uintptr(fd), 0, 0)
func pthread_fchdir_np(fd int) (err error) {
_, _, e1 := syscall_syscall(libc_pthread_fchdir_np_trampoline_addr, uintptr(fd), 0, 0)
if e1 != 0 {
err = errnoErr(e1)
}
return
}
var libc___pthread_fchdir_trampoline_addr uintptr
var libc_pthread_fchdir_np_trampoline_addr uintptr
//go:cgo_import_dynamic libc___pthread_fchdir __pthread_fchdir "/usr/lib/libSystem.B.dylib"
//go:cgo_import_dynamic libc_pthread_fchdir_np pthread_fchdir_np "/usr/lib/libSystem.B.dylib"
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT

View File

@@ -228,15 +228,15 @@ TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0
GLOBL ·libc_sysctl_trampoline_addr(SB), RODATA, $8
DATA ·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB)
TEXT libc___pthread_chdir_trampoline<>(SB),NOSPLIT,$0-0
JMP libc___pthread_chdir(SB)
GLOBL ·libc___pthread_chdir_trampoline_addr(SB), RODATA, $8
DATA ·libc___pthread_chdir_trampoline_addr(SB)/8, $libc___pthread_chdir_trampoline<>(SB)
TEXT libc_pthread_chdir_np_trampoline<>(SB),NOSPLIT,$0-0
JMP libc_pthread_chdir_np(SB)
GLOBL ·libc_pthread_chdir_np_trampoline_addr(SB), RODATA, $8
DATA ·libc_pthread_chdir_np_trampoline_addr(SB)/8, $libc_pthread_chdir_np_trampoline<>(SB)
TEXT libc___pthread_fchdir_trampoline<>(SB),NOSPLIT,$0-0
JMP libc___pthread_fchdir(SB)
GLOBL ·libc___pthread_fchdir_trampoline_addr(SB), RODATA, $8
DATA ·libc___pthread_fchdir_trampoline_addr(SB)/8, $libc___pthread_fchdir_trampoline<>(SB)
TEXT libc_pthread_fchdir_np_trampoline<>(SB),NOSPLIT,$0-0
JMP libc_pthread_fchdir_np(SB)
GLOBL ·libc_pthread_fchdir_np_trampoline_addr(SB), RODATA, $8
DATA ·libc_pthread_fchdir_np_trampoline_addr(SB)/8, $libc_pthread_fchdir_np_trampoline<>(SB)
TEXT libc_sendfile_trampoline<>(SB),NOSPLIT,$0-0
JMP libc_sendfile(SB)