diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2020-10-06 21:00:36 +1100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-10-06 21:58:41 +1100 |
commit | 0aed47737c8f366c5e6895c57f0b193ff0eb43a3 (patch) | |
tree | 1206e3075357a3f4561ba937859d69df7f3537db /vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s | |
parent | 6e076472b8fb2d052e0b1c35d3fff3dd263ae722 (diff) |
bump go-git to fix invalid merge error
Diffstat (limited to 'vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s')
-rw-r--r-- | vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s index abe7b6edf..16aebee23 100644 --- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s +++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s @@ -60,8 +60,6 @@ TEXT ·libc_munlock_trampoline(SB),NOSPLIT,$0-0 JMP libc_munlock(SB) TEXT ·libc_munlockall_trampoline(SB),NOSPLIT,$0-0 JMP libc_munlockall(SB) -TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0 - JMP libc_getattrlist(SB) TEXT ·libc_pipe_trampoline(SB),NOSPLIT,$0-0 JMP libc_pipe(SB) TEXT ·libc_getxattr_trampoline(SB),NOSPLIT,$0-0 @@ -146,6 +144,8 @@ TEXT ·libc_fsync_trampoline(SB),NOSPLIT,$0-0 JMP libc_fsync(SB) TEXT ·libc_ftruncate_trampoline(SB),NOSPLIT,$0-0 JMP libc_ftruncate(SB) +TEXT ·libc_getcwd_trampoline(SB),NOSPLIT,$0-0 + JMP libc_getcwd(SB) TEXT ·libc_getdtablesize_trampoline(SB),NOSPLIT,$0-0 JMP libc_getdtablesize(SB) TEXT ·libc_getegid_trampoline(SB),NOSPLIT,$0-0 |