authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2024-10-08 18:32:02+02:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2024-10-08 18:32:02+02:00
logb00cbecfd3f75f3148f6c8d4ef159ba144f1a362
tree7c4387535f86594197e3271151ee224e69253ee6
parentea527f7a850f0200681630d8f36131eca31ef48b
parente535e65eb349667b70ae82da8d3bb0ba48f95a76
signaturebadge-check Signed by PGP key B5690EEEBB952194

Merge pull request #21622 from mikdusan/bsd

bsd: revive freebsd and dragonfly

2 files changed, 72 insertions(+), 1 deletions(-)

lib/std/c.zig+71-1
...@@ -134,7 +134,7 @@ pub const mode_t = switch (native_os) {...@@ -134,7 +134,7 @@ pub const mode_t = switch (native_os) {
134 .linux => linux.mode_t,134 .linux => linux.mode_t,
135 .emscripten => emscripten.mode_t,135 .emscripten => emscripten.mode_t,
136 .openbsd, .haiku, .netbsd, .solaris, .illumos, .wasi => u32,136 .openbsd, .haiku, .netbsd, .solaris, .illumos, .wasi => u32,
137 .freebsd, .macos, .ios, .tvos, .watchos, .visionos => u16,137 .freebsd, .macos, .ios, .tvos, .watchos, .visionos, .dragonfly => u16,
138 else => u0,138 else => u0,
139};139};
140140
...@@ -3150,6 +3150,72 @@ pub const T = switch (native_os) {...@@ -3150,6 +3150,72 @@ pub const T = switch (native_os) {
3150 pub const IOCUCNTL = 0x80047466;3150 pub const IOCUCNTL = 0x80047466;
3151 pub const IOCXMTFRAME = 0x80087444;3151 pub const IOCXMTFRAME = 0x80087444;
3152 },3152 },
3153 .dragonfly => struct {
3154 pub const IOCMODG = 0x40047403;
3155 pub const IOCMODS = 0x80047404;
3156 pub const IOCM_LE = 0x00000001;
3157 pub const IOCM_DTR = 0x00000002;
3158 pub const IOCM_RTS = 0x00000004;
3159 pub const IOCM_ST = 0x00000008;
3160 pub const IOCM_SR = 0x00000010;
3161 pub const IOCM_CTS = 0x00000020;
3162 pub const IOCM_CAR = 0x00000040;
3163 pub const IOCM_CD = 0x00000040;
3164 pub const IOCM_RNG = 0x00000080;
3165 pub const IOCM_RI = 0x00000080;
3166 pub const IOCM_DSR = 0x00000100;
3167 pub const IOCEXCL = 0x2000740d;
3168 pub const IOCNXCL = 0x2000740e;
3169 pub const IOCFLUSH = 0x80047410;
3170 pub const IOCGETA = 0x402c7413;
3171 pub const IOCSETA = 0x802c7414;
3172 pub const IOCSETAW = 0x802c7415;
3173 pub const IOCSETAF = 0x802c7416;
3174 pub const IOCGETD = 0x4004741a;
3175 pub const IOCSETD = 0x8004741b;
3176 pub const IOCSBRK = 0x2000747b;
3177 pub const IOCCBRK = 0x2000747a;
3178 pub const IOCSDTR = 0x20007479;
3179 pub const IOCCDTR = 0x20007478;
3180 pub const IOCGPGRP = 0x40047477;
3181 pub const IOCSPGRP = 0x80047476;
3182 pub const IOCOUTQ = 0x40047473;
3183 pub const IOCSTI = 0x80017472;
3184 pub const IOCNOTTY = 0x20007471;
3185 pub const IOCPKT = 0x80047470;
3186 pub const IOCPKT_DATA = 0x00000000;
3187 pub const IOCPKT_FLUSHREAD = 0x00000001;
3188 pub const IOCPKT_FLUSHWRITE = 0x00000002;
3189 pub const IOCPKT_STOP = 0x00000004;
3190 pub const IOCPKT_START = 0x00000008;
3191 pub const IOCPKT_NOSTOP = 0x00000010;
3192 pub const IOCPKT_DOSTOP = 0x00000020;
3193 pub const IOCPKT_IOCTL = 0x00000040;
3194 pub const IOCSTOP = 0x2000746f;
3195 pub const IOCSTART = 0x2000746e;
3196 pub const IOCMSET = 0x8004746d;
3197 pub const IOCMBIS = 0x8004746c;
3198 pub const IOCMBIC = 0x8004746b;
3199 pub const IOCMGET = 0x4004746a;
3200 pub const IOCREMOTE = 0x80047469;
3201 pub const IOCGWINSZ = 0x40087468;
3202 pub const IOCSWINSZ = 0x80087467;
3203 pub const IOCUCNTL = 0x80047466;
3204 pub const IOCSTAT = 0x20007465;
3205 pub const IOCGSID = 0x40047463;
3206 pub const IOCCONS = 0x80047462;
3207 pub const IOCSCTTY = 0x20007461;
3208 pub const IOCEXT = 0x80047460;
3209 pub const IOCSIG = 0x2000745f;
3210 pub const IOCDRAIN = 0x2000745e;
3211 pub const IOCMSDTRWAIT = 0x8004745b;
3212 pub const IOCMGDTRWAIT = 0x4004745a;
3213 pub const IOCTIMESTAMP = 0x40107459;
3214 pub const IOCDCDTIMESTAMP = 0x40107458;
3215 pub const IOCSDRAINWAIT = 0x80047457;
3216 pub const IOCGDRAINWAIT = 0x40047456;
3217 pub const IOCISPTMASTER = 0x20007455;
3218 },
3153 else => void,3219 else => void,
3154};3220};
3155pub const IOCPARM_MASK = switch (native_os) {3221pub const IOCPARM_MASK = switch (native_os) {
...@@ -9809,6 +9875,10 @@ pub const _ksiginfo = netbsd._ksiginfo;...@@ -9809,6 +9875,10 @@ pub const _ksiginfo = netbsd._ksiginfo;
9809pub const _lwp_self = netbsd._lwp_self;9875pub const _lwp_self = netbsd._lwp_self;
9810pub const lwpid_t = netbsd.lwpid_t;9876pub const lwpid_t = netbsd.lwpid_t;
98119877
9878pub const lwp_gettid = dragonfly.lwp_gettid;
9879pub const umtx_sleep = dragonfly.umtx_sleep;
9880pub const umtx_wakeup = dragonfly.umtx_wakeup;
9881
9812/// External definitions shared by two or more operating systems.9882/// External definitions shared by two or more operating systems.
9813const private = struct {9883const private = struct {
9814 extern "c" fn close(fd: fd_t) c_int;9884 extern "c" fn close(fd: fd_t) c_int;
lib/std/posix.zig+1
...@@ -6785,6 +6785,7 @@ pub const MemFdCreateError = error{...@@ -6785,6 +6785,7 @@ pub const MemFdCreateError = error{
6785 OutOfMemory,6785 OutOfMemory,
6786 /// Either the name provided exceeded `NAME_MAX`, or invalid flags were passed.6786 /// Either the name provided exceeded `NAME_MAX`, or invalid flags were passed.
6787 NameTooLong,6787 NameTooLong,
6788 SystemOutdated,
6788} || UnexpectedError;6789} || UnexpectedError;
67896790
6790pub fn memfd_createZ(name: [*:0]const u8, flags: u32) MemFdCreateError!fd_t {6791pub fn memfd_createZ(name: [*:0]const u8, flags: u32) MemFdCreateError!fd_t {