authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2020-10-28 11:38:46+01:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2020-10-28 11:38:46+01:00
log1a171a143aaa1be843b6f028cbb8e82aaec79e2c
treec495cf6588b741b6431eb9d129549f1ffaa05d79
parente1ca6946bee3acf9cbdf6e5ea30fa2d55304365d
parent4f5095840750b64cf95aeeb6d084f9e4f5f5c5b7
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #6842 from kubkon/aarch64-macos-fix

std: Apple Silicon: no fstat$INODE64 symbol found

2 files changed, 14 insertions(+), 4 deletions(-)

lib/std/c.zig+2-2
...@@ -124,7 +124,7 @@ pub extern "c" fn readlinkat(dirfd: fd_t, noalias path: [*:0]const u8, noalias b...@@ -124,7 +124,7 @@ pub extern "c" fn readlinkat(dirfd: fd_t, noalias path: [*:0]const u8, noalias b
124pub usingnamespace switch (builtin.os.tag) {124pub usingnamespace switch (builtin.os.tag) {
125 .macos, .ios, .watchos, .tvos => struct {125 .macos, .ios, .watchos, .tvos => struct {
126 pub const realpath = @"realpath$DARWIN_EXTSN";126 pub const realpath = @"realpath$DARWIN_EXTSN";
127 pub const fstatat = @"fstatat$INODE64";127 pub const fstatat = _fstatat;
128 },128 },
129 else => struct {129 else => struct {
130 pub extern "c" fn realpath(noalias file_name: [*:0]const u8, noalias resolved_name: [*]u8) ?[*:0]u8;130 pub extern "c" fn realpath(noalias file_name: [*:0]const u8, noalias resolved_name: [*]u8) ?[*:0]u8;
...@@ -194,7 +194,7 @@ pub usingnamespace switch (builtin.os.tag) {...@@ -194,7 +194,7 @@ pub usingnamespace switch (builtin.os.tag) {
194 // XXX: getdirentries -> _getdirentries64194 // XXX: getdirentries -> _getdirentries64
195 pub extern "c" fn clock_getres(clk_id: c_int, tp: *timespec) c_int;195 pub extern "c" fn clock_getres(clk_id: c_int, tp: *timespec) c_int;
196 pub extern "c" fn clock_gettime(clk_id: c_int, tp: *timespec) c_int;196 pub extern "c" fn clock_gettime(clk_id: c_int, tp: *timespec) c_int;
197 pub const fstat = @"fstat$INODE64";197 pub const fstat = _fstat;
198 pub extern "c" fn getrusage(who: c_int, usage: *rusage) c_int;198 pub extern "c" fn getrusage(who: c_int, usage: *rusage) c_int;
199 pub extern "c" fn gettimeofday(noalias tv: ?*timeval, noalias tz: ?*timezone) c_int;199 pub extern "c" fn gettimeofday(noalias tv: ?*timeval, noalias tz: ?*timezone) c_int;
200 pub extern "c" fn nanosleep(rqtp: *const timespec, rmtp: ?*timespec) c_int;200 pub extern "c" fn nanosleep(rqtp: *const timespec, rmtp: ?*timespec) c_int;
lib/std/c/darwin.zig+12-2
...@@ -29,8 +29,18 @@ pub extern "c" fn fcopyfile(from: fd_t, to: fd_t, state: ?copyfile_state_t, flag...@@ -29,8 +29,18 @@ pub extern "c" fn fcopyfile(from: fd_t, to: fd_t, state: ?copyfile_state_t, flag
29pub extern "c" fn @"realpath$DARWIN_EXTSN"(noalias file_name: [*:0]const u8, noalias resolved_name: [*]u8) ?[*:0]u8;29pub extern "c" fn @"realpath$DARWIN_EXTSN"(noalias file_name: [*:0]const u8, noalias resolved_name: [*]u8) ?[*:0]u8;
3030
31pub extern "c" fn __getdirentries64(fd: c_int, buf_ptr: [*]u8, buf_len: usize, basep: *i64) isize;31pub extern "c" fn __getdirentries64(fd: c_int, buf_ptr: [*]u8, buf_len: usize, basep: *i64) isize;
32pub extern "c" fn @"fstat$INODE64"(fd: fd_t, buf: *Stat) c_int;32
33pub extern "c" fn @"fstatat$INODE64"(dirfd: fd_t, path_name: [*:0]const u8, buf: *Stat, flags: u32) c_int;33extern "c" fn fstat(fd: fd_t, buf: *Stat) c_int;
34/// On x86_64 Darwin, fstat has to be manully linked with $INODE64 suffix to force 64bit version.
35/// Note that this is fixed on aarch64 and no longer necessary.
36extern "c" fn @"fstat$INODE64"(fd: fd_t, buf: *Stat) c_int;
37pub const _fstat = if (builtin.arch == .aarch64) fstat else @"fstat$INODE64";
38
39extern "c" fn fstatat(dirfd: fd_t, path: [*:0]const u8, stat_buf: *Stat, flags: u32) c_int;
40/// On x86_64 Darwin, fstatat has to be manully linked with $INODE64 suffix to force 64bit version.
41/// Note that this is fixed on aarch64 and no longer necessary.
42extern "c" fn @"fstatat$INODE64"(dirfd: fd_t, path_name: [*:0]const u8, buf: *Stat, flags: u32) c_int;
43pub const _fstatat = if (builtin.arch == .aarch64) fstatat else @"fstatat$INODE64";
3444
35pub extern "c" fn mach_absolute_time() u64;45pub extern "c" fn mach_absolute_time() u64;
36pub extern "c" fn mach_timebase_info(tinfo: ?*mach_timebase_info_data) void;46pub extern "c" fn mach_timebase_info(tinfo: ?*mach_timebase_info_data) void;