authorgravatar for michael.dusan@gmail.comMichael Dusan <michael.dusan@gmail.com> 2021-04-07 19:20:55-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-04-07 16:26:21-07:00
log341dc03b638bc75bb8215dd2ad22231ebe106139
treee471ef75b8fa85c7b94aaa365311318a1bdd4117
parentbcc371618fd71185e71a889c09eb68733ca66842

netbsd: minor fixes to allow stage1 to build

2 files changed, 27 insertions(+), 8 deletions(-)

lib/std/c/netbsd.zig+5-4
...@@ -18,14 +18,14 @@ pub extern "c" fn _lwp_self() lwpid_t;...@@ -18,14 +18,14 @@ pub extern "c" fn _lwp_self() lwpid_t;
1818
19pub extern "c" fn pipe2(fds: *[2]fd_t, flags: u32) c_int;19pub extern "c" fn pipe2(fds: *[2]fd_t, flags: u32) c_int;
20pub extern "c" fn arc4random_buf(buf: [*]u8, len: usize) void;20pub extern "c" fn arc4random_buf(buf: [*]u8, len: usize) void;
21pub extern "c" fn __fstat50(fd: fd_t, buf: *Stat) c_int;21pub extern "c" fn __fstat50(fd: fd_t, buf: *libc_stat) c_int;
22pub extern "c" fn __stat50(path: [*:0]const u8, buf: *Stat) c_int;22pub extern "c" fn __stat50(path: [*:0]const u8, buf: *libc_stat) c_int;
23pub extern "c" fn __clock_gettime50(clk_id: c_int, tp: *timespec) c_int;23pub extern "c" fn __clock_gettime50(clk_id: c_int, tp: *timespec) c_int;
24pub extern "c" fn __clock_getres50(clk_id: c_int, tp: *timespec) c_int;24pub extern "c" fn __clock_getres50(clk_id: c_int, tp: *timespec) c_int;
25pub extern "c" fn __getdents30(fd: c_int, buf_ptr: [*]u8, nbytes: usize) c_int;25pub extern "c" fn __getdents30(fd: c_int, buf_ptr: [*]u8, nbytes: usize) c_int;
26pub extern "c" fn __sigaltstack14(ss: ?*stack_t, old_ss: ?*stack_t) c_int;26pub extern "c" fn __sigaltstack14(ss: ?*stack_t, old_ss: ?*stack_t) c_int;
27pub extern "c" fn __nanosleep50(rqtp: *const timespec, rmtp: ?*timespec) c_int;27pub extern "c" fn __nanosleep50(rqtp: *const timespec, rmtp: ?*timespec) c_int;
28pub extern "c" fn __sigaction14(sig: c_int, noalias act: *const Sigaction, noalias oact: ?*Sigaction) c_int;28pub extern "c" fn __sigaction14(sig: c_int, noalias act: ?*const Sigaction, noalias oact: ?*Sigaction) c_int;
29pub extern "c" fn __sigprocmask14(how: c_int, noalias set: ?*const sigset_t, noalias oset: ?*sigset_t) c_int;29pub extern "c" fn __sigprocmask14(how: c_int, noalias set: ?*const sigset_t, noalias oset: ?*sigset_t) c_int;
30pub extern "c" fn __socket30(domain: c_uint, sock_type: c_uint, protocol: c_uint) c_int;30pub extern "c" fn __socket30(domain: c_uint, sock_type: c_uint, protocol: c_uint) c_int;
31pub extern "c" fn __gettimeofday50(noalias tv: ?*timeval, noalias tz: ?*timezone) c_int;31pub extern "c" fn __gettimeofday50(noalias tv: ?*timeval, noalias tz: ?*timezone) c_int;
...@@ -34,7 +34,6 @@ pub extern "c" fn __getrusage50(who: c_int, usage: *rusage) c_int;...@@ -34,7 +34,6 @@ pub extern "c" fn __getrusage50(who: c_int, usage: *rusage) c_int;
34pub extern "c" fn __libc_thr_yield() c_int;34pub extern "c" fn __libc_thr_yield() c_int;
3535
36pub extern "c" fn posix_memalign(memptr: *?*c_void, alignment: usize, size: usize) c_int;36pub extern "c" fn posix_memalign(memptr: *?*c_void, alignment: usize, size: usize) c_int;
37pub extern "c" fn malloc_usable_size(?*const c_void) usize;
3837
39pub const pthread_mutex_t = extern struct {38pub const pthread_mutex_t = extern struct {
40 ptm_magic: u32 = 0x33330003,39 ptm_magic: u32 = 0x33330003,
...@@ -93,3 +92,5 @@ pub const pthread_attr_t = extern struct {...@@ -93,3 +92,5 @@ pub const pthread_attr_t = extern struct {
93 pta_flags: i32,92 pta_flags: i32,
94 pta_private: ?*c_void,93 pta_private: ?*c_void,
95};94};
95
96pub const sem_t = ?*opaque {};
lib/std/os/bits/netbsd.zig+22-4
...@@ -813,10 +813,6 @@ pub const sigset_t = extern struct {...@@ -813,10 +813,6 @@ pub const sigset_t = extern struct {
813 __bits: [_SIG_WORDS]u32,813 __bits: [_SIG_WORDS]u32,
814};814};
815815
816pub const SIG_ERR = @intToPtr(?Sigaction.sigaction_fn, maxInt(usize));
817pub const SIG_DFL = @intToPtr(?Sigaction.sigaction_fn, 0);
818pub const SIG_IGN = @intToPtr(?Sigaction.sigaction_fn, 1);
819
820pub const empty_sigset = sigset_t{ .__bits = [_]u32{0} ** _SIG_WORDS };816pub const empty_sigset = sigset_t{ .__bits = [_]u32{0} ** _SIG_WORDS };
821817
822// XXX x86_64 specific818// XXX x86_64 specific
...@@ -1219,3 +1215,25 @@ pub const rlimit = extern struct {...@@ -1219,3 +1215,25 @@ pub const rlimit = extern struct {
1219pub const SHUT_RD = 0;1215pub const SHUT_RD = 0;
1220pub const SHUT_WR = 1;1216pub const SHUT_WR = 1;
1221pub const SHUT_RDWR = 2;1217pub const SHUT_RDWR = 2;
1218
1219pub const nfds_t = u32;
1220
1221pub const pollfd = extern struct {
1222 fd: fd_t,
1223 events: i16,
1224 revents: i16,
1225};
1226
1227/// Testable events (may be specified in events field).
1228pub const POLLIN = 0x0001;
1229pub const POLLPRI = 0x0002;
1230pub const POLLOUT = 0x0004;
1231pub const POLLRDNORM = 0x0040;
1232pub const POLLWRNORM = POLLOUT;
1233pub const POLLRDBAND = 0x0080;
1234pub const POLLWRBAND = 0x0100;
1235
1236/// Non-testable events (may not be specified in events field).
1237pub const POLLERR = 0x0008;
1238pub const POLLHUP = 0x0010;
1239pub const POLLNVAL = 0x0020;