authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-15 10:05:00-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-15 10:05:00-07:00
log87be80f6e9d1aa95cb55a8d7ef95808ca4aba44b
tree18732ce77a5dcc8848a701bdc29fcfeb5acfc807
parentac8f757cb371f25472db7c9674b3e2958d86f9ec
parent0cb558ba3abb0ac7b48c1a30c9a13c924f950172

Merge remote-tracking branch 'origin/master' into wrangle-writer-buffering

10 files changed, 87 insertions(+), 174 deletions(-)

doc/langref/defer_unwind.zig+2-3
......@@ -1,8 +1,7 @@
11const std = @import("std");
2const expect = std.testing.expect;
32const print = std.debug.print;
43
5test "defer unwinding" {
4pub fn main() void {
65 print("\n", .{});
76
87 defer {
......@@ -19,4 +18,4 @@ test "defer unwinding" {
1918 }
2019}
2120
22// test
21// exe=succeed
doc/langref/inline_call.zig+5-2
......@@ -1,11 +1,14 @@
1test "inline function call" {
1const std = @import("std");
2
3pub fn main() void {
24 if (foo(1200, 34) != 1234) {
35 @compileError("bad");
46 }
57}
68
79inline fn foo(a: i32, b: i32) i32 {
10 std.debug.print("runtime a = {} b = {}", .{ a, b });
811 return a + b;
912}
1013
11// test
14// exe=succeed
lib/std/Io/Reader.zig+67-37
......@@ -1096,33 +1096,41 @@ pub inline fn takeInt(r: *Reader, comptime T: type, endian: std.builtin.Endian)
10961096 return std.mem.readInt(T, try r.takeArray(n), endian);
10971097}
10981098
1099/// Asserts the buffer was initialized with a capacity at least `@bitSizeOf(T) / 8`.
1100pub inline fn peekInt(r: *Reader, comptime T: type, endian: std.builtin.Endian) Error!T {
1101 const n = @divExact(@typeInfo(T).int.bits, 8);
1102 return std.mem.readInt(T, try r.peekArray(n), endian);
1103}
1104
10991105/// Asserts the buffer was initialized with a capacity at least `n`.
11001106pub fn takeVarInt(r: *Reader, comptime Int: type, endian: std.builtin.Endian, n: usize) Error!Int {
11011107 assert(n <= @sizeOf(Int));
11021108 return std.mem.readVarInt(Int, try r.take(n), endian);
11031109}
11041110
1105/// Asserts the buffer was initialized with a capacity at least `@sizeOf(T)`.
1111/// Obtains an unaligned pointer to the beginning of the stream, reinterpreted
1112/// as a pointer to the provided type, advancing the seek position.
11061113///
1107/// Advances the seek position.
1114/// Asserts the buffer was initialized with a capacity at least `@sizeOf(T)`.
11081115///
11091116/// See also:
1110/// * `peekStruct`
1111/// * `takeStructEndian`
1112pub fn takeStruct(r: *Reader, comptime T: type) Error!*align(1) T {
1117/// * `peekStructReference`
1118/// * `takeStruct`
1119pub fn takeStructReference(r: *Reader, comptime T: type) Error!*align(1) T {
11131120 // Only extern and packed structs have defined in-memory layout.
11141121 comptime assert(@typeInfo(T).@"struct".layout != .auto);
11151122 return @ptrCast(try r.takeArray(@sizeOf(T)));
11161123}
11171124
1118/// Asserts the buffer was initialized with a capacity at least `@sizeOf(T)`.
1125/// Obtains an unaligned pointer to the beginning of the stream, reinterpreted
1126/// as a pointer to the provided type, without advancing the seek position.
11191127///
1120/// Does not advance the seek position.
1128/// Asserts the buffer was initialized with a capacity at least `@sizeOf(T)`.
11211129///
11221130/// See also:
1123/// * `takeStruct`
1124/// * `peekStructEndian`
1125pub fn peekStruct(r: *Reader, comptime T: type) Error!*align(1) T {
1131/// * `takeStructReference`
1132/// * `peekStruct`
1133pub fn peekStructReference(r: *Reader, comptime T: type) Error!*align(1) T {
11261134 // Only extern and packed structs have defined in-memory layout.
11271135 comptime assert(@typeInfo(T).@"struct".layout != .auto);
11281136 return @ptrCast(try r.peekArray(@sizeOf(T)));
......@@ -1134,12 +1142,23 @@ pub fn peekStruct(r: *Reader, comptime T: type) Error!*align(1) T {
11341142/// when `endian` is comptime-known and matches the host endianness.
11351143///
11361144/// See also:
1137/// * `takeStruct`
1138/// * `peekStructEndian`
1139pub inline fn takeStructEndian(r: *Reader, comptime T: type, endian: std.builtin.Endian) Error!T {
1140 var res = (try r.takeStruct(T)).*;
1141 if (native_endian != endian) std.mem.byteSwapAllFields(T, &res);
1142 return res;
1145/// * `takeStructReference`
1146/// * `peekStruct`
1147pub inline fn takeStruct(r: *Reader, comptime T: type, endian: std.builtin.Endian) Error!T {
1148 switch (@typeInfo(T)) {
1149 .@"struct" => |info| switch (info.layout) {
1150 .auto => @compileError("ill-defined memory layout"),
1151 .@"extern" => {
1152 var res = (try r.takeStructReference(T)).*;
1153 if (native_endian != endian) std.mem.byteSwapAllFields(T, &res);
1154 return res;
1155 },
1156 .@"packed" => {
1157 return takeInt(r, info.backing_integer.?, endian);
1158 },
1159 },
1160 else => @compileError("not a struct"),
1161 }
11431162}
11441163
11451164/// Asserts the buffer was initialized with a capacity at least `@sizeOf(T)`.
......@@ -1148,12 +1167,23 @@ pub inline fn takeStructEndian(r: *Reader, comptime T: type, endian: std.builtin
11481167/// when `endian` is comptime-known and matches the host endianness.
11491168///
11501169/// See also:
1151/// * `takeStructEndian`
1152/// * `peekStruct`
1153pub inline fn peekStructEndian(r: *Reader, comptime T: type, endian: std.builtin.Endian) Error!T {
1154 var res = (try r.peekStruct(T)).*;
1155 if (native_endian != endian) std.mem.byteSwapAllFields(T, &res);
1156 return res;
1170/// * `takeStruct`
1171/// * `peekStructReference`
1172pub inline fn peekStruct(r: *Reader, comptime T: type, endian: std.builtin.Endian) Error!T {
1173 switch (@typeInfo(T)) {
1174 .@"struct" => |info| switch (info.layout) {
1175 .auto => @compileError("ill-defined memory layout"),
1176 .@"extern" => {
1177 var res = (try r.peekStructReference(T)).*;
1178 if (native_endian != endian) std.mem.byteSwapAllFields(T, &res);
1179 return res;
1180 },
1181 .@"packed" => {
1182 return peekInt(r, info.backing_integer.?, endian);
1183 },
1184 },
1185 else => @compileError("not a struct"),
1186 }
11571187}
11581188
11591189pub const TakeEnumError = Error || error{InvalidEnumTag};
......@@ -1519,43 +1549,43 @@ test takeVarInt {
15191549 try testing.expectError(error.EndOfStream, r.takeVarInt(u16, .little, 1));
15201550}
15211551
1522test takeStruct {
1552test takeStructReference {
15231553 var r: Reader = .fixed(&.{ 0x12, 0x00, 0x34, 0x56 });
15241554 const S = extern struct { a: u8, b: u16 };
15251555 switch (native_endian) {
1526 .little => try testing.expectEqual(@as(S, .{ .a = 0x12, .b = 0x5634 }), (try r.takeStruct(S)).*),
1527 .big => try testing.expectEqual(@as(S, .{ .a = 0x12, .b = 0x3456 }), (try r.takeStruct(S)).*),
1556 .little => try testing.expectEqual(@as(S, .{ .a = 0x12, .b = 0x5634 }), (try r.takeStructReference(S)).*),
1557 .big => try testing.expectEqual(@as(S, .{ .a = 0x12, .b = 0x3456 }), (try r.takeStructReference(S)).*),
15281558 }
1529 try testing.expectError(error.EndOfStream, r.takeStruct(S));
1559 try testing.expectError(error.EndOfStream, r.takeStructReference(S));
15301560}
15311561
1532test peekStruct {
1562test peekStructReference {
15331563 var r: Reader = .fixed(&.{ 0x12, 0x00, 0x34, 0x56 });
15341564 const S = extern struct { a: u8, b: u16 };
15351565 switch (native_endian) {
15361566 .little => {
1537 try testing.expectEqual(@as(S, .{ .a = 0x12, .b = 0x5634 }), (try r.peekStruct(S)).*);
1538 try testing.expectEqual(@as(S, .{ .a = 0x12, .b = 0x5634 }), (try r.peekStruct(S)).*);
1567 try testing.expectEqual(@as(S, .{ .a = 0x12, .b = 0x5634 }), (try r.peekStructReference(S)).*);
1568 try testing.expectEqual(@as(S, .{ .a = 0x12, .b = 0x5634 }), (try r.peekStructReference(S)).*);
15391569 },
15401570 .big => {
1541 try testing.expectEqual(@as(S, .{ .a = 0x12, .b = 0x3456 }), (try r.peekStruct(S)).*);
1542 try testing.expectEqual(@as(S, .{ .a = 0x12, .b = 0x3456 }), (try r.peekStruct(S)).*);
1571 try testing.expectEqual(@as(S, .{ .a = 0x12, .b = 0x3456 }), (try r.peekStructReference(S)).*);
1572 try testing.expectEqual(@as(S, .{ .a = 0x12, .b = 0x3456 }), (try r.peekStructReference(S)).*);
15431573 },
15441574 }
15451575}
15461576
1547test takeStructEndian {
1577test takeStruct {
15481578 var r: Reader = .fixed(&.{ 0x12, 0x00, 0x34, 0x56 });
15491579 const S = extern struct { a: u8, b: u16 };
1550 try testing.expectEqual(@as(S, .{ .a = 0x12, .b = 0x3456 }), try r.takeStructEndian(S, .big));
1551 try testing.expectError(error.EndOfStream, r.takeStructEndian(S, .little));
1580 try testing.expectEqual(@as(S, .{ .a = 0x12, .b = 0x3456 }), try r.takeStruct(S, .big));
1581 try testing.expectError(error.EndOfStream, r.takeStruct(S, .little));
15521582}
15531583
1554test peekStructEndian {
1584test peekStruct {
15551585 var r: Reader = .fixed(&.{ 0x12, 0x00, 0x34, 0x56 });
15561586 const S = extern struct { a: u8, b: u16 };
1557 try testing.expectEqual(@as(S, .{ .a = 0x12, .b = 0x3456 }), try r.peekStructEndian(S, .big));
1558 try testing.expectEqual(@as(S, .{ .a = 0x12, .b = 0x5634 }), try r.peekStructEndian(S, .little));
1587 try testing.expectEqual(@as(S, .{ .a = 0x12, .b = 0x3456 }), try r.peekStruct(S, .big));
1588 try testing.expectEqual(@as(S, .{ .a = 0x12, .b = 0x5634 }), try r.peekStruct(S, .little));
15591589}
15601590
15611591test takeEnum {
lib/std/Io/Writer.zig+3-8
......@@ -796,16 +796,9 @@ pub inline fn writeInt(w: *Writer, comptime T: type, value: T, endian: std.built
796796 return w.writeAll(&bytes);
797797}
798798
799pub fn writeStruct(w: *Writer, value: anytype) Error!void {
800 // Only extern and packed structs have defined in-memory layout.
801 comptime assert(@typeInfo(@TypeOf(value)).@"struct".layout != .auto);
802 return w.writeAll(std.mem.asBytes(&value));
803}
804
805799/// The function is inline to avoid the dead code in case `endian` is
806800/// comptime-known and matches host endianness.
807/// TODO: make sure this value is not a reference type
808pub inline fn writeStructEndian(w: *Writer, value: anytype, endian: std.builtin.Endian) Error!void {
801pub inline fn writeStruct(w: *Writer, value: anytype, endian: std.builtin.Endian) Error!void {
809802 switch (@typeInfo(@TypeOf(value))) {
810803 .@"struct" => |info| switch (info.layout) {
811804 .auto => @compileError("ill-defined memory layout"),
......@@ -2446,12 +2439,14 @@ pub const Allocating = struct {
24462439
24472440 pub fn toOwnedSlice(a: *Allocating) error{OutOfMemory}![]u8 {
24482441 var list = a.toArrayList();
2442 defer a.setArrayList(list);
24492443 return list.toOwnedSlice(a.allocator);
24502444 }
24512445
24522446 pub fn toOwnedSliceSentinel(a: *Allocating, comptime sentinel: u8) error{OutOfMemory}![:sentinel]u8 {
24532447 const gpa = a.allocator;
24542448 var list = toArrayList(a);
2449 defer a.setArrayList(list);
24552450 return list.toOwnedSliceSentinel(gpa, sentinel);
24562451 }
24572452
lib/std/Target.zig+2-2
......@@ -507,7 +507,7 @@ pub const Os = struct {
507507 .freebsd => .{
508508 .semver = .{
509509 .min = blk: {
510 const default_min: std.SemanticVersion = .{ .major = 13, .minor = 4, .patch = 0 };
510 const default_min: std.SemanticVersion = .{ .major = 14, .minor = 0, .patch = 0 };
511511
512512 for (std.zig.target.available_libcs) |libc| {
513513 if (libc.arch != arch or libc.os != tag or libc.abi != abi) continue;
......@@ -525,7 +525,7 @@ pub const Os = struct {
525525 .netbsd => .{
526526 .semver = .{
527527 .min = blk: {
528 const default_min: std.SemanticVersion = .{ .major = 9, .minor = 4, .patch = 0 };
528 const default_min: std.SemanticVersion = .{ .major = 10, .minor = 1, .patch = 0 };
529529
530530 for (std.zig.target.available_libcs) |libc| {
531531 if (libc.arch != arch or libc.os != tag or libc.abi != abi) continue;
lib/std/posix/test.zig+5
......@@ -1001,6 +1001,11 @@ test "sigset_t bits" {
10011001 if (native_os == .wasi or native_os == .windows)
10021002 return error.SkipZigTest;
10031003
1004 if (true) {
1005 // https://github.com/ziglang/zig/issues/24380
1006 return error.SkipZigTest;
1007 }
1008
10041009 const S = struct {
10051010 var expected_sig: i32 = undefined;
10061011 var handler_called_count: u32 = 0;
src/Zcu.zig+1-1
......@@ -2809,7 +2809,7 @@ pub fn loadZirCache(gpa: Allocator, cache_file: std.fs.File) !Zir {
28092809 var buffer: [2000]u8 = undefined;
28102810 var file_reader = cache_file.reader(&buffer);
28112811 return result: {
2812 const header = file_reader.interface.takeStruct(Zir.Header) catch |err| break :result err;
2812 const header = file_reader.interface.takeStructReference(Zir.Header) catch |err| break :result err;
28132813 break :result loadZirCacheBody(gpa, header.*, &file_reader.interface);
28142814 } catch |err| switch (err) {
28152815 error.ReadFailed => return file_reader.err.?,
src/Zcu/PerThread.zig+1-1
......@@ -349,7 +349,7 @@ fn loadZirZoirCache(
349349 const cache_br = &cache_fr.interface;
350350
351351 // First we read the header to determine the lengths of arrays.
352 const header = (cache_br.takeStruct(Header) catch |err| switch (err) {
352 const header = (cache_br.takeStructReference(Header) catch |err| switch (err) {
353353 error.ReadFailed => return cache_fr.err.?,
354354 // This can happen if Zig bails out of this function between creating
355355 // the cached file and writing it.
src/main.zig+1
......@@ -334,6 +334,7 @@ fn mainArgs(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
334334 return jitCmd(gpa, arena, cmd_args, .{
335335 .cmd_name = "std",
336336 .root_src_path = "std-docs.zig",
337 .windows_libs = &.{"ws2_32"},
337338 .prepend_zig_lib_dir_path = true,
338339 .prepend_zig_exe_path = true,
339340 .prepend_global_cache_path = true,
test/tests.zig-120
......@@ -104,12 +104,6 @@ const test_targets = blk: {
104104 .target = .{
105105 .cpu_arch = .aarch64,
106106 .os_tag = .freebsd,
107 // Remove this when we bump our baseline to 14.0.0.
108 .os_version_min = .{ .semver = .{
109 .major = 14,
110 .minor = 0,
111 .patch = 0,
112 } },
113107 .abi = .none,
114108 },
115109 .link_libc = true,
......@@ -119,12 +113,6 @@ const test_targets = blk: {
119113 .target = .{
120114 .cpu_arch = .arm,
121115 .os_tag = .freebsd,
122 // Remove this when we bump our baseline to 14.0.0.
123 .os_version_min = .{ .semver = .{
124 .major = 14,
125 .minor = 0,
126 .patch = 0,
127 } },
128116 .abi = .eabihf,
129117 },
130118 .link_libc = true,
......@@ -136,12 +124,6 @@ const test_targets = blk: {
136124 .target = .{
137125 .cpu_arch = .powerpc64,
138126 .os_tag = .freebsd,
139 // Remove this when we bump our baseline to 14.0.0.
140 .os_version_min = .{ .semver = .{
141 .major = 14,
142 .minor = 0,
143 .patch = 0,
144 } },
145127 .abi = .none,
146128 },
147129 .link_libc = true,
......@@ -151,12 +133,6 @@ const test_targets = blk: {
151133 .target = .{
152134 .cpu_arch = .powerpc64le,
153135 .os_tag = .freebsd,
154 // Remove this when we bump our baseline to 14.0.0.
155 .os_version_min = .{ .semver = .{
156 .major = 14,
157 .minor = 0,
158 .patch = 0,
159 } },
160136 .abi = .none,
161137 },
162138 .link_libc = true,
......@@ -166,12 +142,6 @@ const test_targets = blk: {
166142 .target = .{
167143 .cpu_arch = .riscv64,
168144 .os_tag = .freebsd,
169 // Remove this when we bump our baseline to 14.0.0.
170 .os_version_min = .{ .semver = .{
171 .major = 14,
172 .minor = 0,
173 .patch = 0,
174 } },
175145 .abi = .none,
176146 },
177147 .link_libc = true,
......@@ -181,12 +151,6 @@ const test_targets = blk: {
181151 .target = .{
182152 .cpu_arch = .x86_64,
183153 .os_tag = .freebsd,
184 // Remove this when we bump our baseline to 14.0.0.
185 .os_version_min = .{ .semver = .{
186 .major = 14,
187 .minor = 0,
188 .patch = 0,
189 } },
190154 .abi = .none,
191155 },
192156 .link_libc = true,
......@@ -1236,12 +1200,6 @@ const test_targets = blk: {
12361200 .target = .{
12371201 .cpu_arch = .aarch64,
12381202 .os_tag = .netbsd,
1239 // Remove this when we bump our baseline to 10.1.0.
1240 .os_version_min = .{ .semver = .{
1241 .major = 10,
1242 .minor = 1,
1243 .patch = 0,
1244 } },
12451203 .abi = .none,
12461204 },
12471205 .link_libc = true,
......@@ -1251,12 +1209,6 @@ const test_targets = blk: {
12511209 .target = .{
12521210 .cpu_arch = .aarch64_be,
12531211 .os_tag = .netbsd,
1254 // Remove this when we bump our baseline to 10.1.0.
1255 .os_version_min = .{ .semver = .{
1256 .major = 10,
1257 .minor = 1,
1258 .patch = 0,
1259 } },
12601212 .abi = .none,
12611213 },
12621214 .link_libc = true,
......@@ -1266,12 +1218,6 @@ const test_targets = blk: {
12661218 .target = .{
12671219 .cpu_arch = .arm,
12681220 .os_tag = .netbsd,
1269 // Remove this when we bump our baseline to 10.1.0.
1270 .os_version_min = .{ .semver = .{
1271 .major = 10,
1272 .minor = 1,
1273 .patch = 0,
1274 } },
12751221 .abi = .eabi,
12761222 },
12771223 .link_libc = true,
......@@ -1280,12 +1226,6 @@ const test_targets = blk: {
12801226 .target = .{
12811227 .cpu_arch = .arm,
12821228 .os_tag = .netbsd,
1283 // Remove this when we bump our baseline to 10.1.0.
1284 .os_version_min = .{ .semver = .{
1285 .major = 10,
1286 .minor = 1,
1287 .patch = 0,
1288 } },
12891229 .abi = .eabihf,
12901230 },
12911231 .link_libc = true,
......@@ -1295,12 +1235,6 @@ const test_targets = blk: {
12951235 .target = .{
12961236 .cpu_arch = .armeb,
12971237 .os_tag = .netbsd,
1298 // Remove this when we bump our baseline to 10.1.0.
1299 .os_version_min = .{ .semver = .{
1300 .major = 10,
1301 .minor = 1,
1302 .patch = 0,
1303 } },
13041238 .abi = .eabi,
13051239 },
13061240 .link_libc = true,
......@@ -1309,12 +1243,6 @@ const test_targets = blk: {
13091243 .target = .{
13101244 .cpu_arch = .armeb,
13111245 .os_tag = .netbsd,
1312 // Remove this when we bump our baseline to 10.1.0.
1313 .os_version_min = .{ .semver = .{
1314 .major = 10,
1315 .minor = 1,
1316 .patch = 0,
1317 } },
13181246 .abi = .eabihf,
13191247 },
13201248 .link_libc = true,
......@@ -1324,12 +1252,6 @@ const test_targets = blk: {
13241252 .target = .{
13251253 .cpu_arch = .mips,
13261254 .os_tag = .netbsd,
1327 // Remove this when we bump our baseline to 10.1.0.
1328 .os_version_min = .{ .semver = .{
1329 .major = 10,
1330 .minor = 1,
1331 .patch = 0,
1332 } },
13331255 .abi = .eabi,
13341256 },
13351257 .link_libc = true,
......@@ -1338,12 +1260,6 @@ const test_targets = blk: {
13381260 .target = .{
13391261 .cpu_arch = .mips,
13401262 .os_tag = .netbsd,
1341 // Remove this when we bump our baseline to 10.1.0.
1342 .os_version_min = .{ .semver = .{
1343 .major = 10,
1344 .minor = 1,
1345 .patch = 0,
1346 } },
13471263 .abi = .eabihf,
13481264 },
13491265 .link_libc = true,
......@@ -1353,12 +1269,6 @@ const test_targets = blk: {
13531269 .target = .{
13541270 .cpu_arch = .mipsel,
13551271 .os_tag = .netbsd,
1356 // Remove this when we bump our baseline to 10.1.0.
1357 .os_version_min = .{ .semver = .{
1358 .major = 10,
1359 .minor = 1,
1360 .patch = 0,
1361 } },
13621272 .abi = .eabi,
13631273 },
13641274 .link_libc = true,
......@@ -1367,12 +1277,6 @@ const test_targets = blk: {
13671277 .target = .{
13681278 .cpu_arch = .mipsel,
13691279 .os_tag = .netbsd,
1370 // Remove this when we bump our baseline to 10.1.0.
1371 .os_version_min = .{ .semver = .{
1372 .major = 10,
1373 .minor = 1,
1374 .patch = 0,
1375 } },
13761280 .abi = .eabihf,
13771281 },
13781282 .link_libc = true,
......@@ -1382,12 +1286,6 @@ const test_targets = blk: {
13821286 .target = .{
13831287 .cpu_arch = .powerpc,
13841288 .os_tag = .netbsd,
1385 // Remove this when we bump our baseline to 10.1.0.
1386 .os_version_min = .{ .semver = .{
1387 .major = 10,
1388 .minor = 1,
1389 .patch = 0,
1390 } },
13911289 .abi = .eabi,
13921290 },
13931291 .link_libc = true,
......@@ -1396,12 +1294,6 @@ const test_targets = blk: {
13961294 .target = .{
13971295 .cpu_arch = .powerpc,
13981296 .os_tag = .netbsd,
1399 // Remove this when we bump our baseline to 10.1.0.
1400 .os_version_min = .{ .semver = .{
1401 .major = 10,
1402 .minor = 1,
1403 .patch = 0,
1404 } },
14051297 .abi = .eabihf,
14061298 },
14071299 .link_libc = true,
......@@ -1411,12 +1303,6 @@ const test_targets = blk: {
14111303 .target = .{
14121304 .cpu_arch = .x86,
14131305 .os_tag = .netbsd,
1414 // Remove this when we bump our baseline to 10.1.0.
1415 .os_version_min = .{ .semver = .{
1416 .major = 10,
1417 .minor = 1,
1418 .patch = 0,
1419 } },
14201306 .abi = .none,
14211307 },
14221308 .link_libc = true,
......@@ -1426,12 +1312,6 @@ const test_targets = blk: {
14261312 .target = .{
14271313 .cpu_arch = .x86_64,
14281314 .os_tag = .netbsd,
1429 // Remove this when we bump our baseline to 10.1.0.
1430 .os_version_min = .{ .semver = .{
1431 .major = 10,
1432 .minor = 1,
1433 .patch = 0,
1434 } },
14351315 .abi = .none,
14361316 },
14371317 .link_libc = true,