Use the _np variant

golang · Jul 1, 2024 · bc02d6d · bc02d6d
1 parent a14d2c6
commit bc02d6d
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 42 deletions.
diff --git a/unix/darwin_amd64_test.go b/unix/darwin_amd64_test.go
diff --git a/unix/darwin_arm64_test.go b/unix/darwin_arm64_test.go
diff --git a/unix/syscall_darwin.go b/unix/syscall_darwin.go
@@ -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)

diff --git a/unix/zsyscall_darwin_amd64.go b/unix/zsyscall_darwin_amd64.go
diff --git a/unix/zsyscall_darwin_amd64.s b/unix/zsyscall_darwin_amd64.s
@@ -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_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_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_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)

diff --git a/unix/zsyscall_darwin_arm64.go b/unix/zsyscall_darwin_arm64.go
diff --git a/unix/zsyscall_darwin_arm64.s b/unix/zsyscall_darwin_arm64.s
@@ -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_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_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_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)