Commit 35c462caf0c0763c14d0f1303197c86a63c51f03 | zig

CMakeLists.txt+13-4

 @@ -224,7 +224,7 @@ set(EMBEDDED_SOFTFLOAT_SOURCES
 add_library(embedded_softfloat STATIC ${EMBEDDED_SOFTFLOAT_SOURCES})
 if(MSVC)
     set_target_properties(embedded_softfloat PROPERTIES
-        COMPILE_FLAGS "-std=c99 /w"
+        COMPILE_FLAGS "/w /O2"
     )
 else()
     set_target_properties(embedded_softfloat PROPERTIES
 @@ -315,12 +315,17 @@ include_directories(
 )
 # These have to go before the -Wno- flags
-set(EXE_CFLAGS "-std=c++14")
+if(MSVC)
+  set(EXE_CFLAGS "/std:c++14")
+else(MSVC)
+  set(EXE_CFLAGS "-std=c++14")
+endif(MSVC)
 if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
     if(MSVC)
         set(EXE_CFLAGS "${EXE_CFLAGS} /w")
     else()
-        set(EXE_CFLAGS "${EXE_CFLAGS} -Werror -Wall")
+        set(EXE_CFLAGS "${EXE_CFLAGS} -Werror -Wall -Werror=implicit-fallthrough")
     endif()
 endif()
 @@ -333,7 +338,11 @@ else()
     endif()
 endif()
-set(OPTIMIZED_C_FLAGS "-std=c99 -O3")
+if(MSVC)
+  set(OPTIMIZED_C_FLAGS "/O2")
+else(MSVC)
+  set(OPTIMIZED_C_FLAGS "-std=c99 -O3")
+endif(MSVC)
 set(EXE_LDFLAGS " ")
 if(MSVC)

README.md+2-2

...	@@ -54,8 +54,8 @@ make install	...	@@ -54,8 +54,8 @@ make install
54	##### MacOS	54	##### MacOS
55		55
56	```	56	```
57	brew install cmake llvm@10	57	brew install cmake llvm
58	brew outdated llvm@10 \|\| brew upgrade llvm@10	58	brew outdated llvm \|\| brew upgrade llvm
59	mkdir build	59	mkdir build
60	cd build	60	cd build
61	cmake .. -DCMAKE_PREFIX_PATH=$(brew --prefix llvm)	61	cmake .. -DCMAKE_PREFIX_PATH=$(brew --prefix llvm)

ci/azure/linux_script+5-1

 @@ -12,7 +12,11 @@ sudo apt-get update -q
 sudo apt-get remove -y llvm-*
 sudo rm -rf /usr/local/*
-sudo apt-get install -y libxml2-dev libclang-10-dev llvm-10 llvm-10-dev liblld-10-dev cmake s3cmd gcc-7 g++-7 qemu
+sudo apt-get install -y libxml2-dev libclang-10-dev llvm-10 llvm-10-dev liblld-10-dev cmake s3cmd gcc-7 g++-7
+wget https://ziglang.org/deps/qemu-5.0.0-rc1-x86_64-alpinelinux.tar.xz
+tar xf qemu-5.0.0-rc1-x86_64-alpinelinux.tar.xz
+PATH=$PWD/qemu-5.0.0-rc1/bin:$PATH
 # Make the `zig version` number consistent.
 # This will affect the cmake command below.

ci/srht/update_download_page+1

...	@@ -71,6 +71,7 @@ export X86_64_FREEBSD_SHASUM="$(echo "$X86_64_FREEBSD_JSON" \| jq .shasum -r)"	...	@@ -71,6 +71,7 @@ export X86_64_FREEBSD_SHASUM="$(echo "$X86_64_FREEBSD_JSON" \| jq .shasum -r)"
71	git clone https://github.com/ziglang/www.ziglang.org --depth 1	71	git clone https://github.com/ziglang/www.ziglang.org --depth 1
72	cd www.ziglang.org	72	cd www.ziglang.org
73	export MASTER_DATE="$(date +%Y-%m-%d)"	73	export MASTER_DATE="$(date +%Y-%m-%d)"
		74	export MASTER_VERSION="$VERSION"
74	"../$ZIG" run update-download-page.zig	75	"../$ZIG" run update-download-page.zig
75		76
76	$S3CMD put -P --no-mime-magic --add-header="cache-control: public, max-age=31536000, immutable" "../$SRC_TARBALL" s3://ziglang.org/builds/	77	$S3CMD put -P --no-mime-magic --add-header="cache-control: public, max-age=31536000, immutable" "../$SRC_TARBALL" s3://ziglang.org/builds/

cmake/Findlld.cmake+1

...	@@ -24,6 +24,7 @@ else()	...	@@ -24,6 +24,7 @@ else()
24	string(TOUPPER ${_libname_} _prettylibname_)	24	string(TOUPPER ${_libname_} _prettylibname_)
25	find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_}	25	find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_}
26	PATHS	26	PATHS
		27	${LLD_LIBDIRS}
27	/usr/lib/llvm-10/lib	28	/usr/lib/llvm-10/lib
28	/usr/local/llvm100/lib	29	/usr/local/llvm100/lib
29	/mingw64/lib	30	/mingw64/lib

doc/docgen.zig+48-29

 @@ -321,7 +321,7 @@ fn genToc(allocator: *mem.Allocator, tokenizer: *Tokenizer) !Toc {
     var last_action = Action.Open;
     var last_columns: ?u8 = null;
-    var toc_buf = try std.Buffer.initSize(allocator, 0);
+    var toc_buf = std.ArrayList(u8).init(allocator);
     defer toc_buf.deinit();
     var toc = toc_buf.outStream();
 @@ -607,7 +607,7 @@ fn genToc(allocator: *mem.Allocator, tokenizer: *Tokenizer) !Toc {
 }
 fn urlize(allocator: *mem.Allocator, input: []const u8) ![]u8 {
-    var buf = try std.Buffer.initSize(allocator, 0);
+    var buf = std.ArrayList(u8).init(allocator);
     defer buf.deinit();
     const out = buf.outStream();
 @@ -626,7 +626,7 @@ fn urlize(allocator: *mem.Allocator, input: []const u8) ![]u8 {
 }
 fn escapeHtml(allocator: *mem.Allocator, input: []const u8) ![]u8 {
-    var buf = try std.Buffer.initSize(allocator, 0);
+    var buf = std.ArrayList(u8).init(allocator);
     defer buf.deinit();
     const out = buf.outStream();
 @@ -672,7 +672,7 @@ test "term color" {
 }
 fn termColor(allocator: *mem.Allocator, input: []const u8) ![]u8 {
-    var buf = try std.Buffer.initSize(allocator, 0);
+    var buf = std.ArrayList(u8).init(allocator);
     defer buf.deinit();
     var out = buf.outStream();
 @@ -1048,7 +1048,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
                     allocator,
                     &[_][]const u8{ tmp_dir_name, name_plus_ext },
                 );
-                try io.writeFile(tmp_source_file_name, trimmed_raw_source);
+                try fs.cwd().writeFile(tmp_source_file_name, trimmed_raw_source);
                 switch (code.id) {
                     Code.Id.Exe => |expected_outcome| code_block: {
 @@ -1106,18 +1106,17 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
                             }
                         }
                         if (expected_outcome == .BuildFail) {
-                            const result = try ChildProcess.exec(
+                            const result = try ChildProcess.exec(.{
-                                allocator,
+                                .allocator = allocator,
-                                build_args.toSliceConst(),
+                                .argv = build_args.span(),
-                                null,
+                                .env_map = &env_map,
-                                &env_map,
+                                .max_output_bytes = max_doc_file_size,
-                                max_doc_file_size,
+                            });
-                            );
                             switch (result.term) {
                                 .Exited => |exit_code| {
                                     if (exit_code == 0) {
                                         warn("{}\nThe following command incorrectly succeeded:\n", .{result.stderr});
-                                        for (build_args.toSliceConst()) |arg|
+                                        for (build_args.span()) |arg|
                                             warn("{} ", .{arg})
                                         else
                                             warn("\n", .{});
 @@ -1126,7 +1125,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
                                 },
                                 else => {
                                     warn("{}\nThe following command crashed:\n", .{result.stderr});
-                                    for (build_args.toSliceConst()) |arg|
+                                    for (build_args.span()) |arg|
                                         warn("{} ", .{arg})
                                     else
                                         warn("\n", .{});
 @@ -1138,7 +1137,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
                             try out.print("\n{}</code></pre>\n", .{colored_stderr});
                             break :code_block;
                         }
-                        const exec_result = exec(allocator, &env_map, build_args.toSliceConst()) catch
+                        const exec_result = exec(allocator, &env_map, build_args.span()) catch
                             return parseError(tokenizer, code.source_token, "example failed to compile", .{});
                         if (code.target_str) |triple| {
 @@ -1167,7 +1166,12 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
                         var exited_with_signal = false;
                         const result = if (expected_outcome == ExpectedOutcome.Fail) blk: {
-                            const result = try ChildProcess.exec(allocator, run_args, null, &env_map, max_doc_file_size);
+                            const result = try ChildProcess.exec(.{
+                                .allocator = allocator,
+                                .argv = run_args,
+                                .env_map = &env_map,
+                                .max_output_bytes = max_doc_file_size,
+                            });
                             switch (result.term) {
                                 .Exited => |exit_code| {
                                     if (exit_code == 0) {
 @@ -1234,7 +1238,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
                             try test_args.appendSlice(&[_][]const u8{ "-target", triple });
                             try out.print(" -target {}", .{triple});
                         }
-                        const result = exec(allocator, &env_map, test_args.toSliceConst()) catch return parseError(tokenizer, code.source_token, "test failed", .{});
+                        const result = exec(allocator, &env_map, test_args.span()) catch return parseError(tokenizer, code.source_token, "test failed", .{});
                         const escaped_stderr = try escapeHtml(allocator, result.stderr);
                         const escaped_stdout = try escapeHtml(allocator, result.stdout);
                         try out.print("\n{}{}</code></pre>\n", .{ escaped_stderr, escaped_stdout });
 @@ -1268,12 +1272,17 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
                                 try out.print(" --release-small", .{});
                             },
                         }
-                        const result = try ChildProcess.exec(allocator, test_args.toSliceConst(), null, &env_map, max_doc_file_size);
+                        const result = try ChildProcess.exec(.{
+                            .allocator = allocator,
+                            .argv = test_args.span(),
+                            .env_map = &env_map,
+                            .max_output_bytes = max_doc_file_size,
+                        });
                         switch (result.term) {
                             .Exited => |exit_code| {
                                 if (exit_code == 0) {
                                     warn("{}\nThe following command incorrectly succeeded:\n", .{result.stderr});
-                                    for (test_args.toSliceConst()) |arg|
+                                    for (test_args.span()) |arg|
                                         warn("{} ", .{arg})
                                     else
                                         warn("\n", .{});
 @@ -1282,7 +1291,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
                             },
                             else => {
                                 warn("{}\nThe following command crashed:\n", .{result.stderr});
-                                for (test_args.toSliceConst()) |arg|
+                                for (test_args.span()) |arg|
                                     warn("{} ", .{arg})
                                 else
                                     warn("\n", .{});
 @@ -1326,12 +1335,17 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
                             },
                         }
-                        const result = try ChildProcess.exec(allocator, test_args.toSliceConst(), null, &env_map, max_doc_file_size);
+                        const result = try ChildProcess.exec(.{
+                            .allocator = allocator,
+                            .argv = test_args.span(),
+                            .env_map = &env_map,
+                            .max_output_bytes = max_doc_file_size,
+                        });
                         switch (result.term) {
                             .Exited => |exit_code| {
                                 if (exit_code == 0) {
                                     warn("{}\nThe following command incorrectly succeeded:\n", .{result.stderr});
-                                    for (test_args.toSliceConst()) |arg|
+                                    for (test_args.span()) |arg|
                                         warn("{} ", .{arg})
                                     else
                                         warn("\n", .{});
 @@ -1340,7 +1354,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
                             },
                             else => {
                                 warn("{}\nThe following command crashed:\n", .{result.stderr});
-                                for (test_args.toSliceConst()) |arg|
+                                for (test_args.span()) |arg|
                                     warn("{} ", .{arg})
                                 else
                                     warn("\n", .{});
 @@ -1418,12 +1432,17 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
                         }
                         if (maybe_error_match) |error_match| {
-                            const result = try ChildProcess.exec(allocator, build_args.toSliceConst(), null, &env_map, max_doc_file_size);
+                            const result = try ChildProcess.exec(.{
+                                .allocator = allocator,
+                                .argv = build_args.span(),
+                                .env_map = &env_map,
+                                .max_output_bytes = max_doc_file_size,
+                            });
                             switch (result.term) {
                                 .Exited => |exit_code| {
                                     if (exit_code == 0) {
                                         warn("{}\nThe following command incorrectly succeeded:\n", .{result.stderr});
-                                        for (build_args.toSliceConst()) |arg|
+                                        for (build_args.span()) |arg|
                                             warn("{} ", .{arg})
                                         else
                                             warn("\n", .{});
 @@ -1432,7 +1451,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
                                 },
                                 else => {
                                     warn("{}\nThe following command crashed:\n", .{result.stderr});
-                                    for (build_args.toSliceConst()) |arg|
+                                    for (build_args.span()) |arg|
                                         warn("{} ", .{arg})
                                     else
                                         warn("\n", .{});
 @@ -1447,7 +1466,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
                             const colored_stderr = try termColor(allocator, escaped_stderr);
                             try out.print("\n{}", .{colored_stderr});
                         } else {
-                            _ = exec(allocator, &env_map, build_args.toSliceConst()) catch return parseError(tokenizer, code.source_token, "example failed to compile", .{});
+                            _ = exec(allocator, &env_map, build_args.span()) catch return parseError(tokenizer, code.source_token, "example failed to compile", .{});
                         }
                         if (!code.is_inline) {
                             try out.print("</code></pre>\n", .{});
 @@ -1484,7 +1503,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
                             try test_args.appendSlice(&[_][]const u8{ "-target", triple });
                             try out.print(" -target {}", .{triple});
                         }
-                        const result = exec(allocator, &env_map, test_args.toSliceConst()) catch return parseError(tokenizer, code.source_token, "test failed", .{});
+                        const result = exec(allocator, &env_map, test_args.span()) catch return parseError(tokenizer, code.source_token, "test failed", .{});
                         const escaped_stderr = try escapeHtml(allocator, result.stderr);
                         const escaped_stdout = try escapeHtml(allocator, result.stdout);
                         try out.print("\n{}{}</code></pre>\n", .{ escaped_stderr, escaped_stdout });
 @@ -1497,7 +1516,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
 }
 fn exec(allocator: *mem.Allocator, env_map: *std.BufMap, args: []const []const u8) !ChildProcess.ExecResult {
-    const result = try ChildProcess.exec2(.{
+    const result = try ChildProcess.exec(.{
         .allocator = allocator,
         .argv = args,
         .env_map = env_map,

doc/langref.html.in+2-2

...	@@ -4953,7 +4953,7 @@ const mem = std.mem;	...	@@ -4953,7 +4953,7 @@ const mem = std.mem;
4953	test "cast [1][]const u8 to []const ?[]const u8" {	4953	test "cast [1][]const u8 to []const ?[]const u8" {
4954	const window_name = [1][*]const u8{"window name"};	4954	const window_name = [1][*]const u8{"window name"};
4955	const x: []const ?[]const u8 = &window_name;	4955	const x: []const ?[]const u8 = &window_name;
4956	assert(mem.eql(u8, std.mem.toSliceConst(u8, @ptrCast([*:0]const u8, x[0].?)), "window name"));	4956	assert(mem.eql(u8, std.mem.spanZ(@ptrCast([*:0]const u8, x[0].?)), "window name"));
4957	}	4957	}
4958	{#code_end#}	4958	{#code_end#}
4959	{#header_close#}	4959	{#header_close#}
...	@@ -9310,7 +9310,7 @@ test "string literal to constant slice" {	...	@@ -9310,7 +9310,7 @@ test "string literal to constant slice" {
9310	</p>	9310	</p>
9311	<p>	9311	<p>
9312	Sometimes the lifetime of a pointer may be more complicated. For example, when using	9312	Sometimes the lifetime of a pointer may be more complicated. For example, when using
9313	{#syntax#}std.ArrayList(T).toSlice(){#endsyntax#}, the returned slice has a lifetime that remains	9313	{#syntax#}std.ArrayList(T).span(){#endsyntax#}, the returned slice has a lifetime that remains
9314	valid until the next time the list is resized, such as by appending new elements.	9314	valid until the next time the list is resized, such as by appending new elements.
9315	</p>	9315	</p>
9316	<p>	9316	<p>

lib/std/array_list.zig+29-4

...	@@ -189,16 +189,30 @@ pub fn AlignedArrayList(comptime T: type, comptime alignment: ?u29) type {	...	@@ -189,16 +189,30 @@ pub fn AlignedArrayList(comptime T: type, comptime alignment: ?u29) type {
189	self.len += items.len;	189	self.len += items.len;
190	}	190	}
191		191
192	/// Append a value to the list `n` times. Allocates more memory	192	/// Same as `append` except it returns the number of bytes written, which is always the same
193	/// as necessary.	193	/// as `m.len`. The purpose of this function existing is to match `std.io.OutStream` API.
		194	/// This function may be called only when `T` is `u8`.
		195	fn appendWrite(self: *Self, m: []const u8) !usize {
		196	try self.appendSlice(m);
		197	return m.len;
		198	}
		199
		200	/// Initializes an OutStream which will append to the list.
		201	/// This function may be called only when `T` is `u8`.
		202	pub fn outStream(self: Self) std.io.OutStream(Self, error{OutOfMemory}, appendWrite) {
		203	return .{ .context = self };
		204	}
		205
		206	/// Append a value to the list `n` times.
		207	/// Allocates more memory as necessary.
194	pub fn appendNTimes(self: *Self, value: T, n: usize) !void {	208	pub fn appendNTimes(self: *Self, value: T, n: usize) !void {
195	const old_len = self.len;	209	const old_len = self.len;
196	try self.resize(self.len + n);	210	try self.resize(self.len + n);
197	mem.set(T, self.items[old_len..self.len], value);	211	mem.set(T, self.items[old_len..self.len], value);
198	}	212	}
199		213
200	/// Adjust the list's length to `new_len`. Doesn't initialize	214	/// Adjust the list's length to `new_len`.
201	/// added items if any.	215	/// Does not initialize added items if any.
202	pub fn resize(self: *Self, new_len: usize) !void {	216	pub fn resize(self: *Self, new_len: usize) !void {
203	try self.ensureCapacity(new_len);	217	try self.ensureCapacity(new_len);
204	self.len = new_len;	218	self.len = new_len;
...	@@ -479,3 +493,14 @@ test "std.ArrayList: ArrayList(T) of struct T" {	...	@@ -479,3 +493,14 @@ test "std.ArrayList: ArrayList(T) of struct T" {
479	try root.sub_items.append(Item{ .integer = 42, .sub_items = ArrayList(Item).init(testing.allocator) });	493	try root.sub_items.append(Item{ .integer = 42, .sub_items = ArrayList(Item).init(testing.allocator) });
480	testing.expect(root.sub_items.items[0].integer == 42);	494	testing.expect(root.sub_items.items[0].integer == 42);
481	}	495	}
		496
		497	test "std.ArrayList(u8) implements outStream" {
		498	var buffer = ArrayList(u8).init(std.testing.allocator);
		499	defer buffer.deinit();
		500
		501	const x: i32 = 42;
		502	const y: i32 = 1234;
		503	try buffer.outStream().print("x: {}\ny: {}\n", .{ x, y });
		504
		505	testing.expectEqualSlices(u8, "x: 42\ny: 1234\n", buffer.span());
		506	}

lib/std/array_list_sentineled.zig created+224

...	@@ -0,0 +1,224 @@
1	const std = @import("std.zig");
2	const debug = std.debug;
3	const mem = std.mem;
4	const Allocator = mem.Allocator;
5	const assert = debug.assert;
6	const testing = std.testing;
7	const ArrayList = std.ArrayList;
8
9	/// A contiguous, growable list of items in memory, with a sentinel after them.
10	/// The sentinel is maintained when appending, resizing, etc.
11	/// If you do not need a sentinel, consider using `ArrayList` instead.
12	pub fn ArrayListSentineled(comptime T: type, comptime sentinel: T) type {
13	return struct {
14	list: ArrayList(T),
15
16	const Self = @This();
17
18	/// Must deinitialize with deinit.
19	pub fn init(allocator: *Allocator, m: []const T) !Self {
20	var self = try initSize(allocator, m.len);
21	mem.copy(T, self.list.items, m);
22	return self;
23	}
24
25	/// Initialize memory to size bytes of undefined values.
26	/// Must deinitialize with deinit.
27	pub fn initSize(allocator: *Allocator, size: usize) !Self {
28	var self = initNull(allocator);
29	try self.resize(size);
30	return self;
31	}
32
33	/// Initialize with capacity to hold at least num bytes.
34	/// Must deinitialize with deinit.
35	pub fn initCapacity(allocator: *Allocator, num: usize) !Self {
36	var self = Self{ .list = try ArrayList(T).initCapacity(allocator, num + 1) };
37	self.list.appendAssumeCapacity(sentinel);
38	return self;
39	}
40
41	/// Must deinitialize with deinit.
42	/// None of the other operations are valid until you do one of these:
43	/// * `replaceContents`
44	/// * `resize`
45	pub fn initNull(allocator: *Allocator) Self {
46	return Self{ .list = ArrayList(T).init(allocator) };
47	}
48
49	/// Must deinitialize with deinit.
50	pub fn initFromBuffer(buffer: Self) !Self {
51	return Self.init(buffer.list.allocator, buffer.span());
52	}
53
54	/// Takes ownership of the passed in slice. The slice must have been
55	/// allocated with `allocator`.
56	/// Must deinitialize with deinit.
57	pub fn fromOwnedSlice(allocator: *Allocator, slice: []T) !Self {
58	var self = Self{ .list = ArrayList(T).fromOwnedSlice(allocator, slice) };
59	try self.list.append(sentinel);
60	return self;
61	}
62
63	/// The caller owns the returned memory. The list becomes null and is safe to `deinit`.
64	pub fn toOwnedSlice(self: *Self) [:sentinel]T {
65	const allocator = self.list.allocator;
66	const result = self.list.toOwnedSlice();
67	self.* = initNull(allocator);
68	return result[0 .. result.len - 1 :sentinel];
69	}
70
71	/// Only works when `T` is `u8`.
72	pub fn allocPrint(allocator: *Allocator, comptime format: []const u8, args: var) !Self {
73	const size = std.math.cast(usize, std.fmt.count(format, args)) catch \|err\| switch (err) {
74	error.Overflow => return error.OutOfMemory,
75	};
76	var self = try Self.initSize(allocator, size);
77	assert((std.fmt.bufPrint(self.list.items, format, args) catch unreachable).len == size);
78	return self;
79	}
80
81	pub fn deinit(self: *Self) void {
82	self.list.deinit();
83	}
84
85	pub fn span(self: var) @TypeOf(self.list.items[0 .. self.list.len - 1 :sentinel]) {
86	return self.list.span()[0..self.len() :sentinel];
87	}
88
89	pub fn shrink(self: *Self, new_len: usize) void {
90	assert(new_len <= self.len());
91	self.list.shrink(new_len + 1);
92	self.list.items[self.len()] = sentinel;
93	}
94
95	pub fn resize(self: *Self, new_len: usize) !void {
96	try self.list.resize(new_len + 1);
97	self.list.items[self.len()] = sentinel;
98	}
99
100	pub fn isNull(self: Self) bool {
101	return self.list.len == 0;
102	}
103
104	pub fn len(self: Self) usize {
105	return self.list.len - 1;
106	}
107
108	pub fn capacity(self: Self) usize {
109	return if (self.list.items.len > 0)
110	self.list.items.len - 1
111	else
112	0;
113	}
114
115	pub fn appendSlice(self: *Self, m: []const T) !void {
116	const old_len = self.len();
117	try self.resize(old_len + m.len);
118	mem.copy(T, self.list.span()[old_len..], m);
119	}
120
121	pub fn append(self: *Self, byte: T) !void {
122	const old_len = self.len();
123	try self.resize(old_len + 1);
124	self.list.span()[old_len] = byte;
125	}
126
127	pub fn eql(self: Self, m: []const T) bool {
128	return mem.eql(T, self.span(), m);
129	}
130
131	pub fn startsWith(self: Self, m: []const T) bool {
132	if (self.len() < m.len) return false;
133	return mem.eql(T, self.list.items[0..m.len], m);
134	}
135
136	pub fn endsWith(self: Self, m: []const T) bool {
137	const l = self.len();
138	if (l < m.len) return false;
139	const start = l - m.len;
140	return mem.eql(T, self.list.items[start..l], m);
141	}
142
143	pub fn replaceContents(self: *Self, m: []const T) !void {
144	try self.resize(m.len);
145	mem.copy(T, self.list.span(), m);
146	}
147
148	/// Initializes an OutStream which will append to the list.
149	/// This function may be called only when `T` is `u8`.
150	pub fn outStream(self: Self) std.io.OutStream(Self, error{OutOfMemory}, appendWrite) {
151	return .{ .context = self };
152	}
153
154	/// Same as `append` except it returns the number of bytes written, which is always the same
155	/// as `m.len`. The purpose of this function existing is to match `std.io.OutStream` API.
156	/// This function may be called only when `T` is `u8`.
157	pub fn appendWrite(self: *Self, m: []const u8) !usize {
158	try self.appendSlice(m);
159	return m.len;
160	}
161	};
162	}
163
164	test "simple" {
165	var buf = try ArrayListSentineled(u8, 0).init(testing.allocator, "");
166	defer buf.deinit();
167
168	testing.expect(buf.len() == 0);
169	try buf.appendSlice("hello");
170	try buf.appendSlice(" ");
171	try buf.appendSlice("world");
172	testing.expect(buf.eql("hello world"));
173	testing.expect(mem.eql(u8, mem.spanZ(buf.span().ptr), buf.span()));
174
175	var buf2 = try ArrayListSentineled(u8, 0).initFromBuffer(buf);
176	defer buf2.deinit();
177	testing.expect(buf.eql(buf2.span()));
178
179	testing.expect(buf.startsWith("hell"));
180	testing.expect(buf.endsWith("orld"));
181
182	try buf2.resize(4);
183	testing.expect(buf.startsWith(buf2.span()));
184	}
185
186	test "initSize" {
187	var buf = try ArrayListSentineled(u8, 0).initSize(testing.allocator, 3);
188	defer buf.deinit();
189	testing.expect(buf.len() == 3);
190	try buf.appendSlice("hello");
191	testing.expect(mem.eql(u8, buf.span()[3..], "hello"));
192	}
193
194	test "initCapacity" {
195	var buf = try ArrayListSentineled(u8, 0).initCapacity(testing.allocator, 10);
196	defer buf.deinit();
197	testing.expect(buf.len() == 0);
198	testing.expect(buf.capacity() >= 10);
199	const old_cap = buf.capacity();
200	try buf.appendSlice("hello");
201	testing.expect(buf.len() == 5);
202	testing.expect(buf.capacity() == old_cap);
203	testing.expect(mem.eql(u8, buf.span(), "hello"));
204	}
205
206	test "print" {
207	var buf = try ArrayListSentineled(u8, 0).init(testing.allocator, "");
208	defer buf.deinit();
209
210	try buf.outStream().print("Hello {} the {}", .{ 2, "world" });
211	testing.expect(buf.eql("Hello 2 the world"));
212	}
213
214	test "outStream" {
215	var buffer = try ArrayListSentineled(u8, 0).initSize(testing.allocator, 0);
216	defer buffer.deinit();
217	const buf_stream = buffer.outStream();
218
219	const x: i32 = 42;
220	const y: i32 = 1234;
221	try buf_stream.print("x: {}\ny: {}\n", .{ x, y });
222
223	testing.expect(mem.eql(u8, buffer.span(), "x: 42\ny: 1234\n"));
224	}

lib/std/atomic/queue.zig+1-1

...	@@ -227,7 +227,7 @@ fn startPuts(ctx: *Context) u8 {	...	@@ -227,7 +227,7 @@ fn startPuts(ctx: *Context) u8 {
227	var r = std.rand.DefaultPrng.init(0xdeadbeef);	227	var r = std.rand.DefaultPrng.init(0xdeadbeef);
228	while (put_count != 0) : (put_count -= 1) {	228	while (put_count != 0) : (put_count -= 1) {
229	std.time.sleep(1); // let the os scheduler be our fuzz	229	std.time.sleep(1); // let the os scheduler be our fuzz
230	const x = @bitCast(i32, r.random.scalar(u32));	230	const x = @bitCast(i32, r.random.int(u32));
231	const node = ctx.allocator.create(Queue(i32).Node) catch unreachable;	231	const node = ctx.allocator.create(Queue(i32).Node) catch unreachable;
232	node.* = .{	232	node.* = .{
233	.prev = undefined,	233	.prev = undefined,

lib/std/atomic/stack.zig+1-1

...	@@ -150,7 +150,7 @@ fn startPuts(ctx: *Context) u8 {	...	@@ -150,7 +150,7 @@ fn startPuts(ctx: *Context) u8 {
150	var r = std.rand.DefaultPrng.init(0xdeadbeef);	150	var r = std.rand.DefaultPrng.init(0xdeadbeef);
151	while (put_count != 0) : (put_count -= 1) {	151	while (put_count != 0) : (put_count -= 1) {
152	std.time.sleep(1); // let the os scheduler be our fuzz	152	std.time.sleep(1); // let the os scheduler be our fuzz
153	const x = @bitCast(i32, r.random.scalar(u32));	153	const x = @bitCast(i32, r.random.int(u32));
154	const node = ctx.allocator.create(Stack(i32).Node) catch unreachable;	154	const node = ctx.allocator.create(Stack(i32).Node) catch unreachable;
155	node.* = Stack(i32).Node{	155	node.* = Stack(i32).Node{
156	.next = undefined,	156	.next = undefined,

lib/std/buffer.zig deleted-225

...	@@ -1,225 +0,0 @@
1	const std = @import("std.zig");
2	const debug = std.debug;
3	const mem = std.mem;
4	const Allocator = mem.Allocator;
5	const assert = debug.assert;
6	const testing = std.testing;
7	const ArrayList = std.ArrayList;
8
9	/// A buffer that allocates memory and maintains a null byte at the end.
10	pub const Buffer = struct {
11	list: ArrayList(u8),
12
13	/// Must deinitialize with deinit.
14	pub fn init(allocator: *Allocator, m: []const u8) !Buffer {
15	var self = try initSize(allocator, m.len);
16	mem.copy(u8, self.list.items, m);
17	return self;
18	}
19
20	/// Initialize memory to size bytes of undefined values.
21	/// Must deinitialize with deinit.
22	pub fn initSize(allocator: *Allocator, size: usize) !Buffer {
23	var self = initNull(allocator);
24	try self.resize(size);
25	return self;
26	}
27
28	/// Initialize with capacity to hold at least num bytes.
29	/// Must deinitialize with deinit.
30	pub fn initCapacity(allocator: *Allocator, num: usize) !Buffer {
31	var self = Buffer{ .list = try ArrayList(u8).initCapacity(allocator, num + 1) };
32	self.list.appendAssumeCapacity(0);
33	return self;
34	}
35
36	/// Must deinitialize with deinit.
37	/// None of the other operations are valid until you do one of these:
38	/// * ::replaceContents
39	/// * ::resize
40	pub fn initNull(allocator: *Allocator) Buffer {
41	return Buffer{ .list = ArrayList(u8).init(allocator) };
42	}
43
44	/// Must deinitialize with deinit.
45	pub fn initFromBuffer(buffer: Buffer) !Buffer {
46	return Buffer.init(buffer.list.allocator, buffer.toSliceConst());
47	}
48
49	/// Buffer takes ownership of the passed in slice. The slice must have been
50	/// allocated with `allocator`.
51	/// Must deinitialize with deinit.
52	pub fn fromOwnedSlice(allocator: *Allocator, slice: []u8) !Buffer {
53	var self = Buffer{ .list = ArrayList(u8).fromOwnedSlice(allocator, slice) };
54	try self.list.append(0);
55	return self;
56	}
57
58	/// The caller owns the returned memory. The Buffer becomes null and
59	/// is safe to `deinit`.
60	pub fn toOwnedSlice(self: *Buffer) [:0]u8 {
61	const allocator = self.list.allocator;
62	const result = self.list.toOwnedSlice();
63	self.* = initNull(allocator);
64	return result[0 .. result.len - 1 :0];
65	}
66
67	pub fn allocPrint(allocator: *Allocator, comptime format: []const u8, args: var) !Buffer {
68	const size = std.math.cast(usize, std.fmt.count(format, args)) catch \|err\| switch (err) {
69	error.Overflow => return error.OutOfMemory,
70	};
71	var self = try Buffer.initSize(allocator, size);
72	assert((std.fmt.bufPrint(self.list.items, format, args) catch unreachable).len == size);
73	return self;
74	}
75
76	pub fn deinit(self: *Buffer) void {
77	self.list.deinit();
78	}
79
80	pub fn span(self: var) @TypeOf(self.list.items[0 .. self.list.len - 1 :0]) {
81	return self.list.span()[0..self.len() :0];
82	}
83
84	/// Deprecated: use `span`
85	pub fn toSlice(self: Buffer) [:0]u8 {
86	return self.span();
87	}
88
89	/// Deprecated: use `span`
90	pub fn toSliceConst(self: Buffer) [:0]const u8 {
91	return self.span();
92	}
93
94	pub fn shrink(self: *Buffer, new_len: usize) void {
95	assert(new_len <= self.len());
96	self.list.shrink(new_len + 1);
97	self.list.items[self.len()] = 0;
98	}
99
100	pub fn resize(self: *Buffer, new_len: usize) !void {
101	try self.list.resize(new_len + 1);
102	self.list.items[self.len()] = 0;
103	}
104
105	pub fn isNull(self: Buffer) bool {
106	return self.list.len == 0;
107	}
108
109	pub fn len(self: Buffer) usize {
110	return self.list.len - 1;
111	}
112
113	pub fn capacity(self: Buffer) usize {
114	return if (self.list.items.len > 0)
115	self.list.items.len - 1
116	else
117	0;
118	}
119
120	pub fn append(self: *Buffer, m: []const u8) !void {
121	const old_len = self.len();
122	try self.resize(old_len + m.len);
123	mem.copy(u8, self.list.toSlice()[old_len..], m);
124	}
125
126	pub fn appendByte(self: *Buffer, byte: u8) !void {
127	const old_len = self.len();
128	try self.resize(old_len + 1);
129	self.list.toSlice()[old_len] = byte;
130	}
131
132	pub fn eql(self: Buffer, m: []const u8) bool {
133	return mem.eql(u8, self.toSliceConst(), m);
134	}
135
136	pub fn startsWith(self: Buffer, m: []const u8) bool {
137	if (self.len() < m.len) return false;
138	return mem.eql(u8, self.list.items[0..m.len], m);
139	}
140
141	pub fn endsWith(self: Buffer, m: []const u8) bool {
142	const l = self.len();
143	if (l < m.len) return false;
144	const start = l - m.len;
145	return mem.eql(u8, self.list.items[start..l], m);
146	}
147
148	pub fn replaceContents(self: *Buffer, m: []const u8) !void {
149	try self.resize(m.len);
150	mem.copy(u8, self.list.toSlice(), m);
151	}
152
153	pub fn outStream(self: Buffer) std.io.OutStream(Buffer, error{OutOfMemory}, appendWrite) {
154	return .{ .context = self };
155	}
156
157	/// Same as `append` except it returns the number of bytes written, which is always the same
158	/// as `m.len`. The purpose of this function existing is to match `std.io.OutStream` API.
159	pub fn appendWrite(self: *Buffer, m: []const u8) !usize {
160	try self.append(m);
161	return m.len;
162	}
163	};
164
165	test "simple Buffer" {
166	var buf = try Buffer.init(testing.allocator, "");
167	defer buf.deinit();
168
169	testing.expect(buf.len() == 0);
170	try buf.append("hello");
171	try buf.append(" ");
172	try buf.append("world");
173	testing.expect(buf.eql("hello world"));
174	testing.expect(mem.eql(u8, mem.toSliceConst(u8, buf.toSliceConst().ptr), buf.toSliceConst()));
175
176	var buf2 = try Buffer.initFromBuffer(buf);
177	defer buf2.deinit();
178	testing.expect(buf.eql(buf2.toSliceConst()));
179
180	testing.expect(buf.startsWith("hell"));
181	testing.expect(buf.endsWith("orld"));
182
183	try buf2.resize(4);
184	testing.expect(buf.startsWith(buf2.toSlice()));
185	}
186
187	test "Buffer.initSize" {
188	var buf = try Buffer.initSize(testing.allocator, 3);
189	defer buf.deinit();
190	testing.expect(buf.len() == 3);
191	try buf.append("hello");
192	testing.expect(mem.eql(u8, buf.toSliceConst()[3..], "hello"));
193	}
194
195	test "Buffer.initCapacity" {
196	var buf = try Buffer.initCapacity(testing.allocator, 10);
197	defer buf.deinit();
198	testing.expect(buf.len() == 0);
199	testing.expect(buf.capacity() >= 10);
200	const old_cap = buf.capacity();
201	try buf.append("hello");
202	testing.expect(buf.len() == 5);
203	testing.expect(buf.capacity() == old_cap);
204	testing.expect(mem.eql(u8, buf.toSliceConst(), "hello"));
205	}
206
207	test "Buffer.print" {
208	var buf = try Buffer.init(testing.allocator, "");
209	defer buf.deinit();
210
211	try buf.outStream().print("Hello {} the {}", .{ 2, "world" });
212	testing.expect(buf.eql("Hello 2 the world"));
213	}
214
215	test "Buffer.outStream" {
216	var buffer = try Buffer.initSize(testing.allocator, 0);
217	defer buffer.deinit();
218	const buf_stream = buffer.outStream();
219
220	const x: i32 = 42;
221	const y: i32 = 1234;
222	try buf_stream.print("x: {}\ny: {}\n", .{ x, y });
223
224	testing.expect(mem.eql(u8, buffer.toSlice(), "x: 42\ny: 1234\n"));
225	}

lib/std/build.zig+29-32

...	@@ -355,7 +355,7 @@ pub const Builder = struct {	...	@@ -355,7 +355,7 @@ pub const Builder = struct {
355	}	355	}
356	}	356	}
357		357
358	for (wanted_steps.toSliceConst()) \|s\| {	358	for (wanted_steps.span()) \|s\| {
359	try self.makeOneStep(s);	359	try self.makeOneStep(s);
360	}	360	}
361	}	361	}
...	@@ -372,7 +372,7 @@ pub const Builder = struct {	...	@@ -372,7 +372,7 @@ pub const Builder = struct {
372	const uninstall_tls = @fieldParentPtr(TopLevelStep, "step", uninstall_step);	372	const uninstall_tls = @fieldParentPtr(TopLevelStep, "step", uninstall_step);
373	const self = @fieldParentPtr(Builder, "uninstall_tls", uninstall_tls);	373	const self = @fieldParentPtr(Builder, "uninstall_tls", uninstall_tls);
374		374
375	for (self.installed_files.toSliceConst()) \|installed_file\| {	375	for (self.installed_files.span()) \|installed_file\| {
376	const full_path = self.getInstallPath(installed_file.dir, installed_file.path);	376	const full_path = self.getInstallPath(installed_file.dir, installed_file.path);
377	if (self.verbose) {	377	if (self.verbose) {
378	warn("rm {}\n", .{full_path});	378	warn("rm {}\n", .{full_path});
...	@@ -390,7 +390,7 @@ pub const Builder = struct {	...	@@ -390,7 +390,7 @@ pub const Builder = struct {
390	}	390	}
391	s.loop_flag = true;	391	s.loop_flag = true;
392		392
393	for (s.dependencies.toSlice()) \|dep\| {	393	for (s.dependencies.span()) \|dep\| {
394	self.makeOneStep(dep) catch \|err\| {	394	self.makeOneStep(dep) catch \|err\| {
395	if (err == error.DependencyLoopDetected) {	395	if (err == error.DependencyLoopDetected) {
396	warn(" {}\n", .{s.name});	396	warn(" {}\n", .{s.name});
...	@@ -405,7 +405,7 @@ pub const Builder = struct {	...	@@ -405,7 +405,7 @@ pub const Builder = struct {
405	}	405	}
406		406
407	fn getTopLevelStepByName(self: Builder, name: []const u8) !Step {	407	fn getTopLevelStepByName(self: Builder, name: []const u8) !Step {
408	for (self.top_level_steps.toSliceConst()) \|top_level_step\| {	408	for (self.top_level_steps.span()) \|top_level_step\| {
409	if (mem.eql(u8, top_level_step.step.name, name)) {	409	if (mem.eql(u8, top_level_step.step.name, name)) {
410	return &top_level_step.step;	410	return &top_level_step.step;
411	}	411	}
...	@@ -470,7 +470,7 @@ pub const Builder = struct {	...	@@ -470,7 +470,7 @@ pub const Builder = struct {
470	return null;	470	return null;
471	},	471	},
472	UserValue.Scalar => \|s\| return &[_][]const u8{s},	472	UserValue.Scalar => \|s\| return &[_][]const u8{s},
473	UserValue.List => \|lst\| return lst.toSliceConst(),	473	UserValue.List => \|lst\| return lst.span(),
474	},	474	},
475	}	475	}
476	}	476	}
...	@@ -866,7 +866,7 @@ pub const Builder = struct {	...	@@ -866,7 +866,7 @@ pub const Builder = struct {
866	pub fn findProgram(self: *Builder, names: []const []const u8, paths: []const []const u8) ![]const u8 {	866	pub fn findProgram(self: *Builder, names: []const []const u8, paths: []const []const u8) ![]const u8 {
867	// TODO report error for ambiguous situations	867	// TODO report error for ambiguous situations
868	const exe_extension = @as(CrossTarget, .{}).exeFileExt();	868	const exe_extension = @as(CrossTarget, .{}).exeFileExt();
869	for (self.search_prefixes.toSliceConst()) \|search_prefix\| {	869	for (self.search_prefixes.span()) \|search_prefix\| {
870	for (names) \|name\| {	870	for (names) \|name\| {
871	if (fs.path.isAbsolute(name)) {	871	if (fs.path.isAbsolute(name)) {
872	return name;	872	return name;
...	@@ -1010,7 +1010,7 @@ pub const Builder = struct {	...	@@ -1010,7 +1010,7 @@ pub const Builder = struct {
1010	.desc = tok_it.rest(),	1010	.desc = tok_it.rest(),
1011	});	1011	});
1012	}	1012	}
1013	return list.toSliceConst();	1013	return list.span();
1014	}	1014	}
1015		1015
1016	fn getPkgConfigList(self: *Builder) ![]const PkgConfigPkg {	1016	fn getPkgConfigList(self: *Builder) ![]const PkgConfigPkg {
...	@@ -1139,7 +1139,7 @@ pub const LibExeObjStep = struct {	...	@@ -1139,7 +1139,7 @@ pub const LibExeObjStep = struct {
1139	out_lib_filename: []const u8,	1139	out_lib_filename: []const u8,
1140	out_pdb_filename: []const u8,	1140	out_pdb_filename: []const u8,
1141	packages: ArrayList(Pkg),	1141	packages: ArrayList(Pkg),
1142	build_options_contents: std.Buffer,	1142	build_options_contents: std.ArrayList(u8),
1143	system_linker_hack: bool = false,	1143	system_linker_hack: bool = false,
1144		1144
1145	object_src: []const u8,	1145	object_src: []const u8,
...	@@ -1274,7 +1274,7 @@ pub const LibExeObjStep = struct {	...	@@ -1274,7 +1274,7 @@ pub const LibExeObjStep = struct {
1274	.lib_paths = ArrayList([]const u8).init(builder.allocator),	1274	.lib_paths = ArrayList([]const u8).init(builder.allocator),
1275	.framework_dirs = ArrayList([]const u8).init(builder.allocator),	1275	.framework_dirs = ArrayList([]const u8).init(builder.allocator),
1276	.object_src = undefined,	1276	.object_src = undefined,
1277	.build_options_contents = std.Buffer.initSize(builder.allocator, 0) catch unreachable,	1277	.build_options_contents = std.ArrayList(u8).init(builder.allocator),
1278	.c_std = Builder.CStd.C99,	1278	.c_std = Builder.CStd.C99,
1279	.override_lib_dir = null,	1279	.override_lib_dir = null,
1280	.main_pkg_path = null,	1280	.main_pkg_path = null,
...	@@ -1395,7 +1395,7 @@ pub const LibExeObjStep = struct {	...	@@ -1395,7 +1395,7 @@ pub const LibExeObjStep = struct {
1395	if (isLibCLibrary(name)) {	1395	if (isLibCLibrary(name)) {
1396	return self.is_linking_libc;	1396	return self.is_linking_libc;
1397	}	1397	}
1398	for (self.link_objects.toSliceConst()) \|link_object\| {	1398	for (self.link_objects.span()) \|link_object\| {
1399	switch (link_object) {	1399	switch (link_object) {
1400	LinkObject.SystemLib => \|n\| if (mem.eql(u8, n, name)) return true,	1400	LinkObject.SystemLib => \|n\| if (mem.eql(u8, n, name)) return true,
1401	else => continue,	1401	else => continue,
...	@@ -1599,10 +1599,7 @@ pub const LibExeObjStep = struct {	...	@@ -1599,10 +1599,7 @@ pub const LibExeObjStep = struct {
1599	self.main_pkg_path = dir_path;	1599	self.main_pkg_path = dir_path;
1600	}	1600	}
1601		1601
1602	/// Deprecated; just set the field directly.	1602	pub const setDisableGenH = @compileError("deprecated; set the emit_h field directly");
1603	pub fn setDisableGenH(self: *LibExeObjStep, is_disabled: bool) void {
1604	self.emit_h = !is_disabled;
1605	}
1606		1603
1607	pub fn setLibCFile(self: *LibExeObjStep, libc_file: ?[]const u8) void {	1604	pub fn setLibCFile(self: *LibExeObjStep, libc_file: ?[]const u8) void {
1608	self.libc_file = libc_file;	1605	self.libc_file = libc_file;
...	@@ -1762,7 +1759,7 @@ pub const LibExeObjStep = struct {	...	@@ -1762,7 +1759,7 @@ pub const LibExeObjStep = struct {
1762	self.include_dirs.append(IncludeDir{ .OtherStep = other }) catch unreachable;	1759	self.include_dirs.append(IncludeDir{ .OtherStep = other }) catch unreachable;
1763		1760
1764	// Inherit dependency on system libraries	1761	// Inherit dependency on system libraries
1765	for (other.link_objects.toSliceConst()) \|link_object\| {	1762	for (other.link_objects.span()) \|link_object\| {
1766	switch (link_object) {	1763	switch (link_object) {
1767	.SystemLib => \|name\| self.linkSystemLibrary(name),	1764	.SystemLib => \|name\| self.linkSystemLibrary(name),
1768	else => continue,	1765	else => continue,
...	@@ -1802,7 +1799,7 @@ pub const LibExeObjStep = struct {	...	@@ -1802,7 +1799,7 @@ pub const LibExeObjStep = struct {
1802		1799
1803	if (self.root_src) \|root_src\| try zig_args.append(root_src.getPath(builder));	1800	if (self.root_src) \|root_src\| try zig_args.append(root_src.getPath(builder));
1804		1801
1805	for (self.link_objects.toSlice()) \|link_object\| {	1802	for (self.link_objects.span()) \|link_object\| {
1806	switch (link_object) {	1803	switch (link_object) {
1807	.StaticPath => \|static_path\| {	1804	.StaticPath => \|static_path\| {
1808	try zig_args.append("--object");	1805	try zig_args.append("--object");
...	@@ -1850,12 +1847,12 @@ pub const LibExeObjStep = struct {	...	@@ -1850,12 +1847,12 @@ pub const LibExeObjStep = struct {
1850	}	1847	}
1851	}	1848	}
1852		1849
1853	if (self.build_options_contents.len() > 0) {	1850	if (self.build_options_contents.len > 0) {
1854	const build_options_file = try fs.path.join(	1851	const build_options_file = try fs.path.join(
1855	builder.allocator,	1852	builder.allocator,
1856	&[_][]const u8{ builder.cache_root, builder.fmt("{}_build_options.zig", .{self.name}) },	1853	&[_][]const u8{ builder.cache_root, builder.fmt("{}_build_options.zig", .{self.name}) },
1857	);	1854	);
1858	try std.io.writeFile(build_options_file, self.build_options_contents.toSliceConst());	1855	try fs.cwd().writeFile(build_options_file, self.build_options_contents.span());
1859	try zig_args.append("--pkg-begin");	1856	try zig_args.append("--pkg-begin");
1860	try zig_args.append("build_options");	1857	try zig_args.append("build_options");
1861	try zig_args.append(builder.pathFromRoot(build_options_file));	1858	try zig_args.append(builder.pathFromRoot(build_options_file));
...	@@ -1963,22 +1960,22 @@ pub const LibExeObjStep = struct {	...	@@ -1963,22 +1960,22 @@ pub const LibExeObjStep = struct {
1963	try zig_args.append(cross.cpu.model.name);	1960	try zig_args.append(cross.cpu.model.name);
1964	}	1961	}
1965	} else {	1962	} else {
1966	var mcpu_buffer = try std.Buffer.init(builder.allocator, "-mcpu=");	1963	var mcpu_buffer = std.ArrayList(u8).init(builder.allocator);
1967	try mcpu_buffer.append(cross.cpu.model.name);	1964
		1965	try mcpu_buffer.outStream().print("-mcpu={}", .{cross.cpu.model.name});
1968		1966
1969	for (all_features) \|feature, i_usize\| {	1967	for (all_features) \|feature, i_usize\| {
1970	const i = @intCast(std.Target.Cpu.Feature.Set.Index, i_usize);	1968	const i = @intCast(std.Target.Cpu.Feature.Set.Index, i_usize);
1971	const in_cpu_set = populated_cpu_features.isEnabled(i);	1969	const in_cpu_set = populated_cpu_features.isEnabled(i);
1972	const in_actual_set = cross.cpu.features.isEnabled(i);	1970	const in_actual_set = cross.cpu.features.isEnabled(i);
1973	if (in_cpu_set and !in_actual_set) {	1971	if (in_cpu_set and !in_actual_set) {
1974	try mcpu_buffer.appendByte('-');	1972	try mcpu_buffer.outStream().print("-{}", .{feature.name});
1975	try mcpu_buffer.append(feature.name);
1976	} else if (!in_cpu_set and in_actual_set) {	1973	} else if (!in_cpu_set and in_actual_set) {
1977	try mcpu_buffer.appendByte('+');	1974	try mcpu_buffer.outStream().print("+{}", .{feature.name});
1978	try mcpu_buffer.append(feature.name);
1979	}	1975	}
1980	}	1976	}
1981	try zig_args.append(mcpu_buffer.toSliceConst());	1977
		1978	try zig_args.append(mcpu_buffer.toOwnedSlice());
1982	}	1979	}
1983		1980
1984	if (self.target.dynamic_linker.get()) \|dynamic_linker\| {	1981	if (self.target.dynamic_linker.get()) \|dynamic_linker\| {
...	@@ -2040,7 +2037,7 @@ pub const LibExeObjStep = struct {	...	@@ -2040,7 +2037,7 @@ pub const LibExeObjStep = struct {
2040	try zig_args.append("--test-cmd-bin");	2037	try zig_args.append("--test-cmd-bin");
2041	},	2038	},
2042	}	2039	}
2043	for (self.packages.toSliceConst()) \|pkg\| {	2040	for (self.packages.span()) \|pkg\| {
2044	try zig_args.append("--pkg-begin");	2041	try zig_args.append("--pkg-begin");
2045	try zig_args.append(pkg.name);	2042	try zig_args.append(pkg.name);
2046	try zig_args.append(builder.pathFromRoot(pkg.path));	2043	try zig_args.append(builder.pathFromRoot(pkg.path));
...	@@ -2057,7 +2054,7 @@ pub const LibExeObjStep = struct {	...	@@ -2057,7 +2054,7 @@ pub const LibExeObjStep = struct {
2057	try zig_args.append("--pkg-end");	2054	try zig_args.append("--pkg-end");
2058	}	2055	}
2059		2056
2060	for (self.include_dirs.toSliceConst()) \|include_dir\| {	2057	for (self.include_dirs.span()) \|include_dir\| {
2061	switch (include_dir) {	2058	switch (include_dir) {
2062	.RawPath => \|include_path\| {	2059	.RawPath => \|include_path\| {
2063	try zig_args.append("-I");	2060	try zig_args.append("-I");
...	@@ -2075,18 +2072,18 @@ pub const LibExeObjStep = struct {	...	@@ -2075,18 +2072,18 @@ pub const LibExeObjStep = struct {
2075	}	2072	}
2076	}	2073	}
2077		2074
2078	for (self.lib_paths.toSliceConst()) \|lib_path\| {	2075	for (self.lib_paths.span()) \|lib_path\| {
2079	try zig_args.append("-L");	2076	try zig_args.append("-L");
2080	try zig_args.append(lib_path);	2077	try zig_args.append(lib_path);
2081	}	2078	}
2082		2079
2083	for (self.c_macros.toSliceConst()) \|c_macro\| {	2080	for (self.c_macros.span()) \|c_macro\| {
2084	try zig_args.append("-D");	2081	try zig_args.append("-D");
2085	try zig_args.append(c_macro);	2082	try zig_args.append(c_macro);
2086	}	2083	}
2087		2084
2088	if (self.target.isDarwin()) {	2085	if (self.target.isDarwin()) {
2089	for (self.framework_dirs.toSliceConst()) \|dir\| {	2086	for (self.framework_dirs.span()) \|dir\| {
2090	try zig_args.append("-F");	2087	try zig_args.append("-F");
2091	try zig_args.append(dir);	2088	try zig_args.append(dir);
2092	}	2089	}
...	@@ -2146,12 +2143,12 @@ pub const LibExeObjStep = struct {	...	@@ -2146,12 +2143,12 @@ pub const LibExeObjStep = struct {
2146	}	2143	}
2147		2144
2148	if (self.kind == Kind.Test) {	2145	if (self.kind == Kind.Test) {
2149	try builder.spawnChild(zig_args.toSliceConst());	2146	try builder.spawnChild(zig_args.span());
2150	} else {	2147	} else {
2151	try zig_args.append("--cache");	2148	try zig_args.append("--cache");
2152	try zig_args.append("on");	2149	try zig_args.append("on");
2153		2150
2154	const output_dir_nl = try builder.execFromStep(zig_args.toSliceConst(), &self.step);	2151	const output_dir_nl = try builder.execFromStep(zig_args.span(), &self.step);
2155	const build_output_dir = mem.trimRight(u8, output_dir_nl, "\r\n");	2152	const build_output_dir = mem.trimRight(u8, output_dir_nl, "\r\n");
2156		2153
2157	if (self.output_dir) \|output_dir\| {	2154	if (self.output_dir) \|output_dir\| {

lib/std/build/emit_raw.zig+6-6

lib/std/build/run.zig+3-3

...	@@ -139,7 +139,7 @@ pub const RunStep = struct {	...	@@ -139,7 +139,7 @@ pub const RunStep = struct {
139	const cwd = if (self.cwd) \|cwd\| self.builder.pathFromRoot(cwd) else self.builder.build_root;	139	const cwd = if (self.cwd) \|cwd\| self.builder.pathFromRoot(cwd) else self.builder.build_root;
140		140
141	var argv_list = ArrayList([]const u8).init(self.builder.allocator);	141	var argv_list = ArrayList([]const u8).init(self.builder.allocator);
142	for (self.argv.toSlice()) \|arg\| {	142	for (self.argv.span()) \|arg\| {
143	switch (arg) {	143	switch (arg) {
144	Arg.Bytes => \|bytes\| try argv_list.append(bytes),	144	Arg.Bytes => \|bytes\| try argv_list.append(bytes),
145	Arg.Artifact => \|artifact\| {	145	Arg.Artifact => \|artifact\| {
...	@@ -153,7 +153,7 @@ pub const RunStep = struct {	...	@@ -153,7 +153,7 @@ pub const RunStep = struct {
153	}	153	}
154	}	154	}
155		155
156	const argv = argv_list.toSliceConst();	156	const argv = argv_list.span();
157		157
158	const child = std.ChildProcess.init(argv, self.builder.allocator) catch unreachable;	158	const child = std.ChildProcess.init(argv, self.builder.allocator) catch unreachable;
159	defer child.deinit();	159	defer child.deinit();
...	@@ -289,7 +289,7 @@ pub const RunStep = struct {	...	@@ -289,7 +289,7 @@ pub const RunStep = struct {
289	}	289	}
290		290
291	fn addPathForDynLibs(self: RunStep, artifact: LibExeObjStep) void {	291	fn addPathForDynLibs(self: RunStep, artifact: LibExeObjStep) void {
292	for (artifact.link_objects.toSliceConst()) \|link_object\| {	292	for (artifact.link_objects.span()) \|link_object\| {
293	switch (link_object) {	293	switch (link_object) {
294	.OtherStep => \|other\| {	294	.OtherStep => \|other\| {
295	if (other.target.isWindows() and other.isDynamicLibrary()) {	295	if (other.target.isWindows() and other.isDynamicLibrary()) {

lib/std/build/translate_c.zig+1-1

...	@@ -71,7 +71,7 @@ pub const TranslateCStep = struct {	...	@@ -71,7 +71,7 @@ pub const TranslateCStep = struct {
71		71
72	try argv_list.append(self.source.getPath(self.builder));	72	try argv_list.append(self.source.getPath(self.builder));
73		73
74	const output_path_nl = try self.builder.execFromStep(argv_list.toSliceConst(), &self.step);	74	const output_path_nl = try self.builder.execFromStep(argv_list.span(), &self.step);
75	const output_path = mem.trimRight(u8, output_path_nl, "\r\n");	75	const output_path = mem.trimRight(u8, output_path_nl, "\r\n");
76		76
77	self.out_basename = fs.path.basename(output_path);	77	self.out_basename = fs.path.basename(output_path);

lib/std/build/write_file.zig+2-2

...	@@ -59,7 +59,7 @@ pub const WriteFileStep = struct {	...	@@ -59,7 +59,7 @@ pub const WriteFileStep = struct {
59	// new random bytes when WriteFileStep implementation is modified	59	// new random bytes when WriteFileStep implementation is modified
60	// in a non-backwards-compatible way.	60	// in a non-backwards-compatible way.
61	hash.update("eagVR1dYXoE7ARDP");	61	hash.update("eagVR1dYXoE7ARDP");
62	for (self.files.toSliceConst()) \|file\| {	62	for (self.files.span()) \|file\| {
63	hash.update(file.basename);	63	hash.update(file.basename);
64	hash.update(file.bytes);	64	hash.update(file.bytes);
65	hash.update("\|");	65	hash.update("\|");
...	@@ -80,7 +80,7 @@ pub const WriteFileStep = struct {	...	@@ -80,7 +80,7 @@ pub const WriteFileStep = struct {
80	};	80	};
81	var dir = try fs.cwd().openDir(self.output_dir, .{});	81	var dir = try fs.cwd().openDir(self.output_dir, .{});
82	defer dir.close();	82	defer dir.close();
83	for (self.files.toSliceConst()) \|file\| {	83	for (self.files.span()) \|file\| {
84	dir.writeFile(file.basename, file.bytes) catch \|err\| {	84	dir.writeFile(file.basename, file.bytes) catch \|err\| {
85	warn("unable to write {} into {}: {}\n", .{	85	warn("unable to write {} into {}: {}\n", .{
86	file.basename,	86	file.basename,

lib/std/c.zig+45-13

 @@ -73,7 +73,6 @@ pub extern "c" fn abort() noreturn;
 pub extern "c" fn exit(code: c_int) noreturn;
 pub extern "c" fn isatty(fd: fd_t) c_int;
 pub extern "c" fn close(fd: fd_t) c_int;
-pub extern "c" fn fstat(fd: fd_t, buf: *Stat) c_int;
 pub extern "c" fn fstatat(dirfd: fd_t, path: [*:0]const u8, stat_buf: *Stat, flags: u32) c_int;
 pub extern "c" fn lseek(fd: fd_t, offset: off_t, whence: c_int) off_t;
 pub extern "c" fn open(path: [*:0]const u8, oflag: c_uint, ...) c_int;
 @@ -86,7 +85,6 @@ pub extern "c" fn pread(fd: fd_t, buf: [*]u8, nbyte: usize, offset: u64) isize;
 pub extern "c" fn preadv(fd: c_int, iov: [*]const iovec, iovcnt: c_uint, offset: u64) isize;
 pub extern "c" fn writev(fd: c_int, iov: [*]const iovec_const, iovcnt: c_uint) isize;
 pub extern "c" fn pwritev(fd: c_int, iov: [*]const iovec_const, iovcnt: c_uint, offset: u64) isize;
-pub extern "c" fn stat(noalias path: [*:0]const u8, noalias buf: *Stat) c_int;
 pub extern "c" fn write(fd: fd_t, buf: [*]const u8, nbyte: usize) isize;
 pub extern "c" fn pwrite(fd: fd_t, buf: [*]const u8, nbyte: usize, offset: u64) isize;
 pub extern "c" fn mmap(addr: ?*align(page_size) c_void, len: usize, prot: c_uint, flags: c_uint, fd: fd_t, offset: u64) *c_void;
 @@ -114,15 +112,10 @@ pub extern "c" fn dup2(old_fd: fd_t, new_fd: fd_t) c_int;
 pub extern "c" fn readlink(noalias path: [*:0]const u8, noalias buf: [*]u8, bufsize: usize) isize;
 pub extern "c" fn readlinkat(dirfd: fd_t, noalias path: [*:0]const u8, noalias buf: [*]u8, bufsize: usize) isize;
 pub extern "c" fn realpath(noalias file_name: [*:0]const u8, noalias resolved_name: [*]u8) ?[*:0]u8;
-pub extern "c" fn sigprocmask(how: c_int, noalias set: ?*const sigset_t, noalias oset: ?*sigset_t) c_int;
-pub extern "c" fn gettimeofday(noalias tv: ?*timeval, noalias tz: ?*timezone) c_int;
-pub extern "c" fn sigaction(sig: c_int, noalias act: *const Sigaction, noalias oact: ?*Sigaction) c_int;
-pub extern "c" fn nanosleep(rqtp: *const timespec, rmtp: ?*timespec) c_int;
 pub extern "c" fn setreuid(ruid: c_uint, euid: c_uint) c_int;
 pub extern "c" fn setregid(rgid: c_uint, egid: c_uint) c_int;
 pub extern "c" fn rmdir(path: [*:0]const u8) c_int;
 pub extern "c" fn getenv(name: [*:0]const u8) ?[*:0]u8;
-pub extern "c" fn getrusage(who: c_int, usage: *rusage) c_int;
 pub extern "c" fn sysctl(name: [*]const c_int, namelen: c_uint, oldp: ?*c_void, oldlenp: ?*usize, newp: ?*c_void, newlen: usize) c_int;
 pub extern "c" fn sysctlbyname(name: [*:0]const u8, oldp: ?*c_void, oldlenp: ?*usize, newp: ?*c_void, newlen: usize) c_int;
 pub extern "c" fn sysctlnametomib(name: [*:0]const u8, mibp: ?*c_int, sizep: ?*usize) c_int;
 @@ -133,7 +126,6 @@ pub extern "c" fn uname(buf: *utsname) c_int;
 pub extern "c" fn gethostname(name: [*]u8, len: usize) c_int;
 pub extern "c" fn bind(socket: fd_t, address: ?*const sockaddr, address_len: socklen_t) c_int;
-pub extern "c" fn socket(domain: c_uint, sock_type: c_uint, protocol: c_uint) c_int;
 pub extern "c" fn socketpair(domain: c_uint, sock_type: c_uint, protocol: c_uint, sv: *[2]fd_t) c_int;
 pub extern "c" fn listen(sockfd: fd_t, backlog: c_uint) c_int;
 pub extern "c" fn getsockname(sockfd: fd_t, noalias addr: *sockaddr, noalias addrlen: *socklen_t) c_int;
 @@ -161,12 +153,55 @@ pub extern fn recvfrom(
     noalias addrlen: ?*socklen_t,
 ) isize;
+pub usingnamespace switch (builtin.os.tag) {
+    .netbsd => struct {
+        pub const clock_getres = __clock_getres50;
+        pub const clock_gettime = __clock_gettime50;
+        pub const fstat = __fstat50;
+        pub const getdents = __getdents30;
+        pub const getrusage = __getrusage50;
+        pub const gettimeofday = __gettimeofday50;
+        pub const nanosleep = __nanosleep50;
+        pub const sched_yield = __libc_thr_yield;
+        pub const sigaction = __sigaction14;
+        pub const sigaltstack = __sigaltstack14;
+        pub const sigprocmask = __sigprocmask14;
+        pub const stat = __stat50;
+    },
+    .macosx, .ios, .watchos, .tvos => struct {
+        // XXX: close -> close$NOCANCEL
+        // XXX: getdirentries -> _getdirentries64
+        pub extern "c" fn clock_getres(clk_id: c_int, tp: *timespec) c_int;
+        pub extern "c" fn clock_gettime(clk_id: c_int, tp: *timespec) c_int;
+        pub const fstat = @"fstat$INODE64";
+        pub extern "c" fn getrusage(who: c_int, usage: *rusage) c_int;
+        pub extern "c" fn gettimeofday(noalias tv: ?*timeval, noalias tz: ?*timezone) c_int;
+        pub extern "c" fn nanosleep(rqtp: *const timespec, rmtp: ?*timespec) c_int;
+        pub extern "c" fn sched_yield() c_int;
+        pub extern "c" fn sigaction(sig: c_int, noalias act: *const Sigaction, noalias oact: ?*Sigaction) c_int;
+        pub extern "c" fn sigprocmask(how: c_int, noalias set: ?*const sigset_t, noalias oset: ?*sigset_t) c_int;
+        pub extern "c" fn socket(domain: c_uint, sock_type: c_uint, protocol: c_uint) c_int;
+        pub extern "c" fn stat(noalias path: [*:0]const u8, noalias buf: *Stat) c_int;
+    },
+    else => struct {
+        pub extern "c" fn clock_getres(clk_id: c_int, tp: *timespec) c_int;
+        pub extern "c" fn clock_gettime(clk_id: c_int, tp: *timespec) c_int;
+        pub extern "c" fn fstat(fd: fd_t, buf: *Stat) c_int;
+        pub extern "c" fn getrusage(who: c_int, usage: *rusage) c_int;
+        pub extern "c" fn gettimeofday(noalias tv: ?*timeval, noalias tz: ?*timezone) c_int;
+        pub extern "c" fn nanosleep(rqtp: *const timespec, rmtp: ?*timespec) c_int;
+        pub extern "c" fn sched_yield() c_int;
+        pub extern "c" fn sigaction(sig: c_int, noalias act: *const Sigaction, noalias oact: ?*Sigaction) c_int;
+        pub extern "c" fn sigprocmask(how: c_int, noalias set: ?*const sigset_t, noalias oset: ?*sigset_t) c_int;
+        pub extern "c" fn socket(domain: c_uint, sock_type: c_uint, protocol: c_uint) c_int;
+        pub extern "c" fn stat(noalias path: [*:0]const u8, noalias buf: *Stat) c_int;
+    },
+};
 pub extern "c" fn kill(pid: pid_t, sig: c_int) c_int;
 pub extern "c" fn getdirentries(fd: fd_t, buf_ptr: [*]u8, nbytes: usize, basep: *i64) isize;
 pub extern "c" fn setgid(ruid: c_uint, euid: c_uint) c_int;
 pub extern "c" fn setuid(uid: c_uint) c_int;
-pub extern "c" fn clock_gettime(clk_id: c_int, tp: *timespec) c_int;
-pub extern "c" fn clock_getres(clk_id: c_int, tp: *timespec) c_int;
 pub extern "c" fn aligned_alloc(alignment: usize, size: usize) ?*c_void;
 pub extern "c" fn malloc(usize) ?*c_void;
 @@ -174,7 +209,6 @@ pub extern "c" fn realloc(?*c_void, usize) ?*c_void;
 pub extern "c" fn free(*c_void) void;
 pub extern "c" fn posix_memalign(memptr: **c_void, alignment: usize, size: usize) c_int;
-// Deprecated
 pub extern "c" fn futimes(fd: fd_t, times: *[2]timeval) c_int;
 pub extern "c" fn utimes(path: [*:0]const u8, times: *[2]timeval) c_int;
 @@ -230,8 +264,6 @@ pub extern "c" fn dn_expand(
     length: c_int,
 ) c_int;
-pub extern "c" fn sched_yield() c_int;
 pub const PTHREAD_MUTEX_INITIALIZER = pthread_mutex_t{};
 pub extern "c" fn pthread_mutex_lock(mutex: *pthread_mutex_t) c_int;
 pub extern "c" fn pthread_mutex_unlock(mutex: *pthread_mutex_t) c_int;

lib/std/c/netbsd.zig+33-11

...	@@ -10,36 +10,58 @@ pub const dl_iterate_phdr_callback = extern fn (info: *dl_phdr_info, size: usize	...	@@ -10,36 +10,58 @@ pub const dl_iterate_phdr_callback = extern fn (info: *dl_phdr_info, size: usize
10	pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int;	10	pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int;
11		11
12	pub extern "c" fn __fstat50(fd: fd_t, buf: *Stat) c_int;	12	pub extern "c" fn __fstat50(fd: fd_t, buf: *Stat) c_int;
		13	pub extern "c" fn __stat50(path: [:0]const u8, buf: Stat) c_int;
13	pub extern "c" fn __clock_gettime50(clk_id: c_int, tp: *timespec) c_int;	14	pub extern "c" fn __clock_gettime50(clk_id: c_int, tp: *timespec) c_int;
14	pub extern "c" fn __clock_getres50(clk_id: c_int, tp: *timespec) c_int;	15	pub extern "c" fn __clock_getres50(clk_id: c_int, tp: *timespec) c_int;
15	pub extern "c" fn __getdents30(fd: c_int, buf_ptr: [*]u8, nbytes: usize) c_int;	16	pub extern "c" fn __getdents30(fd: c_int, buf_ptr: [*]u8, nbytes: usize) c_int;
16	pub extern "c" fn __sigaltstack14(ss: ?stack_t, old_ss: ?stack_t) c_int;	17	pub extern "c" fn __sigaltstack14(ss: ?stack_t, old_ss: ?stack_t) c_int;
		18	pub extern "c" fn __nanosleep50(rqtp: const timespec, rmtp: ?timespec) c_int;
		19	pub extern "c" fn __sigaction14(sig: c_int, noalias act: const Sigaction, noalias oact: ?Sigaction) c_int;
		20	pub extern "c" fn __sigprocmask14(how: c_int, noalias set: ?const sigset_t, noalias oset: ?sigset_t) c_int;
		21	pub extern "c" fn __socket30(domain: c_uint, sock_type: c_uint, protocol: c_uint) c_int;
		22	pub extern "c" fn __gettimeofday50(noalias tv: ?timeval, noalias tz: ?timezone) c_int;
		23	pub extern "c" fn __getrusage50(who: c_int, usage: *rusage) c_int;
		24	// libc aliases this as sched_yield
		25	pub extern "c" fn __libc_thr_yield() c_int;
17		26
18	pub const pthread_mutex_t = extern struct {	27	pub const pthread_mutex_t = extern struct {
19	ptm_magic: c_uint = 0x33330003,	28	ptm_magic: u32 = 0x33330003,
20	ptm_errorcheck: padded_spin_t = 0,	29	ptm_errorcheck: padded_pthread_spin_t = 0,
21	ptm_unused: padded_spin_t = 0,	30	ptm_ceiling: padded_pthread_spin_t = 0,
22	ptm_owner: usize = 0,	31	ptm_owner: usize = 0,
23	ptm_waiters: ?*u8 = null,	32	ptm_waiters: ?*u8 = null,
24	ptm_recursed: c_uint = 0,	33	ptm_recursed: u32 = 0,
25	ptm_spare2: ?*c_void = null,	34	ptm_spare2: ?*c_void = null,
26	};	35	};
		36
27	pub const pthread_cond_t = extern struct {	37	pub const pthread_cond_t = extern struct {
28	ptc_magic: c_uint = 0x55550005,	38	ptc_magic: u32 = 0x55550005,
29	ptc_lock: pthread_spin_t = 0,	39	ptc_lock: pthread_spin_t = 0,
30	ptc_waiters_first: ?*u8 = null,	40	ptc_waiters_first: ?*u8 = null,
31	ptc_waiters_last: ?*u8 = null,	41	ptc_waiters_last: ?*u8 = null,
32	ptc_mutex: ?*pthread_mutex_t = null,	42	ptc_mutex: ?*pthread_mutex_t = null,
33	ptc_private: ?*c_void = null,	43	ptc_private: ?*c_void = null,
34	};	44	};
35	const pthread_spin_t = if (builtin.arch == .arm or .arch == .powerpc) c_int else u8;	45
36	const padded_spin_t = switch (builtin.arch) {	46	const pthread_spin_t = switch (builtin.arch) {
37	.sparc, .sparcel, .sparcv9, .i386, .x86_64, .le64 => u32,	47	.aarch64, .aarch64_be, .aarch64_32 => u8,
38	else => spin_t,	48	.mips, .mipsel, .mips64, .mips64el => u32,
		49	.powerpc, .powerpc64, .powerpc64le => i32,
		50	.i386, .x86_64 => u8,
		51	.arm, .armeb, .thumb, .thumbeb => i32,
		52	.sparc, .sparcel, .sparcv9 => u8,
		53	.riscv32, .riscv64 => u32,
		54	else => @compileError("undefined pthread_spin_t for this arch"),
		55	};
		56
		57	const padded_pthread_spin_t = switch (builtin.arch) {
		58	.i386, .x86_64 => u32,
		59	.sparc, .sparcel, .sparcv9 => u32,
		60	else => pthread_spin_t,
39	};	61	};
40		62
41	pub const pthread_attr_t = extern struct {	63	pub const pthread_attr_t = extern struct {
42	pta_magic: u32,	64	pta_magic: u32,
43	pta_flags: c_int,	65	pta_flags: i32,
44	pta_private: *c_void,	66	pta_private: ?*c_void,
45	};	67	};

lib/std/child_process.zig+13-33

...	@@ -10,7 +10,7 @@ const windows = os.windows;	...	@@ -10,7 +10,7 @@ const windows = os.windows;
10	const mem = std.mem;	10	const mem = std.mem;
11	const debug = std.debug;	11	const debug = std.debug;
12	const BufMap = std.BufMap;	12	const BufMap = std.BufMap;
13	const Buffer = std.Buffer;	13	const ArrayListSentineled = std.ArrayListSentineled;
14	const builtin = @import("builtin");	14	const builtin = @import("builtin");
15	const Os = builtin.Os;	15	const Os = builtin.Os;
16	const TailQueue = std.TailQueue;	16	const TailQueue = std.TailQueue;
...	@@ -175,29 +175,11 @@ pub const ChildProcess = struct {	...	@@ -175,29 +175,11 @@ pub const ChildProcess = struct {
175	stderr: []u8,	175	stderr: []u8,
176	};	176	};
177		177
178	/// Spawns a child process, waits for it, collecting stdout and stderr, and then returns.	178	pub const exec2 = @compileError("deprecated: exec2 is renamed to exec");
179	/// If it succeeds, the caller owns result.stdout and result.stderr memory.
180	/// TODO deprecate in favor of exec2
181	pub fn exec(
182	allocator: *mem.Allocator,
183	argv: []const []const u8,
184	cwd: ?[]const u8,
185	env_map: ?*const BufMap,
186	max_output_bytes: usize,
187	) !ExecResult {
188	return exec2(.{
189	.allocator = allocator,
190	.argv = argv,
191	.cwd = cwd,
192	.env_map = env_map,
193	.max_output_bytes = max_output_bytes,
194	});
195	}
196		179
197	/// Spawns a child process, waits for it, collecting stdout and stderr, and then returns.	180	/// Spawns a child process, waits for it, collecting stdout and stderr, and then returns.
198	/// If it succeeds, the caller owns result.stdout and result.stderr memory.	181	/// If it succeeds, the caller owns result.stdout and result.stderr memory.
199	/// TODO rename to exec	182	pub fn exec(args: struct {
200	pub fn exec2(args: struct {
201	allocator: *mem.Allocator,	183	allocator: *mem.Allocator,
202	argv: []const []const u8,	184	argv: []const []const u8,
203	cwd: ?[]const u8 = null,	185	cwd: ?[]const u8 = null,
...	@@ -370,7 +352,7 @@ pub const ChildProcess = struct {	...	@@ -370,7 +352,7 @@ pub const ChildProcess = struct {
370		352
371	const any_ignore = (self.stdin_behavior == StdIo.Ignore or self.stdout_behavior == StdIo.Ignore or self.stderr_behavior == StdIo.Ignore);	353	const any_ignore = (self.stdin_behavior == StdIo.Ignore or self.stdout_behavior == StdIo.Ignore or self.stderr_behavior == StdIo.Ignore);
372	const dev_null_fd = if (any_ignore)	354	const dev_null_fd = if (any_ignore)
373	os.openC("/dev/null", os.O_RDWR, 0) catch \|err\| switch (err) {	355	os.openZ("/dev/null", os.O_RDWR, 0) catch \|err\| switch (err) {
374	error.PathAlreadyExists => unreachable,	356	error.PathAlreadyExists => unreachable,
375	error.NoSpaceLeft => unreachable,	357	error.NoSpaceLeft => unreachable,
376	error.FileTooBig => unreachable,	358	error.FileTooBig => unreachable,
...	@@ -775,38 +757,36 @@ fn windowsCreateProcess(app_name: [:0]u16, cmd_line: [:0]u16, envp_ptr: ?[*]u1	...	@@ -775,38 +757,36 @@ fn windowsCreateProcess(app_name: [:0]u16, cmd_line: [:0]u16, envp_ptr: ?[*]u1
775	}	757	}
776		758
777	/// Caller must dealloc.	759	/// Caller must dealloc.
778	/// Guarantees a null byte at result[result.len].	760	fn windowsCreateCommandLine(allocator: *mem.Allocator, argv: []const []const u8) ![:0]u8 {
779	fn windowsCreateCommandLine(allocator: *mem.Allocator, argv: []const []const u8) ![]u8 {	761	var buf = try ArrayListSentineled(u8, 0).initSize(allocator, 0);
780	var buf = try Buffer.initSize(allocator, 0);
781	defer buf.deinit();	762	defer buf.deinit();
782		763	const buf_stream = buf.outStream();
783	var buf_stream = buf.outStream();
784		764
785	for (argv) \|arg, arg_i\| {	765	for (argv) \|arg, arg_i\| {
786	if (arg_i != 0) try buf.appendByte(' ');	766	if (arg_i != 0) try buf_stream.writeByte(' ');
787	if (mem.indexOfAny(u8, arg, " \t\n\"") == null) {	767	if (mem.indexOfAny(u8, arg, " \t\n\"") == null) {
788	try buf.append(arg);	768	try buf_stream.writeAll(arg);
789	continue;	769	continue;
790	}	770	}
791	try buf.appendByte('"');	771	try buf_stream.writeByte('"');
792	var backslash_count: usize = 0;	772	var backslash_count: usize = 0;
793	for (arg) \|byte\| {	773	for (arg) \|byte\| {
794	switch (byte) {	774	switch (byte) {
795	'\\' => backslash_count += 1,	775	'\\' => backslash_count += 1,
796	'"' => {	776	'"' => {
797	try buf_stream.writeByteNTimes('\\', backslash_count * 2 + 1);	777	try buf_stream.writeByteNTimes('\\', backslash_count * 2 + 1);
798	try buf.appendByte('"');	778	try buf_stream.writeByte('"');
799	backslash_count = 0;	779	backslash_count = 0;
800	},	780	},
801	else => {	781	else => {
802	try buf_stream.writeByteNTimes('\\', backslash_count);	782	try buf_stream.writeByteNTimes('\\', backslash_count);
803	try buf.appendByte(byte);	783	try buf_stream.writeByte(byte);
804	backslash_count = 0;	784	backslash_count = 0;
805	},	785	},
806	}	786	}
807	}	787	}
808	try buf_stream.writeByteNTimes('\\', backslash_count * 2);	788	try buf_stream.writeByteNTimes('\\', backslash_count * 2);
809	try buf.appendByte('"');	789	try buf_stream.writeByte('"');
810	}	790	}
811		791
812	return buf.toOwnedSlice();	792	return buf.toOwnedSlice();

lib/std/coff.zig+2-2

...	@@ -145,7 +145,7 @@ pub const Coff = struct {	...	@@ -145,7 +145,7 @@ pub const Coff = struct {
145	blk: while (i < debug_dir_entry_count) : (i += 1) {	145	blk: while (i < debug_dir_entry_count) : (i += 1) {
146	const debug_dir_entry = try in.readStruct(DebugDirectoryEntry);	146	const debug_dir_entry = try in.readStruct(DebugDirectoryEntry);
147	if (debug_dir_entry.type == IMAGE_DEBUG_TYPE_CODEVIEW) {	147	if (debug_dir_entry.type == IMAGE_DEBUG_TYPE_CODEVIEW) {
148	for (self.sections.toSlice()) \|*section\| {	148	for (self.sections.span()) \|*section\| {
149	const section_start = section.header.virtual_address;	149	const section_start = section.header.virtual_address;
150	const section_size = section.header.misc.virtual_size;	150	const section_size = section.header.misc.virtual_size;
151	const rva = debug_dir_entry.address_of_raw_data;	151	const rva = debug_dir_entry.address_of_raw_data;
...	@@ -211,7 +211,7 @@ pub const Coff = struct {	...	@@ -211,7 +211,7 @@ pub const Coff = struct {
211	}	211	}
212		212
213	pub fn getSection(self: Coff, comptime name: []const u8) ?Section {	213	pub fn getSection(self: Coff, comptime name: []const u8) ?Section {
214	for (self.sections.toSlice()) \|*sec\| {	214	for (self.sections.span()) \|*sec\| {
215	if (mem.eql(u8, sec.header.name[0..name.len], name)) {	215	if (mem.eql(u8, sec.header.name[0..name.len], name)) {
216	return sec;	216	return sec;
217	}	217	}

lib/std/crypto/gimli.zig+2

 @@ -23,10 +23,12 @@ pub const State = struct {
     const Self = @This();
+    /// TODO follow the span() convention instead of having this and `toSliceConst`
     pub fn toSlice(self: *Self) []u8 {
         return mem.sliceAsBytes(self.data[0..]);
     }
+    /// TODO follow the span() convention instead of having this and `toSlice`
     pub fn toSliceConst(self: *Self) []const u8 {
         return mem.sliceAsBytes(self.data[0..]);
     }

lib/std/debug.zig+17-12

 @@ -735,7 +735,7 @@ fn openCoffDebugInfo(allocator: *mem.Allocator, coff_file_path: [:0]const u16) !
         for (present) |_| {
             const name_offset = try pdb_stream.inStream().readIntLittle(u32);
             const name_index = try pdb_stream.inStream().readIntLittle(u32);
-            const name = mem.toSlice(u8, @ptrCast([*:0]u8, name_bytes.ptr + name_offset));
+            const name = mem.spanZ(@ptrCast([*:0]u8, name_bytes.ptr + name_offset));
             if (mem.eql(u8, name, "/names")) {
                 break :str_tab_index name_index;
             }
 @@ -1131,7 +1131,7 @@ pub const DebugInfo = struct {
                     const obj_di = try self.allocator.create(ModuleDebugInfo);
                     errdefer self.allocator.destroy(obj_di);
-                    const macho_path = mem.toSliceConst(u8, std.c._dyld_get_image_name(i));
+                    const macho_path = mem.spanZ(std.c._dyld_get_image_name(i));
                     obj_di.* = openMachODebugInfo(self.allocator, macho_path) catch |err| switch (err) {
                         error.FileNotFound => return error.MissingDebugInfo,
                         else => return err,
 @@ -1254,10 +1254,7 @@ pub const DebugInfo = struct {
                     if (context.address >= seg_start and context.address < seg_end) {
                         // Android libc uses NULL instead of an empty string to mark the
                         // main program
-                        context.name = if (info.dlpi_name) |dlpi_name|
+                        context.name = mem.spanZ(info.dlpi_name) orelse "";
-                            mem.toSliceConst(u8, dlpi_name)
-                        else
-                            "";
                         context.base_address = info.dlpi_addr;
                         // Stop the iteration
                         return error.Found;
 @@ -1426,7 +1423,7 @@ pub const ModuleDebugInfo = switch (builtin.os.tag) {
                 return SymbolInfo{};
             assert(symbol.ofile.?.n_strx < self.strings.len);
-            const o_file_path = mem.toSliceConst(u8, self.strings.ptr + symbol.ofile.?.n_strx);
+            const o_file_path = mem.spanZ(self.strings.ptr + symbol.ofile.?.n_strx);
             // Check if its debug infos are already in the cache
             var o_file_di = self.ofiles.getValue(o_file_path) orelse
 @@ -1483,7 +1480,7 @@ pub const ModuleDebugInfo = switch (builtin.os.tag) {
             const mod_index = for (self.sect_contribs) |sect_contrib| {
                 if (sect_contrib.Section > self.coff.sections.len) continue;
                 // Remember that SectionContribEntry.Section is 1-based.
-                coff_section = &self.coff.sections.toSlice()[sect_contrib.Section - 1];
+                coff_section = &self.coff.sections.span()[sect_contrib.Section - 1];
                 const vaddr_start = coff_section.header.virtual_address + sect_contrib.Offset;
                 const vaddr_end = vaddr_start + sect_contrib.Size;
 @@ -1510,7 +1507,7 @@ pub const ModuleDebugInfo = switch (builtin.os.tag) {
                         const vaddr_start = coff_section.header.virtual_address + proc_sym.CodeOffset;
                         const vaddr_end = vaddr_start + proc_sym.CodeSize;
                         if (relocated_address >= vaddr_start and relocated_address < vaddr_end) {
-                            break mem.toSliceConst(u8, @ptrCast([*:0]u8, proc_sym) + @sizeOf(pdb.ProcSym));
+                            break mem.spanZ(@ptrCast([*:0]u8, proc_sym) + @sizeOf(pdb.ProcSym));
                         }
                     },
                     else => {},
 @@ -1669,7 +1666,11 @@ fn getDebugInfoAllocator() *mem.Allocator {
 }
 /// Whether or not the current target can print useful debug information when a segfault occurs.
-pub const have_segfault_handling_support = builtin.os.tag == .linux or builtin.os.tag == .windows;
+pub const have_segfault_handling_support = switch (builtin.os.tag) {
+    .linux, .netbsd => true,
+    .windows => true,
+    else => false,
+};
 pub const enable_segfault_handler: bool = if (@hasDecl(root, "enable_segfault_handler"))
     root.enable_segfault_handler
 else
 @@ -1721,13 +1722,17 @@ fn resetSegfaultHandler() void {
     os.sigaction(os.SIGBUS, &act, null);
 }
-fn handleSegfaultLinux(sig: i32, info: *const os.siginfo_t, ctx_ptr: *const c_void) callconv(.C) noreturn {
+fn handleSegfaultLinux(sig: i32, info: *const os.siginfo_t, ctx_ptr: ?*const c_void) callconv(.C) noreturn {
     // Reset to the default handler so that if a segfault happens in this handler it will crash
     // the process. Also when this handler returns, the original instruction will be repeated
     // and the resulting segfault will crash the process rather than continually dump stack traces.
     resetSegfaultHandler();
-    const addr = @ptrToInt(info.fields.sigfault.addr);
+    const addr = switch (builtin.os.tag) {
+        .linux => @ptrToInt(info.fields.sigfault.addr),
+        .netbsd => @ptrToInt(info.info.reason.fault.addr),
+        else => unreachable,
+    };
     switch (sig) {
         os.SIGSEGV => std.debug.warn("Segmentation fault at address 0x{x}\n", .{addr}),
         os.SIGILL => std.debug.warn("Illegal instruction at address 0x{x}\n", .{addr}),

lib/std/dwarf.zig+7-7

lib/std/dynamic_library.zig+13-7

 @@ -254,9 +254,11 @@ pub const ElfDynLib = struct {
         };
     }
+    pub const openC = @compileError("deprecated: renamed to openZ");
     /// Trusts the file. Malicious file will be able to execute arbitrary code.
-    pub fn openC(path_c: [*:0]const u8) !ElfDynLib {
+    pub fn openZ(path_c: [*:0]const u8) !ElfDynLib {
-        return open(mem.toSlice(u8, path_c));
+        return open(mem.spanZ(path_c));
     }
     /// Trusts the file
 @@ -285,7 +287,7 @@ pub const ElfDynLib = struct {
             if (0 == (@as(u32, 1) << @intCast(u5, self.syms[i].st_info & 0xf) & OK_TYPES)) continue;
             if (0 == (@as(u32, 1) << @intCast(u5, self.syms[i].st_info >> 4) & OK_BINDS)) continue;
             if (0 == self.syms[i].st_shndx) continue;
-            if (!mem.eql(u8, name, mem.toSliceConst(u8, self.strings + self.syms[i].st_name))) continue;
+            if (!mem.eql(u8, name, mem.spanZ(self.strings + self.syms[i].st_name))) continue;
             if (maybe_versym) |versym| {
                 if (!checkver(self.verdef.?, versym[i], vername, self.strings))
                     continue;
 @@ -316,7 +318,7 @@ fn checkver(def_arg: *elf.Verdef, vsym_arg: i32, vername: []const u8, strings: [
         def = @intToPtr(*elf.Verdef, @ptrToInt(def) + def.vd_next);
     }
     const aux = @intToPtr(*elf.Verdaux, @ptrToInt(def) + def.vd_aux);
-    return mem.eql(u8, vername, mem.toSliceConst(u8, strings + aux.vda_name));
+    return mem.eql(u8, vername, mem.spanZ(strings + aux.vda_name));
 }
 pub const WindowsDynLib = struct {
 @@ -329,7 +331,9 @@ pub const WindowsDynLib = struct {
         return openW(&path_w);
     }
-    pub fn openC(path_c: [*:0]const u8) !WindowsDynLib {
+    pub const openC = @compileError("deprecated: renamed to openZ");
+    pub fn openZ(path_c: [*:0]const u8) !WindowsDynLib {
         const path_w = try windows.cStrToPrefixedFileW(path_c);
         return openW(&path_w);
     }
 @@ -362,10 +366,12 @@ pub const DlDynlib = struct {
     pub fn open(path: []const u8) !DlDynlib {
         const path_c = try os.toPosixPath(path);
-        return openC(&path_c);
+        return openZ(&path_c);
     }
-    pub fn openC(path_c: [*:0]const u8) !DlDynlib {
+    pub const openC = @compileError("deprecated: renamed to openZ");
+    pub fn openZ(path_c: [*:0]const u8) !DlDynlib {
         return DlDynlib{
             .handle = system.dlopen(path_c, system.RTLD_LAZY) orelse {
                 return error.FileNotFound;

lib/std/event/loop.zig+2-2

...	@@ -1096,10 +1096,10 @@ pub const Loop = struct {	...	@@ -1096,10 +1096,10 @@ pub const Loop = struct {
1096	msg.result = noasync os.preadv(msg.fd, msg.iov, msg.offset);	1096	msg.result = noasync os.preadv(msg.fd, msg.iov, msg.offset);
1097	},	1097	},
1098	.open => \|*msg\| {	1098	.open => \|*msg\| {
1099	msg.result = noasync os.openC(msg.path, msg.flags, msg.mode);	1099	msg.result = noasync os.openZ(msg.path, msg.flags, msg.mode);
1100	},	1100	},
1101	.openat => \|*msg\| {	1101	.openat => \|*msg\| {
1102	msg.result = noasync os.openatC(msg.fd, msg.path, msg.flags, msg.mode);	1102	msg.result = noasync os.openatZ(msg.fd, msg.path, msg.flags, msg.mode);
1103	},	1103	},
1104	.faccessat => \|*msg\| {	1104	.faccessat => \|*msg\| {
1105	msg.result = noasync os.faccessatZ(msg.dirfd, msg.path, msg.mode, msg.flags);	1105	msg.result = noasync os.faccessatZ(msg.dirfd, msg.path, msg.mode, msg.flags);

lib/std/fifo.zig+50-25

...	@@ -160,7 +160,7 @@ pub fn LinearFifo(	...	@@ -160,7 +160,7 @@ pub fn LinearFifo(
160	return self.readableSliceMut(offset);	160	return self.readableSliceMut(offset);
161	}	161	}
162		162
163	/// Discard first `count` bytes of readable data	163	/// Discard first `count` items in the fifo
164	pub fn discard(self: *Self, count: usize) void {	164	pub fn discard(self: *Self, count: usize) void {
165	assert(count <= self.count);	165	assert(count <= self.count);
166	{ // set old range to undefined. Note: may be wrapped around	166	{ // set old range to undefined. Note: may be wrapped around
...	@@ -199,7 +199,7 @@ pub fn LinearFifo(	...	@@ -199,7 +199,7 @@ pub fn LinearFifo(
199	return c;	199	return c;
200	}	200	}
201		201
202	/// Read data from the fifo into `dst`, returns number of bytes copied.	202	/// Read data from the fifo into `dst`, returns number of items copied.
203	pub fn read(self: *Self, dst: []T) usize {	203	pub fn read(self: *Self, dst: []T) usize {
204	var dst_left = dst;	204	var dst_left = dst;
205		205
...	@@ -215,7 +215,17 @@ pub fn LinearFifo(	...	@@ -215,7 +215,17 @@ pub fn LinearFifo(
215	return dst.len - dst_left.len;	215	return dst.len - dst_left.len;
216	}	216	}
217		217
218	/// Returns number of bytes available in fifo	218	/// Same as `read` except it returns an error union
		219	/// The purpose of this function existing is to match `std.io.InStream` API.
		220	fn readFn(self: *Self, dest: []u8) error{}!usize {
		221	return self.read(dest);
		222	}
		223
		224	pub fn inStream(self: Self) std.io.InStream(Self, error{}, readFn) {
		225	return .{ .context = self };
		226	}
		227
		228	/// Returns number of items available in fifo
219	pub fn writableLength(self: Self) usize {	229	pub fn writableLength(self: Self) usize {
220	return self.buf.len - self.count;	230	return self.buf.len - self.count;
221	}	231	}
...	@@ -233,9 +243,9 @@ pub fn LinearFifo(	...	@@ -233,9 +243,9 @@ pub fn LinearFifo(
233	}	243	}
234	}	244	}
235		245
236	/// Returns a writable buffer of at least `size` bytes, allocating memory as needed.	246	/// Returns a writable buffer of at least `size` items, allocating memory as needed.
237	/// Use `fifo.update` once you've written data to it.	247	/// Use `fifo.update` once you've written data to it.
238	pub fn writeableWithSize(self: *Self, size: usize) ![]T {	248	pub fn writableWithSize(self: *Self, size: usize) ![]T {
239	try self.ensureUnusedCapacity(size);	249	try self.ensureUnusedCapacity(size);
240		250
241	// try to avoid realigning buffer	251	// try to avoid realigning buffer
...	@@ -247,7 +257,7 @@ pub fn LinearFifo(	...	@@ -247,7 +257,7 @@ pub fn LinearFifo(
247	return slice;	257	return slice;
248	}	258	}
249		259
250	/// Update the tail location of the buffer (usually follows use of writable/writeableWithSize)	260	/// Update the tail location of the buffer (usually follows use of writable/writableWithSize)
251	pub fn update(self: *Self, count: usize) void {	261	pub fn update(self: *Self, count: usize) void {
252	assert(self.count + count <= self.buf.len);	262	assert(self.count + count <= self.buf.len);
253	self.count += count;	263	self.count += count;
...	@@ -279,7 +289,7 @@ pub fn LinearFifo(	...	@@ -279,7 +289,7 @@ pub fn LinearFifo(
279	} else {	289	} else {
280	tail %= self.buf.len;	290	tail %= self.buf.len;
281	}	291	}
282	self.buf[tail] = byte;	292	self.buf[tail] = item;
283	self.update(1);	293	self.update(1);
284	}	294	}
285		295
...	@@ -291,24 +301,16 @@ pub fn LinearFifo(	...	@@ -291,24 +301,16 @@ pub fn LinearFifo(
291	return self.writeAssumeCapacity(src);	301	return self.writeAssumeCapacity(src);
292	}	302	}
293		303
294	pub usingnamespace if (T == u8)	304	/// Same as `write` except it returns the number of bytes written, which is always the same
295	struct {	305	/// as `bytes.len`. The purpose of this function existing is to match `std.io.OutStream` API.
296	const OutStream = std.io.OutStream(*Self, Error, appendWrite);	306	fn appendWrite(self: *Self, bytes: []const u8) error{OutOfMemory}!usize {
297	const Error = error{OutOfMemory};	307	try self.write(bytes);
298		308	return bytes.len;
299	/// Same as `write` except it returns the number of bytes written, which is always the same	309	}
300	/// as `bytes.len`. The purpose of this function existing is to match `std.io.OutStream` API.
301	pub fn appendWrite(fifo: *Self, bytes: []const u8) Error!usize {
302	try fifo.write(bytes);
303	return bytes.len;
304	}
305		310
306	pub fn outStream(self: *Self) OutStream {	311	pub fn outStream(self: Self) std.io.OutStream(Self, error{OutOfMemory}, appendWrite) {
307	return .{ .context = self };	312	return .{ .context = self };
308	}	313	}
309	}
310	else
311	struct {};
312		314
313	/// Make `count` items available before the current read location	315	/// Make `count` items available before the current read location
314	fn rewind(self: *Self, count: usize) void {	316	fn rewind(self: *Self, count: usize) void {
...	@@ -395,7 +397,7 @@ test "LinearFifo(u8, .Dynamic)" {	...	@@ -395,7 +397,7 @@ test "LinearFifo(u8, .Dynamic)" {
395	}	397	}
396		398
397	{	399	{
398	const buf = try fifo.writeableWithSize(12);	400	const buf = try fifo.writableWithSize(12);
399	testing.expectEqual(@as(usize, 12), buf.len);	401	testing.expectEqual(@as(usize, 12), buf.len);
400	var i: u8 = 0;	402	var i: u8 = 0;
401	while (i < 10) : (i += 1) {	403	while (i < 10) : (i += 1) {
...	@@ -422,6 +424,15 @@ test "LinearFifo(u8, .Dynamic)" {	...	@@ -422,6 +424,15 @@ test "LinearFifo(u8, .Dynamic)" {
422	testing.expectEqualSlices(u8, "Hello, World!", result[0..fifo.read(&result)]);	424	testing.expectEqualSlices(u8, "Hello, World!", result[0..fifo.read(&result)]);
423	testing.expectEqual(@as(usize, 0), fifo.readableLength());	425	testing.expectEqual(@as(usize, 0), fifo.readableLength());
424	}	426	}
		427
		428	{
		429	try fifo.outStream().writeAll("This is a test");
		430	var result: [30]u8 = undefined;
		431	testing.expectEqualSlices(u8, "This", (try fifo.inStream().readUntilDelimiterOrEof(&result, ' ')).?);
		432	testing.expectEqualSlices(u8, "is", (try fifo.inStream().readUntilDelimiterOrEof(&result, ' ')).?);
		433	testing.expectEqualSlices(u8, "a", (try fifo.inStream().readUntilDelimiterOrEof(&result, ' ')).?);
		434	testing.expectEqualSlices(u8, "test", (try fifo.inStream().readUntilDelimiterOrEof(&result, ' ')).?);
		435	}
425	}	436	}
426		437
427	test "LinearFifo" {	438	test "LinearFifo" {
...	@@ -445,6 +456,20 @@ test "LinearFifo" {	...	@@ -445,6 +456,20 @@ test "LinearFifo" {
445	testing.expectEqual(@as(T, 1), try fifo.readItem());	456	testing.expectEqual(@as(T, 1), try fifo.readItem());
446	testing.expectEqual(@as(T, 0), try fifo.readItem());	457	testing.expectEqual(@as(T, 0), try fifo.readItem());
447	testing.expectEqual(@as(T, 1), try fifo.readItem());	458	testing.expectEqual(@as(T, 1), try fifo.readItem());
		459	testing.expectEqual(@as(usize, 0), fifo.readableLength());
		460	}
		461
		462	{
		463	try fifo.writeItem(1);
		464	try fifo.writeItem(1);
		465	try fifo.writeItem(1);
		466	testing.expectEqual(@as(usize, 3), fifo.readableLength());
		467	}
		468
		469	{
		470	var readBuf: [3]T = undefined;
		471	const n = fifo.read(&readBuf);
		472	testing.expectEqual(@as(usize, 3), n); // NOTE: It should be the number of items.
448	}	473	}
449	}	474	}
450	}	475	}

lib/std/fmt/parse_float.zig+51-71

...	@@ -30,6 +30,7 @@	...	@@ -30,6 +30,7 @@
30	// - Does not handle denormals	30	// - Does not handle denormals
31		31
32	const std = @import("../std.zig");	32	const std = @import("../std.zig");
		33	const ascii = std.ascii;
33		34
34	const max_digits = 25;	35	const max_digits = 25;
35		36
...	@@ -190,14 +191,6 @@ const ParseResult = enum {	...	@@ -190,14 +191,6 @@ const ParseResult = enum {
190	MinusInf,	191	MinusInf,
191	};	192	};
192		193
193	inline fn isDigit(c: u8) bool {
194	return c >= '0' and c <= '9';
195	}
196
197	inline fn isSpace(c: u8) bool {
198	return (c >= 0x09 and c <= 0x13) or c == 0x20;
199	}
200
201	fn parseRepr(s: []const u8, n: *FloatRepr) !ParseResult {	194	fn parseRepr(s: []const u8, n: *FloatRepr) !ParseResult {
202	var digit_index: usize = 0;	195	var digit_index: usize = 0;
203	var negative = false;	196	var negative = false;
...	@@ -207,52 +200,49 @@ fn parseRepr(s: []const u8, n: *FloatRepr) !ParseResult {	...	@@ -207,52 +200,49 @@ fn parseRepr(s: []const u8, n: *FloatRepr) !ParseResult {
207	var state = State.MaybeSign;	200	var state = State.MaybeSign;
208		201
209	var i: usize = 0;	202	var i: usize = 0;
210	loop: while (i < s.len) {	203	while (i < s.len) {
211	const c = s[i];	204	const c = s[i];
212		205
213	switch (state) {	206	switch (state) {
214	State.MaybeSign => {	207	.MaybeSign => {
215	state = State.LeadingMantissaZeros;	208	state = .LeadingMantissaZeros;
216		209
217	if (c == '+') {	210	if (c == '+') {
218	i += 1;	211	i += 1;
219	} else if (c == '-') {	212	} else if (c == '-') {
220	n.negative = true;	213	n.negative = true;
221	i += 1;	214	i += 1;
222	} else if (isDigit(c) or c == '.') {	215	} else if (ascii.isDigit(c) or c == '.') {
223	// continue	216	// continue
224	} else {	217	} else {
225	return error.InvalidCharacter;	218	return error.InvalidCharacter;
226	}	219	}
227	},	220	},
228		221	.LeadingMantissaZeros => {
229	State.LeadingMantissaZeros => {
230	if (c == '0') {	222	if (c == '0') {
231	i += 1;	223	i += 1;
232	} else if (c == '.') {	224	} else if (c == '.') {
233	i += 1;	225	i += 1;
234	state = State.LeadingFractionalZeros;	226	state = .LeadingFractionalZeros;
235	} else {	227	} else {
236	state = State.MantissaIntegral;	228	state = .MantissaIntegral;
237	}	229	}
238	},	230	},
239		231	.LeadingFractionalZeros => {
240	State.LeadingFractionalZeros => {
241	if (c == '0') {	232	if (c == '0') {
242	i += 1;	233	i += 1;
243	if (n.exponent > std.math.minInt(i32)) {	234	if (n.exponent > std.math.minInt(i32)) {
244	n.exponent -= 1;	235	n.exponent -= 1;
245	}	236	}
246	} else {	237	} else {
247	state = State.MantissaFractional;	238	state = .MantissaFractional;
248	}	239	}
249	},	240	},
250		241	.MantissaIntegral => {
251	State.MantissaIntegral => {	242	if (ascii.isDigit(c)) {
252	if (isDigit(c)) {
253	if (digit_index < max_digits) {	243	if (digit_index < max_digits) {
254	n.mantissa *%= 10;	244	n.mantissa *%= 10;
255	n.mantissa += s[i] - '0';	245	n.mantissa += c - '0';
256	digit_index += 1;	246	digit_index += 1;
257	} else if (n.exponent < std.math.maxInt(i32)) {	247	} else if (n.exponent < std.math.maxInt(i32)) {
258	n.exponent += 1;	248	n.exponent += 1;
...	@@ -261,14 +251,13 @@ fn parseRepr(s: []const u8, n: *FloatRepr) !ParseResult {	...	@@ -261,14 +251,13 @@ fn parseRepr(s: []const u8, n: *FloatRepr) !ParseResult {
261	i += 1;	251	i += 1;
262	} else if (c == '.') {	252	} else if (c == '.') {
263	i += 1;	253	i += 1;
264	state = State.MantissaFractional;	254	state = .MantissaFractional;
265	} else {	255	} else {
266	state = State.MantissaFractional;	256	state = .MantissaFractional;
267	}	257	}
268	},	258	},
269		259	.MantissaFractional => {
270	State.MantissaFractional => {	260	if (ascii.isDigit(c)) {
271	if (isDigit(c)) {
272	if (digit_index < max_digits) {	261	if (digit_index < max_digits) {
273	n.mantissa *%= 10;	262	n.mantissa *%= 10;
274	n.mantissa += c - '0';	263	n.mantissa += c - '0';
...	@@ -279,13 +268,12 @@ fn parseRepr(s: []const u8, n: *FloatRepr) !ParseResult {	...	@@ -279,13 +268,12 @@ fn parseRepr(s: []const u8, n: *FloatRepr) !ParseResult {
279	i += 1;	268	i += 1;
280	} else if (c == 'e' or c == 'E') {	269	} else if (c == 'e' or c == 'E') {
281	i += 1;	270	i += 1;
282	state = State.ExponentSign;	271	state = .ExponentSign;
283	} else {	272	} else {
284	state = State.ExponentSign;	273	state = .ExponentSign;
285	}	274	}
286	},	275	},
287		276	.ExponentSign => {
288	State.ExponentSign => {
289	if (c == '+') {	277	if (c == '+') {
290	i += 1;	278	i += 1;
291	} else if (c == '-') {	279	} else if (c == '-') {
...	@@ -293,20 +281,18 @@ fn parseRepr(s: []const u8, n: *FloatRepr) !ParseResult {	...	@@ -293,20 +281,18 @@ fn parseRepr(s: []const u8, n: *FloatRepr) !ParseResult {
293	i += 1;	281	i += 1;
294	}	282	}
295		283
296	state = State.LeadingExponentZeros;	284	state = .LeadingExponentZeros;
297	},	285	},
298		286	.LeadingExponentZeros => {
299	State.LeadingExponentZeros => {
300	if (c == '0') {	287	if (c == '0') {
301	i += 1;	288	i += 1;
302	} else {	289	} else {
303	state = State.Exponent;	290	state = .Exponent;
304	}	291	}
305	},	292	},
306		293	.Exponent => {
307	State.Exponent => {	294	if (ascii.isDigit(c)) {
308	if (isDigit(c)) {	295	if (exponent < std.math.maxInt(i32) / 10) {
309	if (exponent < std.math.maxInt(i32)) {
310	exponent *= 10;	296	exponent *= 10;
311	exponent += @intCast(i32, c - '0');	297	exponent += @intCast(i32, c - '0');
312	}	298	}
...	@@ -323,29 +309,21 @@ fn parseRepr(s: []const u8, n: *FloatRepr) !ParseResult {	...	@@ -323,29 +309,21 @@ fn parseRepr(s: []const u8, n: *FloatRepr) !ParseResult {
323	n.exponent += exponent;	309	n.exponent += exponent;
324		310
325	if (n.mantissa == 0) {	311	if (n.mantissa == 0) {
326	return if (n.negative) ParseResult.MinusZero else ParseResult.PlusZero;	312	return if (n.negative) .MinusZero else .PlusZero;
327	} else if (n.exponent > 309) {	313	} else if (n.exponent > 309) {
328	return if (n.negative) ParseResult.MinusInf else ParseResult.PlusInf;	314	return if (n.negative) .MinusInf else .PlusInf;
329	} else if (n.exponent < -328) {	315	} else if (n.exponent < -328) {
330	return if (n.negative) ParseResult.MinusZero else ParseResult.PlusZero;	316	return if (n.negative) .MinusZero else .PlusZero;
331	}	317	}
332		318
333	return ParseResult.Ok;	319	return .Ok;
334	}
335
336	inline fn isLower(c: u8) bool {
337	return c -% 'a' < 26;
338	}
339
340	inline fn toUpper(c: u8) u8 {
341	return if (isLower(c)) (c & 0x5f) else c;
342	}	320	}
343		321
344	fn caseInEql(a: []const u8, b: []const u8) bool {	322	fn caseInEql(a: []const u8, b: []const u8) bool {
345	if (a.len != b.len) return false;	323	if (a.len != b.len) return false;
346		324
347	for (a) \|_, i\| {	325	for (a) \|_, i\| {
348	if (toUpper(a[i]) != toUpper(b[i])) {	326	if (ascii.toUpper(a[i]) != ascii.toUpper(b[i])) {
349	return false;	327	return false;
350	}	328	}
351	}	329	}
...	@@ -373,11 +351,11 @@ pub fn parseFloat(comptime T: type, s: []const u8) !T {	...	@@ -373,11 +351,11 @@ pub fn parseFloat(comptime T: type, s: []const u8) !T {
373	};	351	};
374		352
375	return switch (try parseRepr(s, &r)) {	353	return switch (try parseRepr(s, &r)) {
376	ParseResult.Ok => convertRepr(T, r),	354	.Ok => convertRepr(T, r),
377	ParseResult.PlusZero => 0.0,	355	.PlusZero => 0.0,
378	ParseResult.MinusZero => -@as(T, 0.0),	356	.MinusZero => -@as(T, 0.0),
379	ParseResult.PlusInf => std.math.inf(T),	357	.PlusInf => std.math.inf(T),
380	ParseResult.MinusInf => -std.math.inf(T),	358	.MinusInf => -std.math.inf(T),
381	};	359	};
382	}	360	}
383		361
...	@@ -396,26 +374,28 @@ test "fmt.parseFloat" {	...	@@ -396,26 +374,28 @@ test "fmt.parseFloat" {
396	testing.expectError(error.InvalidCharacter, parseFloat(T, "1abc"));	374	testing.expectError(error.InvalidCharacter, parseFloat(T, "1abc"));
397		375
398	expectEqual(try parseFloat(T, "0"), 0.0);	376	expectEqual(try parseFloat(T, "0"), 0.0);
399	expectEqual((try parseFloat(T, "0")), 0.0);	377	expectEqual(try parseFloat(T, "0"), 0.0);
400	expectEqual((try parseFloat(T, "+0")), 0.0);	378	expectEqual(try parseFloat(T, "+0"), 0.0);
401	expectEqual((try parseFloat(T, "-0")), 0.0);	379	expectEqual(try parseFloat(T, "-0"), 0.0);
402		380
403	expectEqual((try parseFloat(T, "0e0")), 0);	381	expectEqual(try parseFloat(T, "0e0"), 0);
404	expectEqual((try parseFloat(T, "2e3")), 2000.0);	382	expectEqual(try parseFloat(T, "2e3"), 2000.0);
405	expectEqual((try parseFloat(T, "1e0")), 1.0);	383	expectEqual(try parseFloat(T, "1e0"), 1.0);
406	expectEqual((try parseFloat(T, "-2e3")), -2000.0);	384	expectEqual(try parseFloat(T, "-2e3"), -2000.0);
407	expectEqual((try parseFloat(T, "-1e0")), -1.0);	385	expectEqual(try parseFloat(T, "-1e0"), -1.0);
408	expectEqual((try parseFloat(T, "1.234e3")), 1234);	386	expectEqual(try parseFloat(T, "1.234e3"), 1234);
409		387
410	expect(approxEq(T, try parseFloat(T, "3.141"), 3.141, epsilon));	388	expect(approxEq(T, try parseFloat(T, "3.141"), 3.141, epsilon));
411	expect(approxEq(T, try parseFloat(T, "-3.141"), -3.141, epsilon));	389	expect(approxEq(T, try parseFloat(T, "-3.141"), -3.141, epsilon));
412		390
413	expectEqual((try parseFloat(T, "1e-700")), 0);	391	expectEqual(try parseFloat(T, "1e-700"), 0);
414	expectEqual((try parseFloat(T, "1e+700")), std.math.inf(T));	392	expectEqual(try parseFloat(T, "1e+700"), std.math.inf(T));
415		393
416	expectEqual(@bitCast(Z, try parseFloat(T, "nAn")), @bitCast(Z, std.math.nan(T)));	394	expectEqual(@bitCast(Z, try parseFloat(T, "nAn")), @bitCast(Z, std.math.nan(T)));
417	expectEqual((try parseFloat(T, "inF")), std.math.inf(T));	395	expectEqual(try parseFloat(T, "inF"), std.math.inf(T));
418	expectEqual((try parseFloat(T, "-INF")), -std.math.inf(T));	396	expectEqual(try parseFloat(T, "-INF"), -std.math.inf(T));
		397
		398	expectEqual(try parseFloat(T, "0.4e0066999999999999999999999999999999999999999999999999999"), std.math.inf(T));
419		399
420	if (T != f16) {	400	if (T != f16) {
421	expect(approxEq(T, try parseFloat(T, "1e-2"), 0.01, epsilon));	401	expect(approxEq(T, try parseFloat(T, "1e-2"), 0.01, epsilon));

lib/std/fs.zig+121-98

 @@ -11,13 +11,18 @@ const math = std.math;
 pub const path = @import("fs/path.zig");
 pub const File = @import("fs/file.zig").File;
+// TODO audit these APIs with respect to Dir and absolute paths
 pub const symLink = os.symlink;
-pub const symLinkC = os.symlinkC;
+pub const symLinkZ = os.symlinkZ;
+pub const symLinkC = @compileError("deprecated: renamed to symlinkZ");
 pub const rename = os.rename;
-pub const renameC = os.renameC;
+pub const renameZ = os.renameZ;
+pub const renameC = @compileError("deprecated: renamed to renameZ");
 pub const renameW = os.renameW;
 pub const realpath = os.realpath;
-pub const realpathC = os.realpathC;
+pub const realpathZ = os.realpathZ;
+pub const realpathC = @compileError("deprecated: renamed to realpathZ");
 pub const realpathW = os.realpathW;
 pub const getAppDataDir = @import("fs/get_app_data_dir.zig").getAppDataDir;
 @@ -120,7 +125,7 @@ pub const AtomicFile = struct {
     file: File,
     // TODO either replace this with rand_buf or use []u16 on Windows
     tmp_path_buf: [TMP_PATH_LEN:0]u8,
-    dest_path: []const u8,
+    dest_basename: []const u8,
     file_open: bool,
     file_exists: bool,
     close_dir_on_deinit: bool,
 @@ -131,17 +136,23 @@ pub const AtomicFile = struct {
     const RANDOM_BYTES = 12;
     const TMP_PATH_LEN = base64.Base64Encoder.calcSize(RANDOM_BYTES);
-    /// TODO rename this. Callers should go through Dir API
+    /// Note that the `Dir.atomicFile` API may be more handy than this lower-level function.
-    pub fn init2(dest_path: []const u8, mode: File.Mode, dir: Dir, close_dir_on_deinit: bool) InitError!AtomicFile {
+    pub fn init(
+        dest_basename: []const u8,
+        mode: File.Mode,
+        dir: Dir,
+        close_dir_on_deinit: bool,
+    ) InitError!AtomicFile {
         var rand_buf: [RANDOM_BYTES]u8 = undefined;
         var tmp_path_buf: [TMP_PATH_LEN:0]u8 = undefined;
+        // TODO: should be able to use TMP_PATH_LEN here.
         tmp_path_buf[base64.Base64Encoder.calcSize(RANDOM_BYTES)] = 0;
         while (true) {
             try crypto.randomBytes(rand_buf[0..]);
             base64_encoder.encode(&tmp_path_buf, &rand_buf);
-            const file = dir.createFileC(
+            const file = dir.createFileZ(
                 &tmp_path_buf,
                 .{ .mode = mode, .exclusive = true },
             ) catch |err| switch (err) {
 @@ -152,7 +163,7 @@ pub const AtomicFile = struct {
             return AtomicFile{
                 .file = file,
                 .tmp_path_buf = tmp_path_buf,
-                .dest_path = dest_path,
+                .dest_basename = dest_basename,
                 .file_open = true,
                 .file_exists = true,
                 .close_dir_on_deinit = close_dir_on_deinit,
 @@ -161,11 +172,6 @@ pub const AtomicFile = struct {
         }
     }
-    /// Deprecated. Use `Dir.atomicFile`.
-    pub fn init(dest_path: []const u8, mode: File.Mode) InitError!AtomicFile {
-        return cwd().atomicFile(dest_path, .{ .mode = mode });
-    }
     /// always call deinit, even after successful finish()
     pub fn deinit(self: *AtomicFile) void {
         if (self.file_open) {
 @@ -173,7 +179,7 @@ pub const AtomicFile = struct {
             self.file_open = false;
         }
         if (self.file_exists) {
-            self.dir.deleteFileC(&self.tmp_path_buf) catch {};
+            self.dir.deleteFileZ(&self.tmp_path_buf) catch {};
             self.file_exists = false;
         }
         if (self.close_dir_on_deinit) {
 @@ -189,12 +195,12 @@ pub const AtomicFile = struct {
             self.file_open = false;
         }
         if (std.Target.current.os.tag == .windows) {
-            const dest_path_w = try os.windows.sliceToPrefixedFileW(self.dest_path);
+            const dest_path_w = try os.windows.sliceToPrefixedFileW(self.dest_basename);
             const tmp_path_w = try os.windows.cStrToPrefixedFileW(&self.tmp_path_buf);
             try os.renameatW(self.dir.fd, &tmp_path_w, self.dir.fd, &dest_path_w, os.windows.TRUE);
             self.file_exists = false;
         } else {
-            const dest_path_c = try os.toPosixPath(self.dest_path);
+            const dest_path_c = try os.toPosixPath(self.dest_basename);
             try os.renameatZ(self.dir.fd, &self.tmp_path_buf, self.dir.fd, &dest_path_c);
             self.file_exists = false;
         }
 @@ -213,7 +219,7 @@ pub fn makeDirAbsolute(absolute_path: []const u8) !void {
 /// Same as `makeDirAbsolute` except the parameter is a null-terminated UTF8-encoded string.
 pub fn makeDirAbsoluteZ(absolute_path_z: [*:0]const u8) !void {
-    assert(path.isAbsoluteC(absolute_path_z));
+    assert(path.isAbsoluteZ(absolute_path_z));
     return os.mkdirZ(absolute_path_z, default_new_dir_mode);
 }
 @@ -224,18 +230,25 @@ pub fn makeDirAbsoluteW(absolute_path_w: [*:0]const u16) !void {
     os.windows.CloseHandle(handle);
 }
-/// Deprecated; use `Dir.deleteDir`.
+pub const deleteDir = @compileError("deprecated; use dir.deleteDir or deleteDirAbsolute");
-pub fn deleteDir(dir_path: []const u8) !void {
+pub const deleteDirC = @compileError("deprecated; use dir.deleteDirZ or deleteDirAbsoluteZ");
+pub const deleteDirW = @compileError("deprecated; use dir.deleteDirW or deleteDirAbsoluteW");
+/// Same as `Dir.deleteDir` except the path is absolute.
+pub fn deleteDirAbsolute(dir_path: []const u8) !void {
+    assert(path.isAbsolute(dir_path));
     return os.rmdir(dir_path);
 }
-/// Deprecated; use `Dir.deleteDirC`.
+/// Same as `deleteDirAbsolute` except the path parameter is null-terminated.
-pub fn deleteDirC(dir_path: [*:0]const u8) !void {
+pub fn deleteDirAbsoluteZ(dir_path: [*:0]const u8) !void {
-    return os.rmdirC(dir_path);
+    assert(path.isAbsoluteZ(dir_path));
+    return os.rmdirZ(dir_path);
 }
-/// Deprecated; use `Dir.deleteDirW`.
+/// Same as `deleteDirAbsolute` except the path parameter is WTF-16 and target OS is assumed Windows.
-pub fn deleteDirW(dir_path: [*:0]const u16) !void {
+pub fn deleteDirAbsoluteW(dir_path: [*:0]const u16) !void {
+    assert(path.isAbsoluteWindowsW(dir_path));
     return os.rmdirW(dir_path);
 }
 @@ -412,7 +425,7 @@ pub const Dir = struct {
                     const next_index = self.index + linux_entry.reclen();
                     self.index = next_index;
-                    const name = mem.toSlice(u8, @ptrCast([*:0]u8, &linux_entry.d_name));
+                    const name = mem.spanZ(@ptrCast([*:0]u8, &linux_entry.d_name));
                     // skip . and .. entries
                     if (mem.eql(u8, name, ".") or mem.eql(u8, name, "..")) {
 @@ -573,8 +586,7 @@ pub const Dir = struct {
         return self.openFileZ(&path_c, flags);
     }
-    /// Deprecated; use `openFileZ`.
+    pub const openFileC = @compileError("deprecated: renamed to openFileZ");
-    pub const openFileC = openFileZ;
     /// Same as `openFile` but the path parameter is null-terminated.
     pub fn openFileZ(self: Dir, sub_path: [*:0]const u8, flags: File.OpenFlags) File.OpenError!File {
 @@ -603,7 +615,7 @@ pub const Dir = struct {
         const fd = if (need_async_thread and !flags.always_blocking)
             try std.event.Loop.instance.?.openatZ(self.fd, sub_path, os_flags, 0)
         else
-            try os.openatC(self.fd, sub_path, os_flags, 0);
+            try os.openatZ(self.fd, sub_path, os_flags, 0);
         // use fcntl file locking if no lock flag was given
         if (flags.lock and lock_flag == 0) {
 @@ -652,11 +664,13 @@ pub const Dir = struct {
             return self.createFileW(&path_w, flags);
         }
         const path_c = try os.toPosixPath(sub_path);
-        return self.createFileC(&path_c, flags);
+        return self.createFileZ(&path_c, flags);
     }
+    pub const createFileC = @compileError("deprecated: renamed to createFileZ");
     /// Same as `createFile` but the path parameter is null-terminated.
-    pub fn createFileC(self: Dir, sub_path_c: [*:0]const u8, flags: File.CreateFlags) File.OpenError!File {
+    pub fn createFileZ(self: Dir, sub_path_c: [*:0]const u8, flags: File.CreateFlags) File.OpenError!File {
         if (builtin.os.tag == .windows) {
             const path_w = try os.windows.cStrToPrefixedFileW(sub_path_c);
             return self.createFileW(&path_w, flags);
 @@ -676,7 +690,7 @@ pub const Dir = struct {
         const fd = if (need_async_thread)
             try std.event.Loop.instance.?.openatZ(self.fd, sub_path_c, os_flags, flags.mode)
         else
-            try os.openatC(self.fd, sub_path_c, os_flags, flags.mode);
+            try os.openatZ(self.fd, sub_path_c, os_flags, flags.mode);
         if (flags.lock and lock_flag == 0) {
             // TODO: integrate async I/O
 @@ -713,27 +727,16 @@ pub const Dir = struct {
         });
     }
-    /// Deprecated; call `openFile` directly.
+    pub const openRead = @compileError("deprecated in favor of openFile");
-    pub fn openRead(self: Dir, sub_path: []const u8) File.OpenError!File {
+    pub const openReadC = @compileError("deprecated in favor of openFileZ");
-        return self.openFile(sub_path, .{});
+    pub const openReadW = @compileError("deprecated in favor of openFileW");
-    }
-    /// Deprecated; call `openFileZ` directly.
-    pub fn openReadC(self: Dir, sub_path: [*:0]const u8) File.OpenError!File {
-        return self.openFileZ(sub_path, .{});
-    }
-    /// Deprecated; call `openFileW` directly.
-    pub fn openReadW(self: Dir, sub_path: [*:0]const u16) File.OpenError!File {
-        return self.openFileW(sub_path, .{});
-    }
     pub fn makeDir(self: Dir, sub_path: []const u8) !void {
         try os.mkdirat(self.fd, sub_path, default_new_dir_mode);
     }
     pub fn makeDirZ(self: Dir, sub_path: [*:0]const u8) !void {
-        try os.mkdiratC(self.fd, sub_path, default_new_dir_mode);
+        try os.mkdiratZ(self.fd, sub_path, default_new_dir_mode);
     }
     pub fn makeDirW(self: Dir, sub_path: [*:0]const u16) !void {
 @@ -807,20 +810,22 @@ pub const Dir = struct {
             return self.openDirW(&sub_path_w, args);
         } else {
             const sub_path_c = try os.toPosixPath(sub_path);
-            return self.openDirC(&sub_path_c, args);
+            return self.openDirZ(&sub_path_c, args);
         }
     }
+    pub const openDirC = @compileError("deprecated: renamed to openDirZ");
     /// Same as `openDir` except the parameter is null-terminated.
-    pub fn openDirC(self: Dir, sub_path_c: [*:0]const u8, args: OpenDirOptions) OpenError!Dir {
+    pub fn openDirZ(self: Dir, sub_path_c: [*:0]const u8, args: OpenDirOptions) OpenError!Dir {
         if (builtin.os.tag == .windows) {
             const sub_path_w = try os.windows.cStrToPrefixedFileW(sub_path_c);
             return self.openDirW(&sub_path_w, args);
         } else if (!args.iterate) {
             const O_PATH = if (@hasDecl(os, "O_PATH")) os.O_PATH else 0;
-            return self.openDirFlagsC(sub_path_c, os.O_DIRECTORY | os.O_RDONLY | os.O_CLOEXEC | O_PATH);
+            return self.openDirFlagsZ(sub_path_c, os.O_DIRECTORY | os.O_RDONLY | os.O_CLOEXEC | O_PATH);
         } else {
-            return self.openDirFlagsC(sub_path_c, os.O_DIRECTORY | os.O_RDONLY | os.O_CLOEXEC);
+            return self.openDirFlagsZ(sub_path_c, os.O_DIRECTORY | os.O_RDONLY | os.O_CLOEXEC);
         }
     }
 @@ -836,11 +841,11 @@ pub const Dir = struct {
     }
     /// `flags` must contain `os.O_DIRECTORY`.
-    fn openDirFlagsC(self: Dir, sub_path_c: [*:0]const u8, flags: u32) OpenError!Dir {
+    fn openDirFlagsZ(self: Dir, sub_path_c: [*:0]const u8, flags: u32) OpenError!Dir {
         const result = if (need_async_thread)
             std.event.Loop.instance.?.openatZ(self.fd, sub_path_c, flags, 0)
         else
-            os.openatC(self.fd, sub_path_c, flags, 0);
+            os.openatZ(self.fd, sub_path_c, flags, 0);
         const fd = result catch |err| switch (err) {
             error.FileTooBig => unreachable, // can't happen for directories
             error.IsDir => unreachable, // we're providing O_DIRECTORY
 @@ -858,7 +863,7 @@ pub const Dir = struct {
             .fd = undefined,
         };
-        const path_len_bytes = @intCast(u16, mem.toSliceConst(u16, sub_path_w).len * 2);
+        const path_len_bytes = @intCast(u16, mem.lenZ(sub_path_w) * 2);
         var nt_name = w.UNICODE_STRING{
             .Length = path_len_bytes,
             .MaximumLength = path_len_bytes,
 @@ -916,9 +921,11 @@ pub const Dir = struct {
         };
     }
+    pub const deleteFileC = @compileError("deprecated: renamed to deleteFileZ");
     /// Same as `deleteFile` except the parameter is null-terminated.
-    pub fn deleteFileC(self: Dir, sub_path_c: [*:0]const u8) DeleteFileError!void {
+    pub fn deleteFileZ(self: Dir, sub_path_c: [*:0]const u8) DeleteFileError!void {
-        os.unlinkatC(self.fd, sub_path_c, 0) catch |err| switch (err) {
+        os.unlinkatZ(self.fd, sub_path_c, 0) catch |err| switch (err) {
             error.DirNotEmpty => unreachable, // not passing AT_REMOVEDIR
             else => |e| return e,
         };
 @@ -957,12 +964,12 @@ pub const Dir = struct {
             return self.deleteDirW(&sub_path_w);
         }
         const sub_path_c = try os.toPosixPath(sub_path);
-        return self.deleteDirC(&sub_path_c);
+        return self.deleteDirZ(&sub_path_c);
     }
     /// Same as `deleteDir` except the parameter is null-terminated.
-    pub fn deleteDirC(self: Dir, sub_path_c: [*:0]const u8) DeleteDirError!void {
+    pub fn deleteDirZ(self: Dir, sub_path_c: [*:0]const u8) DeleteDirError!void {
-        os.unlinkatC(self.fd, sub_path_c, os.AT_REMOVEDIR) catch |err| switch (err) {
+        os.unlinkatZ(self.fd, sub_path_c, os.AT_REMOVEDIR) catch |err| switch (err) {
             error.IsDir => unreachable, // not possible since we pass AT_REMOVEDIR
             else => |e| return e,
         };
 @@ -982,12 +989,14 @@ pub const Dir = struct {
     /// Asserts that the path parameter has no null bytes.
     pub fn readLink(self: Dir, sub_path: []const u8, buffer: *[MAX_PATH_BYTES]u8) ![]u8 {
         const sub_path_c = try os.toPosixPath(sub_path);
-        return self.readLinkC(&sub_path_c, buffer);
+        return self.readLinkZ(&sub_path_c, buffer);
     }
+    pub const readLinkC = @compileError("deprecated: renamed to readLinkZ");
     /// Same as `readLink`, except the `pathname` parameter is null-terminated.
-    pub fn readLinkC(self: Dir, sub_path_c: [*:0]const u8, buffer: *[MAX_PATH_BYTES]u8) ![]u8 {
+    pub fn readLinkZ(self: Dir, sub_path_c: [*:0]const u8, buffer: *[MAX_PATH_BYTES]u8) ![]u8 {
-        return os.readlinkatC(self.fd, sub_path_c, buffer);
+        return os.readlinkatZ(self.fd, sub_path_c, buffer);
     }
     /// On success, caller owns returned buffer.
 @@ -1005,7 +1014,7 @@ pub const Dir = struct {
         max_bytes: usize,
         comptime A: u29,
     ) ![]align(A) u8 {
-        var file = try self.openRead(file_path);
+        var file = try self.openFile(file_path, .{});
         defer file.close();
         const size = math.cast(usize, try file.getEndPos()) catch math.maxInt(usize);
 @@ -1329,9 +1338,9 @@ pub const Dir = struct {
     pub fn atomicFile(self: Dir, dest_path: []const u8, options: AtomicFileOptions) !AtomicFile {
         if (path.dirname(dest_path)) |dirname| {
             const dir = try self.openDir(dirname, .{});
-            return AtomicFile.init2(path.basename(dest_path), options.mode, dir, true);
+            return AtomicFile.init(path.basename(dest_path), options.mode, dir, true);
         } else {
-            return AtomicFile.init2(dest_path, options.mode, self, false);
+            return AtomicFile.init(dest_path, options.mode, self, false);
         }
     }
 };
 @@ -1358,9 +1367,11 @@ pub fn openFileAbsolute(absolute_path: []const u8, flags: File.OpenFlags) File.O
     return cwd().openFile(absolute_path, flags);
 }
+pub const openFileAbsoluteC = @compileError("deprecated: renamed to openFileAbsoluteZ");
 /// Same as `openFileAbsolute` but the path parameter is null-terminated.
-pub fn openFileAbsoluteC(absolute_path_c: [*:0]const u8, flags: File.OpenFlags) File.OpenError!File {
+pub fn openFileAbsoluteZ(absolute_path_c: [*:0]const u8, flags: File.OpenFlags) File.OpenError!File {
-    assert(path.isAbsoluteC(absolute_path_c));
+    assert(path.isAbsoluteZ(absolute_path_c));
     return cwd().openFileZ(absolute_path_c, flags);
 }
 @@ -1381,10 +1392,12 @@ pub fn createFileAbsolute(absolute_path: []const u8, flags: File.CreateFlags) Fi
     return cwd().createFile(absolute_path, flags);
 }
+pub const createFileAbsoluteC = @compileError("deprecated: renamed to createFileAbsoluteZ");
 /// Same as `createFileAbsolute` but the path parameter is null-terminated.
-pub fn createFileAbsoluteC(absolute_path_c: [*:0]const u8, flags: File.CreateFlags) File.OpenError!File {
+pub fn createFileAbsoluteZ(absolute_path_c: [*:0]const u8, flags: File.CreateFlags) File.OpenError!File {
-    assert(path.isAbsoluteC(absolute_path_c));
+    assert(path.isAbsoluteZ(absolute_path_c));
-    return cwd().createFileC(absolute_path_c, flags);
+    return cwd().createFileZ(absolute_path_c, flags);
 }
 /// Same as `createFileAbsolute` but the path parameter is WTF-16 encoded.
 @@ -1402,10 +1415,12 @@ pub fn deleteFileAbsolute(absolute_path: []const u8) DeleteFileError!void {
     return cwd().deleteFile(absolute_path);
 }
+pub const deleteFileAbsoluteC = @compileError("deprecated: renamed to deleteFileAbsoluteZ");
 /// Same as `deleteFileAbsolute` except the parameter is null-terminated.
-pub fn deleteFileAbsoluteC(absolute_path_c: [*:0]const u8) DeleteFileError!void {
+pub fn deleteFileAbsoluteZ(absolute_path_c: [*:0]const u8) DeleteFileError!void {
-    assert(path.isAbsoluteC(absolute_path_c));
+    assert(path.isAbsoluteZ(absolute_path_c));
-    return cwd().deleteFileC(absolute_path_c);
+    return cwd().deleteFileZ(absolute_path_c);
 }
 /// Same as `deleteFileAbsolute` except the parameter is WTF-16 encoded.
 @@ -1433,15 +1448,31 @@ pub fn deleteTreeAbsolute(absolute_path: []const u8) !void {
     return dir.deleteTree(path.basename(absolute_path));
 }
+/// Same as `Dir.readLink`, except it asserts the path is absolute.
+pub fn readLinkAbsolute(pathname: []const u8, buffer: *[MAX_PATH_BYTES]u8) ![]u8 {
+    assert(path.isAbsolute(pathname));
+    return os.readlink(pathname, buffer);
+}
+/// Same as `readLink`, except the path parameter is null-terminated.
+pub fn readLinkAbsoluteZ(pathname_c: [*]const u8, buffer: *[MAX_PATH_BYTES]u8) ![]u8 {
+    assert(path.isAbsoluteZ(pathname_c));
+    return os.readlinkZ(pathname_c, buffer);
+}
+pub const readLink = @compileError("deprecated; use Dir.readLink or readLinkAbsolute");
+pub const readLinkC = @compileError("deprecated; use Dir.readLinkZ or readLinkAbsoluteZ");
 pub const Walker = struct {
     stack: std.ArrayList(StackItem),
-    name_buffer: std.Buffer,
+    name_buffer: std.ArrayList(u8),
     pub const Entry = struct {
         /// The containing directory. This can be used to operate directly on `basename`
         /// rather than `path`, avoiding `error.NameTooLong` for deeply nested paths.
         /// The directory remains open until `next` or `deinit` is called.
         dir: Dir,
+        /// TODO make this null terminated for API convenience
         basename: []const u8,
         path: []const u8,
 @@ -1460,12 +1491,12 @@ pub const Walker = struct {
         while (true) {
             if (self.stack.len == 0) return null;
             // `top` becomes invalid after appending to `self.stack`.
-            const top = &self.stack.toSlice()[self.stack.len - 1];
+            const top = &self.stack.span()[self.stack.len - 1];
             const dirname_len = top.dirname_len;
             if (try top.dir_it.next()) |base| {
                 self.name_buffer.shrink(dirname_len);
-                try self.name_buffer.appendByte(path.sep);
+                try self.name_buffer.append(path.sep);
-                try self.name_buffer.append(base.name);
+                try self.name_buffer.appendSlice(base.name);
                 if (base.kind == .Directory) {
                     var new_dir = top.dir_it.dir.openDir(base.name, .{ .iterate = true }) catch |err| switch (err) {
                         error.NameTooLong => unreachable, // no path sep in base.name
 @@ -1475,14 +1506,14 @@ pub const Walker = struct {
                         errdefer new_dir.close();
                         try self.stack.append(StackItem{
                             .dir_it = new_dir.iterate(),
-                            .dirname_len = self.name_buffer.len(),
+                            .dirname_len = self.name_buffer.len,
                         });
                     }
                 }
                 return Entry{
                     .dir = top.dir_it.dir,
-                    .basename = self.name_buffer.toSliceConst()[dirname_len + 1 ..],
+                    .basename = self.name_buffer.span()[dirname_len + 1 ..],
-                    .path = self.name_buffer.toSliceConst(),
+                    .path = self.name_buffer.span(),
                     .kind = base.kind,
                 };
             } else {
 @@ -1508,9 +1539,11 @@ pub fn walkPath(allocator: *Allocator, dir_path: []const u8) !Walker {
     var dir = try cwd().openDir(dir_path, .{ .iterate = true });
     errdefer dir.close();
-    var name_buffer = try std.Buffer.init(allocator, dir_path);
+    var name_buffer = std.ArrayList(u8).init(allocator);
     errdefer name_buffer.deinit();
+    try name_buffer.appendSlice(dir_path);
     var walker = Walker{
         .stack = std.ArrayList(Walker.StackItem).init(allocator),
         .name_buffer = name_buffer,
 @@ -1524,31 +1557,21 @@ pub fn walkPath(allocator: *Allocator, dir_path: []const u8) !Walker {
     return walker;
 }
-/// Deprecated; use `Dir.readLink`.
-pub fn readLink(pathname: []const u8, buffer: *[MAX_PATH_BYTES]u8) ![]u8 {
-    return os.readlink(pathname, buffer);
-}
-/// Deprecated; use `Dir.readLinkC`.
-pub fn readLinkC(pathname_c: [*]const u8, buffer: *[MAX_PATH_BYTES]u8) ![]u8 {
-    return os.readlinkC(pathname_c, buffer);
-}
 pub const OpenSelfExeError = os.OpenError || os.windows.CreateFileError || SelfExePathError || os.FcntlError;
 pub fn openSelfExe() OpenSelfExeError!File {
     if (builtin.os.tag == .linux) {
-        return openFileAbsoluteC("/proc/self/exe", .{});
+        return openFileAbsoluteZ("/proc/self/exe", .{});
     }
     if (builtin.os.tag == .windows) {
         const wide_slice = selfExePathW();
         const prefixed_path_w = try os.windows.wToPrefixedFileW(wide_slice);
-        return cwd().openReadW(&prefixed_path_w);
+        return cwd().openFileW(&prefixed_path_w, .{});
     }
     var buf: [MAX_PATH_BYTES]u8 = undefined;
     const self_exe_path = try selfExePath(&buf);
     buf[self_exe_path.len] = 0;
-    return openFileAbsoluteC(self_exe_path[0..self_exe_path.len :0].ptr, .{});
+    return openFileAbsoluteZ(self_exe_path[0..self_exe_path.len :0].ptr, .{});
 }
 test "openSelfExe" {
 @@ -1582,23 +1605,23 @@ pub fn selfExePath(out_buffer: *[MAX_PATH_BYTES]u8) SelfExePathError![]u8 {
         var u32_len: u32 = out_buffer.len;
         const rc = std.c._NSGetExecutablePath(out_buffer, &u32_len);
         if (rc != 0) return error.NameTooLong;
-        return mem.toSlice(u8, @ptrCast([*:0]u8, out_buffer));
+        return mem.spanZ(@ptrCast([*:0]u8, out_buffer));
     }
     switch (builtin.os.tag) {
-        .linux => return os.readlinkC("/proc/self/exe", out_buffer),
+        .linux => return os.readlinkZ("/proc/self/exe", out_buffer),
         .freebsd, .dragonfly => {
             var mib = [4]c_int{ os.CTL_KERN, os.KERN_PROC, os.KERN_PROC_PATHNAME, -1 };
             var out_len: usize = out_buffer.len;
             try os.sysctl(&mib, out_buffer, &out_len, null, 0);
             // TODO could this slice from 0 to out_len instead?
-            return mem.toSlice(u8, @ptrCast([*:0]u8, out_buffer));
+            return mem.spanZ(@ptrCast([*:0]u8, out_buffer));
         },
         .netbsd => {
             var mib = [4]c_int{ os.CTL_KERN, os.KERN_PROC_ARGS, -1, os.KERN_PROC_PATHNAME };
             var out_len: usize = out_buffer.len;
             try os.sysctl(&mib, out_buffer, &out_len, null, 0);
             // TODO could this slice from 0 to out_len instead?
-            return mem.toSlice(u8, @ptrCast([*:0]u8, out_buffer));
+            return mem.spanZ(@ptrCast([*:0]u8, out_buffer));
         },
         .windows => {
             const utf16le_slice = selfExePathW();
 @@ -1613,7 +1636,7 @@ pub fn selfExePath(out_buffer: *[MAX_PATH_BYTES]u8) SelfExePathError![]u8 {
 /// The result is UTF16LE-encoded.
 pub fn selfExePathW() [:0]const u16 {
     const image_path_name = &os.windows.peb().ProcessParameters.ImagePathName;
-    return mem.toSliceConst(u16, @ptrCast([*:0]const u16, image_path_name.Buffer));
+    return mem.spanZ(@ptrCast([*:0]const u16, image_path_name.Buffer));
 }
 /// `selfExeDirPath` except allocates the result on the heap.

lib/std/fs/file.zig+1-1

...	@@ -110,7 +110,7 @@ pub const File = struct {	...	@@ -110,7 +110,7 @@ pub const File = struct {
110	if (self.isTty()) {	110	if (self.isTty()) {
111	if (self.handle == os.STDOUT_FILENO or self.handle == os.STDERR_FILENO) {	111	if (self.handle == os.STDOUT_FILENO or self.handle == os.STDERR_FILENO) {
112	// Use getenvC to workaround https://github.com/ziglang/zig/issues/3511	112	// Use getenvC to workaround https://github.com/ziglang/zig/issues/3511
113	if (os.getenvC("TERM")) \|term\| {	113	if (os.getenvZ("TERM")) \|term\| {
114	if (std.mem.eql(u8, term, "dumb"))	114	if (std.mem.eql(u8, term, "dumb"))
115	return false;	115	return false;
116	}	116	}

lib/std/fs/get_app_data_dir.zig+1-1

...	@@ -24,7 +24,7 @@ pub fn getAppDataDir(allocator: *mem.Allocator, appname: []const u8) GetAppDataD	...	@@ -24,7 +24,7 @@ pub fn getAppDataDir(allocator: *mem.Allocator, appname: []const u8) GetAppDataD
24	)) {	24	)) {
25	os.windows.S_OK => {	25	os.windows.S_OK => {
26	defer os.windows.ole32.CoTaskMemFree(@ptrCast(*c_void, dir_path_ptr));	26	defer os.windows.ole32.CoTaskMemFree(@ptrCast(*c_void, dir_path_ptr));
27	const global_dir = unicode.utf16leToUtf8Alloc(allocator, mem.toSliceConst(u16, dir_path_ptr)) catch \|err\| switch (err) {	27	const global_dir = unicode.utf16leToUtf8Alloc(allocator, mem.spanZ(dir_path_ptr)) catch \|err\| switch (err) {
28	error.UnexpectedSecondSurrogateHalf => return error.AppDataDirUnavailable,	28	error.UnexpectedSecondSurrogateHalf => return error.AppDataDirUnavailable,
29	error.ExpectedSecondSurrogateHalf => return error.AppDataDirUnavailable,	29	error.ExpectedSecondSurrogateHalf => return error.AppDataDirUnavailable,
30	error.DanglingSurrogateHalf => return error.AppDataDirUnavailable,	30	error.DanglingSurrogateHalf => return error.AppDataDirUnavailable,

lib/std/fs/path.zig+14-8

...	@@ -128,11 +128,13 @@ test "join" {	...	@@ -128,11 +128,13 @@ test "join" {
128	testJoinPosix(&[_][]const u8{ "a/", "/c" }, "a/c");	128	testJoinPosix(&[_][]const u8{ "a/", "/c" }, "a/c");
129	}	129	}
130		130
131	pub fn isAbsoluteC(path_c: [*:0]const u8) bool {	131	pub const isAbsoluteC = @compileError("deprecated: renamed to isAbsoluteZ");
		132
		133	pub fn isAbsoluteZ(path_c: [*:0]const u8) bool {
132	if (builtin.os.tag == .windows) {	134	if (builtin.os.tag == .windows) {
133	return isAbsoluteWindowsC(path_c);	135	return isAbsoluteWindowsZ(path_c);
134	} else {	136	} else {
135	return isAbsolutePosixC(path_c);	137	return isAbsolutePosixZ(path_c);
136	}	138	}
137	}	139	}
138		140
...	@@ -172,19 +174,23 @@ pub fn isAbsoluteWindows(path: []const u8) bool {	...	@@ -172,19 +174,23 @@ pub fn isAbsoluteWindows(path: []const u8) bool {
172	}	174	}
173		175
174	pub fn isAbsoluteWindowsW(path_w: [*:0]const u16) bool {	176	pub fn isAbsoluteWindowsW(path_w: [*:0]const u16) bool {
175	return isAbsoluteWindowsImpl(u16, mem.toSliceConst(u16, path_w));	177	return isAbsoluteWindowsImpl(u16, mem.spanZ(path_w));
176	}	178	}
177		179
178	pub fn isAbsoluteWindowsC(path_c: [*:0]const u8) bool {	180	pub const isAbsoluteWindowsC = @compileError("deprecated: renamed to isAbsoluteWindowsZ");
179	return isAbsoluteWindowsImpl(u8, mem.toSliceConst(u8, path_c));	181
		182	pub fn isAbsoluteWindowsZ(path_c: [*:0]const u8) bool {
		183	return isAbsoluteWindowsImpl(u8, mem.spanZ(path_c));
180	}	184	}
181		185
182	pub fn isAbsolutePosix(path: []const u8) bool {	186	pub fn isAbsolutePosix(path: []const u8) bool {
183	return path.len > 0 and path[0] == sep_posix;	187	return path.len > 0 and path[0] == sep_posix;
184	}	188	}
185		189
186	pub fn isAbsolutePosixC(path_c: [*:0]const u8) bool {	190	pub const isAbsolutePosixC = @compileError("deprecated: renamed to isAbsolutePosixZ");
187	return isAbsolutePosix(mem.toSliceConst(u8, path_c));	191
		192	pub fn isAbsolutePosixZ(path_c: [*:0]const u8) bool {
		193	return isAbsolutePosix(mem.spanZ(path_c));
188	}	194	}
189		195
190	test "isAbsoluteWindows" {	196	test "isAbsoluteWindows" {

lib/std/fs/watch.zig+1-1

...	@@ -326,7 +326,7 @@ pub fn Watch(comptime V: type) type {	...	@@ -326,7 +326,7 @@ pub fn Watch(comptime V: type) type {
326	var basename_with_null_consumed = false;	326	var basename_with_null_consumed = false;
327	defer if (!basename_with_null_consumed) self.allocator.free(basename_with_null);	327	defer if (!basename_with_null_consumed) self.allocator.free(basename_with_null);
328		328
329	const wd = try os.inotify_add_watchC(	329	const wd = try os.inotify_add_watchZ(
330	self.os_data.inotify_fd,	330	self.os_data.inotify_fd,
331	dirname_with_null.ptr,	331	dirname_with_null.ptr,
332	os.linux.IN_CLOSE_WRITE \| os.linux.IN_ONLYDIR \| os.linux.IN_EXCL_UNLINK,	332	os.linux.IN_CLOSE_WRITE \| os.linux.IN_ONLYDIR \| os.linux.IN_EXCL_UNLINK,

lib/std/hash/adler.zig+29-8

 @@ -42,18 +42,23 @@ pub const Adler32 = struct {
             s2 %= base;
         } else {
+            const n = nmax / 16; // note: 16 | nmax
             var i: usize = 0;
-            while (i + nmax <= input.len) : (i += nmax) {
-                const n = nmax / 16; // note: 16 | nmax
+            while (i + nmax <= input.len) {
                 var rounds: usize = 0;
                 while (rounds < n) : (rounds += 1) {
                     comptime var j: usize = 0;
                     inline while (j < 16) : (j += 1) {
-                        s1 +%= input[i + n * j];
+                        s1 +%= input[i + j];
                         s2 +%= s1;
                     }
+                    i += 16;
                 }
+                s1 %= base;
+                s2 %= base;
             }
             if (i < input.len) {
 @@ -89,19 +94,35 @@ pub const Adler32 = struct {
 };
 test "adler32 sanity" {
-    testing.expect(Adler32.hash("a") == 0x620062);
+    testing.expectEqual(@as(u32, 0x620062), Adler32.hash("a"));
-    testing.expect(Adler32.hash("example") == 0xbc002ed);
+    testing.expectEqual(@as(u32, 0xbc002ed), Adler32.hash("example"));
 }
 test "adler32 long" {
     const long1 = [_]u8{1} ** 1024;
-    testing.expect(Adler32.hash(long1[0..]) == 0x06780401);
+    testing.expectEqual(@as(u32, 0x06780401), Adler32.hash(long1[0..]));
     const long2 = [_]u8{1} ** 1025;
-    testing.expect(Adler32.hash(long2[0..]) == 0x0a7a0402);
+    testing.expectEqual(@as(u32, 0x0a7a0402), Adler32.hash(long2[0..]));
 }
 test "adler32 very long" {
     const long = [_]u8{1} ** 5553;
-    testing.expect(Adler32.hash(long[0..]) == 0x707f15b2);
+    testing.expectEqual(@as(u32, 0x707f15b2), Adler32.hash(long[0..]));
+}
+test "adler32 very long with variation" {
+    const long = comptime blk: {
+        @setEvalBranchQuota(7000);
+        var result: [6000]u8 = undefined;
+        var i: usize = 0;
+        while (i < result.len) : (i += 1) {
+            result[i] = @truncate(u8, i);
+        }
+        break :blk result;
+    };
+    testing.expectEqual(@as(u32, 0x5af38d6e), std.hash.Adler32.hash(long[0..]));
 }

lib/std/heap.zig+1-2

...	@@ -51,8 +51,7 @@ var wasm_page_allocator_state = Allocator{	...	@@ -51,8 +51,7 @@ var wasm_page_allocator_state = Allocator{
51	.shrinkFn = WasmPageAllocator.shrink,	51	.shrinkFn = WasmPageAllocator.shrink,
52	};	52	};
53		53
54	/// Deprecated. Use `page_allocator`.	54	pub const direct_allocator = @compileError("deprecated; use std.heap.page_allocator");
55	pub const direct_allocator = page_allocator;
56		55
57	const PageAllocator = struct {	56	const PageAllocator = struct {
58	fn alloc(allocator: *Allocator, n: usize, alignment: u29) error{OutOfMemory}![]u8 {	57	fn alloc(allocator: *Allocator, n: usize, alignment: u29) error{OutOfMemory}![]u8 {

lib/std/http/headers.zig+8-8

...	@@ -129,7 +129,7 @@ pub const Headers = struct {	...	@@ -129,7 +129,7 @@ pub const Headers = struct {
129	self.index.deinit();	129	self.index.deinit();
130	}	130	}
131	{	131	{
132	for (self.data.toSliceConst()) \|entry\| {	132	for (self.data.span()) \|entry\| {
133	entry.deinit();	133	entry.deinit();
134	}	134	}
135	self.data.deinit();	135	self.data.deinit();
...	@@ -141,14 +141,14 @@ pub const Headers = struct {	...	@@ -141,14 +141,14 @@ pub const Headers = struct {
141	errdefer other.deinit();	141	errdefer other.deinit();
142	try other.data.ensureCapacity(self.data.len);	142	try other.data.ensureCapacity(self.data.len);
143	try other.index.initCapacity(self.index.entries.len);	143	try other.index.initCapacity(self.index.entries.len);
144	for (self.data.toSliceConst()) \|entry\| {	144	for (self.data.span()) \|entry\| {
145	try other.append(entry.name, entry.value, entry.never_index);	145	try other.append(entry.name, entry.value, entry.never_index);
146	}	146	}
147	return other;	147	return other;
148	}	148	}
149		149
150	pub fn toSlice(self: Self) []const HeaderEntry {	150	pub fn toSlice(self: Self) []const HeaderEntry {
151	return self.data.toSliceConst();	151	return self.data.span();
152	}	152	}
153		153
154	pub fn append(self: *Self, name: []const u8, value: []const u8, never_index: ?bool) !void {	154	pub fn append(self: *Self, name: []const u8, value: []const u8, never_index: ?bool) !void {
...	@@ -279,7 +279,7 @@ pub const Headers = struct {	...	@@ -279,7 +279,7 @@ pub const Headers = struct {
279		279
280	const buf = try allocator.alloc(HeaderEntry, dex.len);	280	const buf = try allocator.alloc(HeaderEntry, dex.len);
281	var n: usize = 0;	281	var n: usize = 0;
282	for (dex.toSliceConst()) \|idx\| {	282	for (dex.span()) \|idx\| {
283	buf[n] = self.data.at(idx);	283	buf[n] = self.data.at(idx);
284	n += 1;	284	n += 1;
285	}	285	}
...	@@ -302,7 +302,7 @@ pub const Headers = struct {	...	@@ -302,7 +302,7 @@ pub const Headers = struct {
302	// adapted from mem.join	302	// adapted from mem.join
303	const total_len = blk: {	303	const total_len = blk: {
304	var sum: usize = dex.len - 1; // space for separator(s)	304	var sum: usize = dex.len - 1; // space for separator(s)
305	for (dex.toSliceConst()) \|idx\|	305	for (dex.span()) \|idx\|
306	sum += self.data.at(idx).value.len;	306	sum += self.data.at(idx).value.len;
307	break :blk sum;	307	break :blk sum;
308	};	308	};
...	@@ -334,7 +334,7 @@ pub const Headers = struct {	...	@@ -334,7 +334,7 @@ pub const Headers = struct {
334	}	334	}
335	}	335	}
336	{ // fill up indexes again; we know capacity is fine from before	336	{ // fill up indexes again; we know capacity is fine from before
337	for (self.data.toSliceConst()) \|entry, i\| {	337	for (self.data.span()) \|entry, i\| {
338	var dex = &self.index.get(entry.name).?.value;	338	var dex = &self.index.get(entry.name).?.value;
339	dex.appendAssumeCapacity(i);	339	dex.appendAssumeCapacity(i);
340	}	340	}
...	@@ -495,8 +495,8 @@ test "Headers.getIndices" {	...	@@ -495,8 +495,8 @@ test "Headers.getIndices" {
495	try h.append("set-cookie", "y=2", null);	495	try h.append("set-cookie", "y=2", null);
496		496
497	testing.expect(null == h.getIndices("not-present"));	497	testing.expect(null == h.getIndices("not-present"));
498	testing.expectEqualSlices(usize, &[_]usize{0}, h.getIndices("foo").?.toSliceConst());	498	testing.expectEqualSlices(usize, &[_]usize{0}, h.getIndices("foo").?.span());
499	testing.expectEqualSlices(usize, &[_]usize{ 1, 2 }, h.getIndices("set-cookie").?.toSliceConst());	499	testing.expectEqualSlices(usize, &[_]usize{ 1, 2 }, h.getIndices("set-cookie").?.span());
500	}	500	}
501		501
502	test "Headers.get" {	502	test "Headers.get" {

lib/std/io.zig+17-10

 @@ -128,16 +128,6 @@ pub const BufferedAtomicFile = @import("io/buffered_atomic_file.zig").BufferedAt
 pub const StreamSource = @import("io/stream_source.zig").StreamSource;
-/// Deprecated; use `std.fs.Dir.writeFile`.
-pub fn writeFile(path: []const u8, data: []const u8) !void {
-    return fs.cwd().writeFile(path, data);
-}
-/// Deprecated; use `std.fs.Dir.readFileAlloc`.
-pub fn readFileAlloc(allocator: *mem.Allocator, path: []const u8) ![]u8 {
-    return fs.cwd().readFileAlloc(allocator, path, math.maxInt(usize));
-}
 /// An OutStream that doesn't write to anything.
 pub const null_out_stream = @as(NullOutStream, .{ .context = {} });
 @@ -151,5 +141,22 @@ test "null_out_stream" {
 }
 test "" {
+    _ = @import("io/bit_in_stream.zig");
+    _ = @import("io/bit_out_stream.zig");
+    _ = @import("io/buffered_atomic_file.zig");
+    _ = @import("io/buffered_in_stream.zig");
+    _ = @import("io/buffered_out_stream.zig");
+    _ = @import("io/c_out_stream.zig");
+    _ = @import("io/counting_out_stream.zig");
+    _ = @import("io/fixed_buffer_stream.zig");
+    _ = @import("io/in_stream.zig");
+    _ = @import("io/out_stream.zig");
+    _ = @import("io/peek_stream.zig");
+    _ = @import("io/seekable_stream.zig");
+    _ = @import("io/serialization.zig");
+    _ = @import("io/stream_source.zig");
     _ = @import("io/test.zig");
 }
+pub const writeFile = @compileError("deprecated: use std.fs.Dir.writeFile with math.maxInt(usize)");
+pub const readFileAlloc = @compileError("deprecated: use std.fs.Dir.readFileAlloc");

lib/std/io/buffered_atomic_file.zig+2-1

...	@@ -15,6 +15,7 @@ pub const BufferedAtomicFile = struct {	...	@@ -15,6 +15,7 @@ pub const BufferedAtomicFile = struct {
15		15
16	/// TODO when https://github.com/ziglang/zig/issues/2761 is solved	16	/// TODO when https://github.com/ziglang/zig/issues/2761 is solved
17	/// this API will not need an allocator	17	/// this API will not need an allocator
		18	/// TODO integrate this with Dir API
18	pub fn create(allocator: mem.Allocator, dest_path: []const u8) !BufferedAtomicFile {	19	pub fn create(allocator: mem.Allocator, dest_path: []const u8) !BufferedAtomicFile {
19	var self = try allocator.create(BufferedAtomicFile);	20	var self = try allocator.create(BufferedAtomicFile);
20	self.* = BufferedAtomicFile{	21	self.* = BufferedAtomicFile{
...	@@ -25,7 +26,7 @@ pub const BufferedAtomicFile = struct {	...	@@ -25,7 +26,7 @@ pub const BufferedAtomicFile = struct {
25	};	26	};
26	errdefer allocator.destroy(self);	27	errdefer allocator.destroy(self);
27		28
28	self.atomic_file = try fs.AtomicFile.init(dest_path, File.default_mode);	29	self.atomic_file = try fs.cwd().atomicFile(dest_path, .{});
29	errdefer self.atomic_file.deinit();	30	errdefer self.atomic_file.deinit();
30		31
31	self.file_stream = self.atomic_file.file.outStream();	32	self.file_stream = self.atomic_file.file.outStream();

lib/std/io/c_out_stream.zig+2-2

...	@@ -36,9 +36,9 @@ test "" {	...	@@ -36,9 +36,9 @@ test "" {
36	const out_file = std.c.fopen(filename, "w") orelse return error.UnableToOpenTestFile;	36	const out_file = std.c.fopen(filename, "w") orelse return error.UnableToOpenTestFile;
37	defer {	37	defer {
38	_ = std.c.fclose(out_file);	38	_ = std.c.fclose(out_file);
39	fs.cwd().deleteFileC(filename) catch {};	39	std.fs.cwd().deleteFileZ(filename) catch {};
40	}	40	}
41		41
42	const out_stream = &io.COutStream.init(out_file).stream;	42	const out_stream = cOutStream(out_file);
43	try out_stream.print("hi: {}\n", .{@as(i32, 123)});	43	try out_stream.print("hi: {}\n", .{@as(i32, 123)});
44	}	44	}

lib/std/io/in_stream.zig+1-8

 @@ -3,7 +3,6 @@ const builtin = std.builtin;
 const math = std.math;
 const assert = std.debug.assert;
 const mem = std.mem;
-const Buffer = std.Buffer;
 const testing = std.testing;
 pub fn InStream(
 @@ -48,13 +47,7 @@ pub fn InStream(
             if (amt_read < buf.len) return error.EndOfStream;
         }
-        /// Deprecated: use `readAllArrayList`.
+        pub const readAllBuffer = @compileError("deprecated; use readAllArrayList()");
-        pub fn readAllBuffer(self: Self, buffer: *Buffer, max_size: usize) !void {
-            buffer.list.shrink(0);
-            try self.readAllArrayList(&buffer.list, max_size);
-            errdefer buffer.shrink(0);
-            try buffer.list.append(0);
-        }
         /// Appends to the `std.ArrayList` contents by reading from the stream until end of stream is found.
         /// If the number of bytes appended would exceed `max_append_size`, `error.StreamTooLong` is returned

lib/std/io/peek_stream.zig+4-4

...	@@ -24,7 +24,7 @@ pub fn PeekStream(	...	@@ -24,7 +24,7 @@ pub fn PeekStream(
24	.Static => struct {	24	.Static => struct {
25	pub fn init(base: InStreamType) Self {	25	pub fn init(base: InStreamType) Self {
26	return .{	26	return .{
27	.base = base,	27	.unbuffered_in_stream = base,
28	.fifo = FifoType.init(),	28	.fifo = FifoType.init(),
29	};	29	};
30	}	30	}
...	@@ -32,7 +32,7 @@ pub fn PeekStream(	...	@@ -32,7 +32,7 @@ pub fn PeekStream(
32	.Slice => struct {	32	.Slice => struct {
33	pub fn init(base: InStreamType, buf: []u8) Self {	33	pub fn init(base: InStreamType, buf: []u8) Self {
34	return .{	34	return .{
35	.base = base,	35	.unbuffered_in_stream = base,
36	.fifo = FifoType.init(buf),	36	.fifo = FifoType.init(buf),
37	};	37	};
38	}	38	}
...	@@ -40,7 +40,7 @@ pub fn PeekStream(	...	@@ -40,7 +40,7 @@ pub fn PeekStream(
40	.Dynamic => struct {	40	.Dynamic => struct {
41	pub fn init(base: InStreamType, allocator: *mem.Allocator) Self {	41	pub fn init(base: InStreamType, allocator: *mem.Allocator) Self {
42	return .{	42	return .{
43	.base = base,	43	.unbuffered_in_stream = base,
44	.fifo = FifoType.init(allocator),	44	.fifo = FifoType.init(allocator),
45	};	45	};
46	}	46	}
...	@@ -61,7 +61,7 @@ pub fn PeekStream(	...	@@ -61,7 +61,7 @@ pub fn PeekStream(
61	if (dest_index == dest.len) return dest_index;	61	if (dest_index == dest.len) return dest_index;
62		62
63	// ask the backing stream for more	63	// ask the backing stream for more
64	dest_index += try self.base.read(dest[dest_index..]);	64	dest_index += try self.unbuffered_in_stream.read(dest[dest_index..]);
65	return dest_index;	65	return dest_index;
66	}	66	}
67		67

lib/std/io/serialization.zig+50-49

lib/std/json.zig+328-95

...	@@ -1233,42 +1233,119 @@ pub const Value = union(enum) {	...	@@ -1233,42 +1233,119 @@ pub const Value = union(enum) {
1233	Array: Array,	1233	Array: Array,
1234	Object: ObjectMap,	1234	Object: ObjectMap,
1235		1235
		1236	pub fn jsonStringify(
		1237	value: @This(),
		1238	options: StringifyOptions,
		1239	out_stream: var,
		1240	) @TypeOf(out_stream).Error!void {
		1241	switch (value) {
		1242	.Null => try stringify(null, options, out_stream),
		1243	.Bool => \|inner\| try stringify(inner, options, out_stream),
		1244	.Integer => \|inner\| try stringify(inner, options, out_stream),
		1245	.Float => \|inner\| try stringify(inner, options, out_stream),
		1246	.String => \|inner\| try stringify(inner, options, out_stream),
		1247	.Array => \|inner\| try stringify(inner.span(), options, out_stream),
		1248	.Object => \|inner\| {
		1249	try out_stream.writeByte('{');
		1250	var field_output = false;
		1251	var child_options = options;
		1252	if (child_options.whitespace) \|*child_whitespace\| {
		1253	child_whitespace.indent_level += 1;
		1254	}
		1255	var it = inner.iterator();
		1256	while (it.next()) \|entry\| {
		1257	if (!field_output) {
		1258	field_output = true;
		1259	} else {
		1260	try out_stream.writeByte(',');
		1261	}
		1262	if (child_options.whitespace) \|child_whitespace\| {
		1263	try out_stream.writeByte('\n');
		1264	try child_whitespace.outputIndent(out_stream);
		1265	}
		1266
		1267	try stringify(entry.key, options, out_stream);
		1268	try out_stream.writeByte(':');
		1269	if (child_options.whitespace) \|child_whitespace\| {
		1270	if (child_whitespace.separator) {
		1271	try out_stream.writeByte(' ');
		1272	}
		1273	}
		1274	try stringify(entry.value, child_options, out_stream);
		1275	}
		1276	if (field_output) {
		1277	if (options.whitespace) \|whitespace\| {
		1278	try out_stream.writeByte('\n');
		1279	try whitespace.outputIndent(out_stream);
		1280	}
		1281	}
		1282	try out_stream.writeByte('}');
		1283	},
		1284	}
		1285	}
		1286
1236	pub fn dump(self: Value) void {	1287	pub fn dump(self: Value) void {
1237	var held = std.debug.getStderrMutex().acquire();	1288	var held = std.debug.getStderrMutex().acquire();
1238	defer held.release();	1289	defer held.release();
1239		1290
1240	const stderr = std.debug.getStderrStream();	1291	const stderr = std.debug.getStderrStream();
1241	self.dumpStream(stderr, 1024) catch return;	1292	std.json.stringify(self, std.json.StringifyOptions{ .whitespace = null }, stderr) catch return;
1242	}	1293	}
		1294	};
1243		1295
1244	pub fn dumpIndent(self: Value, comptime indent: usize) void {	1296	test "Value.jsonStringify" {
1245	if (indent == 0) {	1297	{
1246	self.dump();	1298	var buffer: [10]u8 = undefined;
1247	} else {	1299	var fbs = std.io.fixedBufferStream(&buffer);
1248	var held = std.debug.getStderrMutex().acquire();	1300	try @as(Value, .Null).jsonStringify(.{}, fbs.outStream());
1249	defer held.release();	1301	testing.expectEqualSlices(u8, fbs.getWritten(), "null");
1250
1251	const stderr = std.debug.getStderrStream();
1252	self.dumpStreamIndent(indent, stderr, 1024) catch return;
1253	}
1254	}	1302	}
1255		1303	{
1256	pub fn dumpStream(self: @This(), stream: var, comptime max_depth: usize) !void {	1304	var buffer: [10]u8 = undefined;
1257	var w = std.json.WriteStream(@TypeOf(stream).Child, max_depth).init(stream);	1305	var fbs = std.io.fixedBufferStream(&buffer);
1258	w.newline = "";	1306	try (Value{ .Bool = true }).jsonStringify(.{}, fbs.outStream());
1259	w.one_indent = "";	1307	testing.expectEqualSlices(u8, fbs.getWritten(), "true");
1260	w.space = "";
1261	try w.emitJson(self);
1262	}	1308	}
1263		1309	{
1264	pub fn dumpStreamIndent(self: @This(), comptime indent: usize, stream: var, comptime max_depth: usize) !void {	1310	var buffer: [10]u8 = undefined;
1265	var one_indent = " " ** indent;	1311	var fbs = std.io.fixedBufferStream(&buffer);
1266		1312	try (Value{ .Integer = 42 }).jsonStringify(.{}, fbs.outStream());
1267	var w = std.json.WriteStream(@TypeOf(stream).Child, max_depth).init(stream);	1313	testing.expectEqualSlices(u8, fbs.getWritten(), "42");
1268	w.one_indent = one_indent;
1269	try w.emitJson(self);
1270	}	1314	}
1271	};	1315	{
		1316	var buffer: [10]u8 = undefined;
		1317	var fbs = std.io.fixedBufferStream(&buffer);
		1318	try (Value{ .Float = 42 }).jsonStringify(.{}, fbs.outStream());
		1319	testing.expectEqualSlices(u8, fbs.getWritten(), "4.2e+01");
		1320	}
		1321	{
		1322	var buffer: [10]u8 = undefined;
		1323	var fbs = std.io.fixedBufferStream(&buffer);
		1324	try (Value{ .String = "weeee" }).jsonStringify(.{}, fbs.outStream());
		1325	testing.expectEqualSlices(u8, fbs.getWritten(), "\"weeee\"");
		1326	}
		1327	{
		1328	var buffer: [10]u8 = undefined;
		1329	var fbs = std.io.fixedBufferStream(&buffer);
		1330	try (Value{
		1331	.Array = Array.fromOwnedSlice(undefined, &[_]Value{
		1332	.{ .Integer = 1 },
		1333	.{ .Integer = 2 },
		1334	.{ .Integer = 3 },
		1335	}),
		1336	}).jsonStringify(.{}, fbs.outStream());
		1337	testing.expectEqualSlices(u8, fbs.getWritten(), "[1,2,3]");
		1338	}
		1339	{
		1340	var buffer: [10]u8 = undefined;
		1341	var fbs = std.io.fixedBufferStream(&buffer);
		1342	var obj = ObjectMap.init(testing.allocator);
		1343	defer obj.deinit();
		1344	try obj.putNoClobber("a", .{ .String = "b" });
		1345	try (Value{ .Object = obj }).jsonStringify(.{}, fbs.outStream());
		1346	testing.expectEqualSlices(u8, fbs.getWritten(), "{\"a\":\"b\"}");
		1347	}
		1348	}
1272		1349
1273	pub const ParseOptions = struct {	1350	pub const ParseOptions = struct {
1274	allocator: ?*Allocator = null,	1351	allocator: ?*Allocator = null,
...	@@ -1658,9 +1735,6 @@ test "parse into tagged union" {	...	@@ -1658,9 +1735,6 @@ test "parse into tagged union" {
1658	}	1735	}
1659		1736
1660	test "parseFree descends into tagged union" {	1737	test "parseFree descends into tagged union" {
1661	// tagged unions are broken on arm64: https://github.com/ziglang/zig/issues/4492
1662	if (std.builtin.arch == .aarch64) return error.SkipZigTest;
1663
1664	var fail_alloc = testing.FailingAllocator.init(testing.allocator, 1);	1738	var fail_alloc = testing.FailingAllocator.init(testing.allocator, 1);
1665	const options = ParseOptions{ .allocator = &fail_alloc.allocator };	1739	const options = ParseOptions{ .allocator = &fail_alloc.allocator };
1666	const T = union(enum) {	1740	const T = union(enum) {
...	@@ -1947,7 +2021,7 @@ pub const Parser = struct {	...	@@ -1947,7 +2021,7 @@ pub const Parser = struct {
1947	}	2021	}
1948		2022
1949	fn pushToParent(p: Parser, value: const Value) !void {	2023	fn pushToParent(p: Parser, value: const Value) !void {
1950	switch (p.stack.toSlice()[p.stack.len - 1]) {	2024	switch (p.stack.span()[p.stack.len - 1]) {
1951	// Object Parent -> [ ..., object, <key>, value ]	2025	// Object Parent -> [ ..., object, <key>, value ]
1952	Value.String => \|key\| {	2026	Value.String => \|key\| {
1953	_ = p.stack.pop();	2027	_ = p.stack.pop();
...	@@ -2244,11 +2318,86 @@ test "string copy option" {	...	@@ -2244,11 +2318,86 @@ test "string copy option" {
2244	}	2318	}
2245		2319
2246	pub const StringifyOptions = struct {	2320	pub const StringifyOptions = struct {
2247	// TODO: indentation options?	2321	pub const Whitespace = struct {
2248	// TODO: make escaping '/' in strings optional?	2322	/// How many indentation levels deep are we?
2249	// TODO: allow picking if []u8 is string or array?	2323	indent_level: usize = 0,
		2324
		2325	pub const Indentation = union(enum) {
		2326	Space: u8,
		2327	Tab: void,
		2328	};
		2329
		2330	/// What character(s) should be used for indentation?
		2331	indent: Indentation = Indentation{ .Space = 4 },
		2332
		2333	fn outputIndent(
		2334	whitespace: @This(),
		2335	out_stream: var,
		2336	) @TypeOf(out_stream).Error!void {
		2337	var char: u8 = undefined;
		2338	var n_chars: usize = undefined;
		2339	switch (whitespace.indent) {
		2340	.Space => \|n_spaces\| {
		2341	char = ' ';
		2342	n_chars = n_spaces;
		2343	},
		2344	.Tab => {
		2345	char = '\t';
		2346	n_chars = 1;
		2347	},
		2348	}
		2349	n_chars *= whitespace.indent_level;
		2350	try out_stream.writeByteNTimes(char, n_chars);
		2351	}
		2352
		2353	/// After a colon, should whitespace be inserted?
		2354	separator: bool = true,
		2355	};
		2356
		2357	/// Controls the whitespace emitted
		2358	whitespace: ?Whitespace = null,
		2359
		2360	/// Should []u8 be serialised as a string? or an array?
		2361	pub const StringOptions = union(enum) {
		2362	Array,
		2363
		2364	/// String output options
		2365	const StringOutputOptions = struct {
		2366	/// Should '/' be escaped in strings?
		2367	escape_solidus: bool = false,
		2368
		2369	/// Should unicode characters be escaped in strings?
		2370	escape_unicode: bool = false,
		2371	};
		2372	String: StringOutputOptions,
		2373	};
		2374
		2375	string: StringOptions = StringOptions{ .String = .{} },
2250	};	2376	};
2251		2377
		2378	fn outputUnicodeEscape(
		2379	codepoint: u21,
		2380	out_stream: var,
		2381	) !void {
		2382	if (codepoint <= 0xFFFF) {
		2383	// If the character is in the Basic Multilingual Plane (U+0000 through U+FFFF),
		2384	// then it may be represented as a six-character sequence: a reverse solidus, followed
		2385	// by the lowercase letter u, followed by four hexadecimal digits that encode the character's code point.
		2386	try out_stream.writeAll("\\u");
		2387	try std.fmt.formatIntValue(codepoint, "x", std.fmt.FormatOptions{ .width = 4, .fill = '0' }, out_stream);
		2388	} else {
		2389	assert(codepoint <= 0x10FFFF);
		2390	// To escape an extended character that is not in the Basic Multilingual Plane,
		2391	// the character is represented as a 12-character sequence, encoding the UTF-16 surrogate pair.
		2392	const high = @intCast(u16, (codepoint - 0x10000) >> 10) + 0xD800;
		2393	const low = @intCast(u16, codepoint & 0x3FF) + 0xDC00;
		2394	try out_stream.writeAll("\\u");
		2395	try std.fmt.formatIntValue(high, "x", std.fmt.FormatOptions{ .width = 4, .fill = '0' }, out_stream);
		2396	try out_stream.writeAll("\\u");
		2397	try std.fmt.formatIntValue(low, "x", std.fmt.FormatOptions{ .width = 4, .fill = '0' }, out_stream);
		2398	}
		2399	}
		2400
2252	pub fn stringify(	2401	pub fn stringify(
2253	value: var,	2402	value: var,
2254	options: StringifyOptions,	2403	options: StringifyOptions,
...	@@ -2265,11 +2414,14 @@ pub fn stringify(	...	@@ -2265,11 +2414,14 @@ pub fn stringify(
2265	.Bool => {	2414	.Bool => {
2266	return out_stream.writeAll(if (value) "true" else "false");	2415	return out_stream.writeAll(if (value) "true" else "false");
2267	},	2416	},
		2417	.Null => {
		2418	return out_stream.writeAll("null");
		2419	},
2268	.Optional => {	2420	.Optional => {
2269	if (value) \|payload\| {	2421	if (value) \|payload\| {
2270	return try stringify(payload, options, out_stream);	2422	return try stringify(payload, options, out_stream);
2271	} else {	2423	} else {
2272	return out_stream.writeAll("null");	2424	return try stringify(null, options, out_stream);
2273	}	2425	}
2274	},	2426	},
2275	.Enum => {	2427	.Enum => {
...	@@ -2300,8 +2452,12 @@ pub fn stringify(	...	@@ -2300,8 +2452,12 @@ pub fn stringify(
2300	return value.jsonStringify(options, out_stream);	2452	return value.jsonStringify(options, out_stream);
2301	}	2453	}
2302		2454
2303	try out_stream.writeAll("{");	2455	try out_stream.writeByte('{');
2304	comptime var field_output = false;	2456	comptime var field_output = false;
		2457	var child_options = options;
		2458	if (child_options.whitespace) \|*child_whitespace\| {
		2459	child_whitespace.indent_level += 1;
		2460	}
2305	inline for (S.fields) \|Field, field_i\| {	2461	inline for (S.fields) \|Field, field_i\| {
2306	// don't include void fields	2462	// don't include void fields
2307	if (Field.field_type == void) continue;	2463	if (Field.field_type == void) continue;
...	@@ -2309,14 +2465,28 @@ pub fn stringify(	...	@@ -2309,14 +2465,28 @@ pub fn stringify(
2309	if (!field_output) {	2465	if (!field_output) {
2310	field_output = true;	2466	field_output = true;
2311	} else {	2467	} else {
2312	try out_stream.writeAll(",");	2468	try out_stream.writeByte(',');
		2469	}
		2470	if (child_options.whitespace) \|child_whitespace\| {
		2471	try out_stream.writeByte('\n');
		2472	try child_whitespace.outputIndent(out_stream);
2313	}	2473	}
2314
2315	try stringify(Field.name, options, out_stream);	2474	try stringify(Field.name, options, out_stream);
2316	try out_stream.writeAll(":");	2475	try out_stream.writeByte(':');
2317	try stringify(@field(value, Field.name), options, out_stream);	2476	if (child_options.whitespace) \|child_whitespace\| {
		2477	if (child_whitespace.separator) {
		2478	try out_stream.writeByte(' ');
		2479	}
		2480	}
		2481	try stringify(@field(value, Field.name), child_options, out_stream);
		2482	}
		2483	if (field_output) {
		2484	if (options.whitespace) \|whitespace\| {
		2485	try out_stream.writeByte('\n');
		2486	try whitespace.outputIndent(out_stream);
		2487	}
2318	}	2488	}
2319	try out_stream.writeAll("}");	2489	try out_stream.writeByte('}');
2320	return;	2490	return;
2321	},	2491	},
2322	.Pointer => \|ptr_info\| switch (ptr_info.size) {	2492	.Pointer => \|ptr_info\| switch (ptr_info.size) {
...	@@ -2332,17 +2502,26 @@ pub fn stringify(	...	@@ -2332,17 +2502,26 @@ pub fn stringify(
2332	},	2502	},
2333	// TODO: .Many when there is a sentinel (waiting for https://github.com/ziglang/zig/pull/3972)	2503	// TODO: .Many when there is a sentinel (waiting for https://github.com/ziglang/zig/pull/3972)
2334	.Slice => {	2504	.Slice => {
2335	if (ptr_info.child == u8 and std.unicode.utf8ValidateSlice(value)) {	2505	if (ptr_info.child == u8 and options.string == .String and std.unicode.utf8ValidateSlice(value)) {
2336	try out_stream.writeAll("\"");	2506	try out_stream.writeByte('\"');
2337	var i: usize = 0;	2507	var i: usize = 0;
2338	while (i < value.len) : (i += 1) {	2508	while (i < value.len) : (i += 1) {
2339	switch (value[i]) {	2509	switch (value[i]) {
2340	// normal ascii characters	2510	// normal ascii character
2341	0x20...0x21, 0x23...0x2E, 0x30...0x5B, 0x5D...0x7F => try out_stream.writeAll(value[i .. i + 1]),	2511	0x20...0x21, 0x23...0x2E, 0x30...0x5B, 0x5D...0x7F => \|c\| try out_stream.writeByte(c),
2342	// control characters with short escapes	2512	// only 2 characters that must be escaped
2343	'\\' => try out_stream.writeAll("\\\\"),	2513	'\\' => try out_stream.writeAll("\\\\"),
2344	'\"' => try out_stream.writeAll("\\\""),	2514	'\"' => try out_stream.writeAll("\\\""),
2345	'/' => try out_stream.writeAll("\\/"),	2515	// solidus is optional to escape
		2516	'/' => {
		2517	if (options.string.String.escape_solidus) {
		2518	try out_stream.writeAll("\\/");
		2519	} else {
		2520	try out_stream.writeByte('\\');
		2521	}
		2522	},
		2523	// control characters with short escapes
		2524	// TODO: option to switch between unicode and 'short' forms?
2346	0x8 => try out_stream.writeAll("\\b"),	2525	0x8 => try out_stream.writeAll("\\b"),
2347	0xC => try out_stream.writeAll("\\f"),	2526	0xC => try out_stream.writeAll("\\f"),
2348	'\n' => try out_stream.writeAll("\\n"),	2527	'\n' => try out_stream.writeAll("\\n"),
...	@@ -2350,39 +2529,43 @@ pub fn stringify(	...	@@ -2350,39 +2529,43 @@ pub fn stringify(
2350	'\t' => try out_stream.writeAll("\\t"),	2529	'\t' => try out_stream.writeAll("\\t"),
2351	else => {	2530	else => {
2352	const ulen = std.unicode.utf8ByteSequenceLength(value[i]) catch unreachable;	2531	const ulen = std.unicode.utf8ByteSequenceLength(value[i]) catch unreachable;
2353	const codepoint = std.unicode.utf8Decode(value[i .. i + ulen]) catch unreachable;	2532	// control characters (only things left with 1 byte length) should always be printed as unicode escapes
2354	if (codepoint <= 0xFFFF) {	2533	if (ulen == 1 or options.string.String.escape_unicode) {
2355	// If the character is in the Basic Multilingual Plane (U+0000 through U+FFFF),	2534	const codepoint = std.unicode.utf8Decode(value[i .. i + ulen]) catch unreachable;
2356	// then it may be represented as a six-character sequence: a reverse solidus, followed	2535	try outputUnicodeEscape(codepoint, out_stream);
2357	// by the lowercase letter u, followed by four hexadecimal digits that encode the character's code point.
2358	try out_stream.writeAll("\\u");
2359	try std.fmt.formatIntValue(codepoint, "x", std.fmt.FormatOptions{ .width = 4, .fill = '0' }, out_stream);
2360	} else {	2536	} else {
2361	// To escape an extended character that is not in the Basic Multilingual Plane,	2537	try out_stream.writeAll(value[i .. i + ulen]);
2362	// the character is represented as a 12-character sequence, encoding the UTF-16 surrogate pair.
2363	const high = @intCast(u16, (codepoint - 0x10000) >> 10) + 0xD800;
2364	const low = @intCast(u16, codepoint & 0x3FF) + 0xDC00;
2365	try out_stream.writeAll("\\u");
2366	try std.fmt.formatIntValue(high, "x", std.fmt.FormatOptions{ .width = 4, .fill = '0' }, out_stream);
2367	try out_stream.writeAll("\\u");
2368	try std.fmt.formatIntValue(low, "x", std.fmt.FormatOptions{ .width = 4, .fill = '0' }, out_stream);
2369	}	2538	}
2370	i += ulen - 1;	2539	i += ulen - 1;
2371	},	2540	},
2372	}	2541	}
2373	}	2542	}
2374	try out_stream.writeAll("\"");	2543	try out_stream.writeByte('\"');
2375	return;	2544	return;
2376	}	2545	}
2377		2546
2378	try out_stream.writeAll("[");	2547	try out_stream.writeByte('[');
		2548	var child_options = options;
		2549	if (child_options.whitespace) \|*whitespace\| {
		2550	whitespace.indent_level += 1;
		2551	}
2379	for (value) \|x, i\| {	2552	for (value) \|x, i\| {
2380	if (i != 0) {	2553	if (i != 0) {
2381	try out_stream.writeAll(",");	2554	try out_stream.writeByte(',');
		2555	}
		2556	if (child_options.whitespace) \|child_whitespace\| {
		2557	try out_stream.writeByte('\n');
		2558	try child_whitespace.outputIndent(out_stream);
2382	}	2559	}
2383	try stringify(x, options, out_stream);	2560	try stringify(x, child_options, out_stream);
2384	}	2561	}
2385	try out_stream.writeAll("]");	2562	if (value.len != 0) {
		2563	if (options.whitespace) \|whitespace\| {
		2564	try out_stream.writeByte('\n');
		2565	try whitespace.outputIndent(out_stream);
		2566	}
		2567	}
		2568	try out_stream.writeByte(']');
2386	return;	2569	return;
2387	},	2570	},
2388	else => @compileError("Unable to stringify type '" ++ @typeName(T) ++ "'"),	2571	else => @compileError("Unable to stringify type '" ++ @typeName(T) ++ "'"),
...	@@ -2393,7 +2576,7 @@ pub fn stringify(	...	@@ -2393,7 +2576,7 @@ pub fn stringify(
2393	unreachable;	2576	unreachable;
2394	}	2577	}
2395		2578
2396	fn teststringify(expected: []const u8, value: var) !void {	2579	fn teststringify(expected: []const u8, value: var, options: StringifyOptions) !void {
2397	const ValidationOutStream = struct {	2580	const ValidationOutStream = struct {
2398	const Self = @This();	2581	const Self = @This();
2399	pub const OutStream = std.io.OutStream(*Self, Error, write);	2582	pub const OutStream = std.io.OutStream(*Self, Error, write);
...	@@ -2445,55 +2628,105 @@ fn teststringify(expected: []const u8, value: var) !void {	...	@@ -2445,55 +2628,105 @@ fn teststringify(expected: []const u8, value: var) !void {
2445	};	2628	};
2446		2629
2447	var vos = ValidationOutStream.init(expected);	2630	var vos = ValidationOutStream.init(expected);
2448	try stringify(value, StringifyOptions{}, vos.outStream());	2631	try stringify(value, options, vos.outStream());
2449	if (vos.expected_remaining.len > 0) return error.NotEnoughData;	2632	if (vos.expected_remaining.len > 0) return error.NotEnoughData;
2450	}	2633	}
2451		2634
2452	test "stringify basic types" {	2635	test "stringify basic types" {
2453	try teststringify("false", false);	2636	try teststringify("false", false, StringifyOptions{});
2454	try teststringify("true", true);	2637	try teststringify("true", true, StringifyOptions{});
2455	try teststringify("null", @as(?u8, null));	2638	try teststringify("null", @as(?u8, null), StringifyOptions{});
2456	try teststringify("null", @as(?*u32, null));	2639	try teststringify("null", @as(?*u32, null), StringifyOptions{});
2457	try teststringify("42", 42);	2640	try teststringify("42", 42, StringifyOptions{});
2458	try teststringify("4.2e+01", 42.0);	2641	try teststringify("4.2e+01", 42.0, StringifyOptions{});
2459	try teststringify("42", @as(u8, 42));	2642	try teststringify("42", @as(u8, 42), StringifyOptions{});
2460	try teststringify("42", @as(u128, 42));	2643	try teststringify("42", @as(u128, 42), StringifyOptions{});
2461	try teststringify("4.2e+01", @as(f32, 42));	2644	try teststringify("4.2e+01", @as(f32, 42), StringifyOptions{});
2462	try teststringify("4.2e+01", @as(f64, 42));	2645	try teststringify("4.2e+01", @as(f64, 42), StringifyOptions{});
2463	}	2646	}
2464		2647
2465	test "stringify string" {	2648	test "stringify string" {
2466	try teststringify("\"hello\"", "hello");	2649	try teststringify("\"hello\"", "hello", StringifyOptions{});
2467	try teststringify("\"with\\nescapes\\r\"", "with\nescapes\r");	2650	try teststringify("\"with\\nescapes\\r\"", "with\nescapes\r", StringifyOptions{});
2468	try teststringify("\"with unicode\\u0001\"", "with unicode\u{1}");	2651	try teststringify("\"with\\nescapes\\r\"", "with\nescapes\r", StringifyOptions{ .string = .{ .String = .{ .escape_unicode = true } } });
2469	try teststringify("\"with unicode\\u0080\"", "with unicode\u{80}");	2652	try teststringify("\"with unicode\\u0001\"", "with unicode\u{1}", StringifyOptions{});
2470	try teststringify("\"with unicode\\u00ff\"", "with unicode\u{FF}");	2653	try teststringify("\"with unicode\\u0001\"", "with unicode\u{1}", StringifyOptions{ .string = .{ .String = .{ .escape_unicode = true } } });
2471	try teststringify("\"with unicode\\u0100\"", "with unicode\u{100}");	2654	try teststringify("\"with unicode\u{80}\"", "with unicode\u{80}", StringifyOptions{});
2472	try teststringify("\"with unicode\\u0800\"", "with unicode\u{800}");	2655	try teststringify("\"with unicode\\u0080\"", "with unicode\u{80}", StringifyOptions{ .string = .{ .String = .{ .escape_unicode = true } } });
2473	try teststringify("\"with unicode\\u8000\"", "with unicode\u{8000}");	2656	try teststringify("\"with unicode\u{FF}\"", "with unicode\u{FF}", StringifyOptions{});
2474	try teststringify("\"with unicode\\ud799\"", "with unicode\u{D799}");	2657	try teststringify("\"with unicode\\u00ff\"", "with unicode\u{FF}", StringifyOptions{ .string = .{ .String = .{ .escape_unicode = true } } });
2475	try teststringify("\"with unicode\\ud800\\udc00\"", "with unicode\u{10000}");	2658	try teststringify("\"with unicode\u{100}\"", "with unicode\u{100}", StringifyOptions{});
2476	try teststringify("\"with unicode\\udbff\\udfff\"", "with unicode\u{10FFFF}");	2659	try teststringify("\"with unicode\\u0100\"", "with unicode\u{100}", StringifyOptions{ .string = .{ .String = .{ .escape_unicode = true } } });
		2660	try teststringify("\"with unicode\u{800}\"", "with unicode\u{800}", StringifyOptions{});
		2661	try teststringify("\"with unicode\\u0800\"", "with unicode\u{800}", StringifyOptions{ .string = .{ .String = .{ .escape_unicode = true } } });
		2662	try teststringify("\"with unicode\u{8000}\"", "with unicode\u{8000}", StringifyOptions{});
		2663	try teststringify("\"with unicode\\u8000\"", "with unicode\u{8000}", StringifyOptions{ .string = .{ .String = .{ .escape_unicode = true } } });
		2664	try teststringify("\"with unicode\u{D799}\"", "with unicode\u{D799}", StringifyOptions{});
		2665	try teststringify("\"with unicode\\ud799\"", "with unicode\u{D799}", StringifyOptions{ .string = .{ .String = .{ .escape_unicode = true } } });
		2666	try teststringify("\"with unicode\u{10000}\"", "with unicode\u{10000}", StringifyOptions{});
		2667	try teststringify("\"with unicode\\ud800\\udc00\"", "with unicode\u{10000}", StringifyOptions{ .string = .{ .String = .{ .escape_unicode = true } } });
		2668	try teststringify("\"with unicode\u{10FFFF}\"", "with unicode\u{10FFFF}", StringifyOptions{});
		2669	try teststringify("\"with unicode\\udbff\\udfff\"", "with unicode\u{10FFFF}", StringifyOptions{ .string = .{ .String = .{ .escape_unicode = true } } });
2477	}	2670	}
2478		2671
2479	test "stringify tagged unions" {	2672	test "stringify tagged unions" {
2480	try teststringify("42", union(enum) {	2673	try teststringify("42", union(enum) {
2481	Foo: u32,	2674	Foo: u32,
2482	Bar: bool,	2675	Bar: bool,
2483	}{ .Foo = 42 });	2676	}{ .Foo = 42 }, StringifyOptions{});
2484	}	2677	}
2485		2678
2486	test "stringify struct" {	2679	test "stringify struct" {
2487	try teststringify("{\"foo\":42}", struct {	2680	try teststringify("{\"foo\":42}", struct {
2488	foo: u32,	2681	foo: u32,
2489	}{ .foo = 42 });	2682	}{ .foo = 42 }, StringifyOptions{});
		2683	}
		2684
		2685	test "stringify struct with indentation" {
		2686	try teststringify(
		2687	\\{
		2688	\\ "foo": 42,
		2689	\\ "bar": [
		2690	\\ 1,
		2691	\\ 2,
		2692	\\ 3
		2693	\\ ]
		2694	\\}
		2695	,
		2696	struct {
		2697	foo: u32,
		2698	bar: [3]u32,
		2699	}{
		2700	.foo = 42,
		2701	.bar = .{ 1, 2, 3 },
		2702	},
		2703	StringifyOptions{
		2704	.whitespace = .{},
		2705	},
		2706	);
		2707	try teststringify(
		2708	"{\n\t\"foo\":42,\n\t\"bar\":[\n\t\t1,\n\t\t2,\n\t\t3\n\t]\n}",
		2709	struct {
		2710	foo: u32,
		2711	bar: [3]u32,
		2712	}{
		2713	.foo = 42,
		2714	.bar = .{ 1, 2, 3 },
		2715	},
		2716	StringifyOptions{
		2717	.whitespace = .{
		2718	.indent = .Tab,
		2719	.separator = false,
		2720	},
		2721	},
		2722	);
2490	}	2723	}
2491		2724
2492	test "stringify struct with void field" {	2725	test "stringify struct with void field" {
2493	try teststringify("{\"foo\":42}", struct {	2726	try teststringify("{\"foo\":42}", struct {
2494	foo: u32,	2727	foo: u32,
2495	bar: void = {},	2728	bar: void = {},
2496	}{ .foo = 42 });	2729	}{ .foo = 42 }, StringifyOptions{});
2497	}	2730	}
2498		2731
2499	test "stringify array of structs" {	2732	test "stringify array of structs" {
...	@@ -2504,7 +2737,7 @@ test "stringify array of structs" {	...	@@ -2504,7 +2737,7 @@ test "stringify array of structs" {
2504	MyStruct{ .foo = 42 },	2737	MyStruct{ .foo = 42 },
2505	MyStruct{ .foo = 100 },	2738	MyStruct{ .foo = 100 },
2506	MyStruct{ .foo = 1000 },	2739	MyStruct{ .foo = 1000 },
2507	});	2740	}, StringifyOptions{});
2508	}	2741	}
2509		2742
2510	test "stringify struct with custom stringifier" {	2743	test "stringify struct with custom stringifier" {
...	@@ -2518,7 +2751,7 @@ test "stringify struct with custom stringifier" {	...	@@ -2518,7 +2751,7 @@ test "stringify struct with custom stringifier" {
2518	) !void {	2751	) !void {
2519	try out_stream.writeAll("[\"something special\",");	2752	try out_stream.writeAll("[\"something special\",");
2520	try stringify(42, options, out_stream);	2753	try stringify(42, options, out_stream);
2521	try out_stream.writeAll("]");	2754	try out_stream.writeByte(']');
2522	}	2755	}
2523	}{ .foo = 42 });	2756	}{ .foo = 42 }, StringifyOptions{});
2524	}	2757	}

lib/std/json/test.zig+3-5

 @@ -1751,11 +1751,9 @@ test "i_number_double_huge_neg_exp" {
 }
 test "i_number_huge_exp" {
-    return error.SkipZigTest;
+    any(
-    // FIXME Integer overflow in parseFloat
+        \\[0.4e00669999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999969999999006]
-    //     any(
+    );
-    //         \\[0.4e00669999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999969999999006]
-    //     );
 }
 test "i_number_neg_int_huge_exp" {

lib/std/json/write_stream.zig+27-59

...	@@ -21,14 +21,10 @@ pub fn WriteStream(comptime OutStream: type, comptime max_depth: usize) type {	...	@@ -21,14 +21,10 @@ pub fn WriteStream(comptime OutStream: type, comptime max_depth: usize) type {
21		21
22	pub const Stream = OutStream;	22	pub const Stream = OutStream;
23		23
24	/// The string used for indenting.	24	whitespace: std.json.StringifyOptions.Whitespace = std.json.StringifyOptions.Whitespace{
25	one_indent: []const u8 = " ",	25	.indent_level = 0,
26		26	.indent = .{ .Space = 1 },
27	/// The string used as a newline character.	27	},
28	newline: []const u8 = "\n",
29
30	/// The string used as spacing.
31	space: []const u8 = " ",
32		28
33	stream: OutStream,	29	stream: OutStream,
34	state_index: usize,	30	state_index: usize,
...	@@ -49,12 +45,14 @@ pub fn WriteStream(comptime OutStream: type, comptime max_depth: usize) type {	...	@@ -49,12 +45,14 @@ pub fn WriteStream(comptime OutStream: type, comptime max_depth: usize) type {
49	assert(self.state[self.state_index] == State.Value); // need to call arrayElem or objectField	45	assert(self.state[self.state_index] == State.Value); // need to call arrayElem or objectField
50	try self.stream.writeByte('[');	46	try self.stream.writeByte('[');
51	self.state[self.state_index] = State.ArrayStart;	47	self.state[self.state_index] = State.ArrayStart;
		48	self.whitespace.indent_level += 1;
52	}	49	}
53		50
54	pub fn beginObject(self: *Self) !void {	51	pub fn beginObject(self: *Self) !void {
55	assert(self.state[self.state_index] == State.Value); // need to call arrayElem or objectField	52	assert(self.state[self.state_index] == State.Value); // need to call arrayElem or objectField
56	try self.stream.writeByte('{');	53	try self.stream.writeByte('{');
57	self.state[self.state_index] = State.ObjectStart;	54	self.state[self.state_index] = State.ObjectStart;
		55	self.whitespace.indent_level += 1;
58	}	56	}
59		57
60	pub fn arrayElem(self: *Self) !void {	58	pub fn arrayElem(self: *Self) !void {
...	@@ -90,8 +88,10 @@ pub fn WriteStream(comptime OutStream: type, comptime max_depth: usize) type {	...	@@ -90,8 +88,10 @@ pub fn WriteStream(comptime OutStream: type, comptime max_depth: usize) type {
90	self.pushState(.Value);	88	self.pushState(.Value);
91	try self.indent();	89	try self.indent();
92	try self.writeEscapedString(name);	90	try self.writeEscapedString(name);
93	try self.stream.writeAll(":");	91	try self.stream.writeByte(':');
94	try self.stream.writeAll(self.space);	92	if (self.whitespace.separator) {
		93	try self.stream.writeByte(' ');
		94	}
95	},	95	},
96	}	96	}
97	}	97	}
...	@@ -103,10 +103,12 @@ pub fn WriteStream(comptime OutStream: type, comptime max_depth: usize) type {	...	@@ -103,10 +103,12 @@ pub fn WriteStream(comptime OutStream: type, comptime max_depth: usize) type {
103	.ObjectStart => unreachable,	103	.ObjectStart => unreachable,
104	.Object => unreachable,	104	.Object => unreachable,
105	.ArrayStart => {	105	.ArrayStart => {
		106	self.whitespace.indent_level -= 1;
106	try self.stream.writeByte(']');	107	try self.stream.writeByte(']');
107	self.popState();	108	self.popState();
108	},	109	},
109	.Array => {	110	.Array => {
		111	self.whitespace.indent_level -= 1;
110	try self.indent();	112	try self.indent();
111	self.popState();	113	self.popState();
112	try self.stream.writeByte(']');	114	try self.stream.writeByte(']');
...	@@ -121,10 +123,12 @@ pub fn WriteStream(comptime OutStream: type, comptime max_depth: usize) type {	...	@@ -121,10 +123,12 @@ pub fn WriteStream(comptime OutStream: type, comptime max_depth: usize) type {
121	.ArrayStart => unreachable,	123	.ArrayStart => unreachable,
122	.Array => unreachable,	124	.Array => unreachable,
123	.ObjectStart => {	125	.ObjectStart => {
		126	self.whitespace.indent_level -= 1;
124	try self.stream.writeByte('}');	127	try self.stream.writeByte('}');
125	self.popState();	128	self.popState();
126	},	129	},
127	.Object => {	130	.Object => {
		131	self.whitespace.indent_level -= 1;
128	try self.indent();	132	try self.indent();
129	self.popState();	133	self.popState();
130	try self.stream.writeByte('}');	134	try self.stream.writeByte('}');
...	@@ -134,17 +138,13 @@ pub fn WriteStream(comptime OutStream: type, comptime max_depth: usize) type {	...	@@ -134,17 +138,13 @@ pub fn WriteStream(comptime OutStream: type, comptime max_depth: usize) type {
134		138
135	pub fn emitNull(self: *Self) !void {	139	pub fn emitNull(self: *Self) !void {
136	assert(self.state[self.state_index] == State.Value);	140	assert(self.state[self.state_index] == State.Value);
137	try self.stream.writeAll("null");	141	try self.stringify(null);
138	self.popState();	142	self.popState();
139	}	143	}
140		144
141	pub fn emitBool(self: *Self, value: bool) !void {	145	pub fn emitBool(self: *Self, value: bool) !void {
142	assert(self.state[self.state_index] == State.Value);	146	assert(self.state[self.state_index] == State.Value);
143	if (value) {	147	try self.stringify(value);
144	try self.stream.writeAll("true");
145	} else {
146	try self.stream.writeAll("false");
147	}
148	self.popState();	148	self.popState();
149	}	149	}
150		150
...	@@ -185,57 +185,19 @@ pub fn WriteStream(comptime OutStream: type, comptime max_depth: usize) type {	...	@@ -185,57 +185,19 @@ pub fn WriteStream(comptime OutStream: type, comptime max_depth: usize) type {
185	}	185	}
186		186
187	fn writeEscapedString(self: *Self, string: []const u8) !void {	187	fn writeEscapedString(self: *Self, string: []const u8) !void {
188	try self.stream.writeByte('"');	188	assert(std.unicode.utf8ValidateSlice(string));
189	for (string) \|s\| {	189	try self.stringify(string);
190	switch (s) {
191	'"' => try self.stream.writeAll("\\\""),
192	'\t' => try self.stream.writeAll("\\t"),
193	'\r' => try self.stream.writeAll("\\r"),
194	'\n' => try self.stream.writeAll("\\n"),
195	8 => try self.stream.writeAll("\\b"),
196	12 => try self.stream.writeAll("\\f"),
197	'\\' => try self.stream.writeAll("\\\\"),
198	else => try self.stream.writeByte(s),
199	}
200	}
201	try self.stream.writeByte('"');
202	}	190	}
203		191
204	/// Writes the complete json into the output stream	192	/// Writes the complete json into the output stream
205	pub fn emitJson(self: *Self, json: std.json.Value) Stream.Error!void {	193	pub fn emitJson(self: *Self, json: std.json.Value) Stream.Error!void {
206	switch (json) {	194	try self.stringify(json);
207	.Null => try self.emitNull(),
208	.Bool => \|inner\| try self.emitBool(inner),
209	.Integer => \|inner\| try self.emitNumber(inner),
210	.Float => \|inner\| try self.emitNumber(inner),
211	.String => \|inner\| try self.emitString(inner),
212	.Array => \|inner\| {
213	try self.beginArray();
214	for (inner.toSliceConst()) \|elem\| {
215	try self.arrayElem();
216	try self.emitJson(elem);
217	}
218	try self.endArray();
219	},
220	.Object => \|inner\| {
221	try self.beginObject();
222	var it = inner.iterator();
223	while (it.next()) \|entry\| {
224	try self.objectField(entry.key);
225	try self.emitJson(entry.value);
226	}
227	try self.endObject();
228	},
229	}
230	}	195	}
231		196
232	fn indent(self: *Self) !void {	197	fn indent(self: *Self) !void {
233	assert(self.state_index >= 1);	198	assert(self.state_index >= 1);
234	try self.stream.writeAll(self.newline);	199	try self.stream.writeByte('\n');
235	var i: usize = 0;	200	try self.whitespace.outputIndent(self.stream);
236	while (i < self.state_index - 1) : (i += 1) {
237	try self.stream.writeAll(self.one_indent);
238	}
239	}	201	}
240		202
241	fn pushState(self: *Self, state: State) void {	203	fn pushState(self: *Self, state: State) void {
...	@@ -246,6 +208,12 @@ pub fn WriteStream(comptime OutStream: type, comptime max_depth: usize) type {	...	@@ -246,6 +208,12 @@ pub fn WriteStream(comptime OutStream: type, comptime max_depth: usize) type {
246	fn popState(self: *Self) void {	208	fn popState(self: *Self) void {
247	self.state_index -= 1;	209	self.state_index -= 1;
248	}	210	}
		211
		212	fn stringify(self: *Self, value: var) !void {
		213	try std.json.stringify(value, std.json.StringifyOptions{
		214	.whitespace = self.whitespace,
		215	}, self.stream);
		216	}
249	};	217	};
250	}	218	}
251		219

lib/std/mem.zig+51-28

 @@ -341,11 +341,7 @@ pub fn zeroes(comptime T: type) T {
             }
         },
         .Array => |info| {
-            var array: T = undefined;
+            return [_]info.child{zeroes(info.child)} ** info.len;
-            for (array) |*element| {
-                element.* = zeroes(info.child);
-            }
-            return array;
         },
         .Vector,
         .ErrorUnion,
 @@ -496,15 +492,8 @@ pub fn eql(comptime T: type, a: []const T, b: []const T) bool {
     return true;
 }
-/// Deprecated. Use `spanZ`.
+pub const toSliceConst = @compileError("deprecated; use std.mem.spanZ");
-pub fn toSliceConst(comptime T: type, ptr: [*:0]const T) [:0]const T {
+pub const toSlice = @compileError("deprecated; use std.mem.spanZ");
-    return ptr[0..lenZ(ptr) :0];
-}
-/// Deprecated. Use `spanZ`.
-pub fn toSlice(comptime T: type, ptr: [*:0]T) [:0]T {
-    return ptr[0..lenZ(ptr) :0];
-}
 /// Takes a pointer to an array, a sentinel-terminated pointer, or a slice, and
 /// returns a slice. If there is a sentinel on the input type, there will be a
 @@ -512,36 +501,54 @@ pub fn toSlice(comptime T: type, ptr: [*:0]T) [:0]T {
 /// the constness of the input type. `[*c]` pointers are assumed to be 0-terminated,
 /// and assumed to not allow null.
 pub fn Span(comptime T: type) type {
-    var ptr_info = @typeInfo(T).Pointer;
+    switch(@typeInfo(T)) {
-    switch (ptr_info.size) {
+        .Optional => |optional_info| {
-        .One => switch (@typeInfo(ptr_info.child)) {
+            return ?Span(optional_info.child);
-            .Array => |info| {
-                ptr_info.child = info.child;
-                ptr_info.sentinel = info.sentinel;
-            },
-            else => @compileError("invalid type given to std.mem.Span"),
         },
-        .C => {
+        .Pointer => |ptr_info| {
-            ptr_info.sentinel = 0;
+            var new_ptr_info = ptr_info;
-            ptr_info.is_allowzero = false;
+            switch (ptr_info.size) {
+                .One => switch (@typeInfo(ptr_info.child)) {
+                    .Array => |info| {
+                        new_ptr_info.child = info.child;
+                        new_ptr_info.sentinel = info.sentinel;
+                    },
+                    else => @compileError("invalid type given to std.mem.Span"),
+                },
+                .C => {
+                    new_ptr_info.sentinel = 0;
+                    new_ptr_info.is_allowzero = false;
+                },
+                .Many, .Slice => {},
+            }
+            new_ptr_info.size = .Slice;
+            return @Type(std.builtin.TypeInfo{ .Pointer = new_ptr_info });
         },
-        .Many, .Slice => {},
+        else => @compileError("invalid type given to std.mem.Span"),
     }
-    ptr_info.size = .Slice;
-    return @Type(std.builtin.TypeInfo{ .Pointer = ptr_info });
 }
 test "Span" {
     testing.expect(Span(*[5]u16) == []u16);
+    testing.expect(Span(?*[5]u16) == ?[]u16);
     testing.expect(Span(*const [5]u16) == []const u16);
+    testing.expect(Span(?*const [5]u16) == ?[]const u16);
     testing.expect(Span([]u16) == []u16);
+    testing.expect(Span(?[]u16) == ?[]u16);
     testing.expect(Span([]const u8) == []const u8);
+    testing.expect(Span(?[]const u8) == ?[]const u8);
     testing.expect(Span([:1]u16) == [:1]u16);
+    testing.expect(Span(?[:1]u16) == ?[:1]u16);
     testing.expect(Span([:1]const u8) == [:1]const u8);
+    testing.expect(Span(?[:1]const u8) == ?[:1]const u8);
     testing.expect(Span([*:1]u16) == [:1]u16);
+    testing.expect(Span(?[*:1]u16) == ?[:1]u16);
     testing.expect(Span([*:1]const u8) == [:1]const u8);
+    testing.expect(Span(?[*:1]const u8) == ?[:1]const u8);
     testing.expect(Span([*c]u16) == [:0]u16);
+    testing.expect(Span(?[*c]u16) == ?[:0]u16);
     testing.expect(Span([*c]const u8) == [:0]const u8);
+    testing.expect(Span(?[*c]const u8) == ?[:0]const u8);
 }
 /// Takes a pointer to an array, a sentinel-terminated pointer, or a slice, and
 @@ -552,6 +559,13 @@ test "Span" {
 /// When there is both a sentinel and an array length or slice length, the
 /// length value is used instead of the sentinel.
 pub fn span(ptr: var) Span(@TypeOf(ptr)) {
+    if (@typeInfo(@TypeOf(ptr)) == .Optional) {
+        if (ptr) |non_null| {
+            return span(non_null);
+        } else {
+            return null;
+        }
+    }
     const Result = Span(@TypeOf(ptr));
     const l = len(ptr);
     if (@typeInfo(Result).Pointer.sentinel) |s| {
 @@ -566,12 +580,20 @@ test "span" {
     const ptr = @as([*:3]u16, array[0..2 :3]);
     testing.expect(eql(u16, span(ptr), &[_]u16{ 1, 2 }));
     testing.expect(eql(u16, span(&array), &[_]u16{ 1, 2, 3, 4, 5 }));
+    testing.expectEqual(@as(?[:0]u16, null), span(@as(?[*:0]u16, null)));
 }
 /// Same as `span`, except when there is both a sentinel and an array
 /// length or slice length, scans the memory for the sentinel value
 /// rather than using the length.
 pub fn spanZ(ptr: var) Span(@TypeOf(ptr)) {
+    if (@typeInfo(@TypeOf(ptr)) == .Optional) {
+        if (ptr) |non_null| {
+            return spanZ(non_null);
+        } else {
+            return null;
+        }
+    }
     const Result = Span(@TypeOf(ptr));
     const l = lenZ(ptr);
     if (@typeInfo(Result).Pointer.sentinel) |s| {
 @@ -586,6 +608,7 @@ test "spanZ" {
     const ptr = @as([*:3]u16, array[0..2 :3]);
     testing.expect(eql(u16, spanZ(ptr), &[_]u16{ 1, 2 }));
     testing.expect(eql(u16, spanZ(&array), &[_]u16{ 1, 2, 3, 4, 5 }));
+    testing.expectEqual(@as(?[:0]u16, null), spanZ(@as(?[*:0]u16, null)));
 }
 /// Takes a pointer to an array, an array, a sentinel-terminated pointer,

lib/std/net.zig+26-27

...	@@ -397,13 +397,12 @@ pub const AddressList = struct {	...	@@ -397,13 +397,12 @@ pub const AddressList = struct {
397		397
398	/// All memory allocated with `allocator` will be freed before this function returns.	398	/// All memory allocated with `allocator` will be freed before this function returns.
399	pub fn tcpConnectToHost(allocator: *mem.Allocator, name: []const u8, port: u16) !fs.File {	399	pub fn tcpConnectToHost(allocator: *mem.Allocator, name: []const u8, port: u16) !fs.File {
400	const list = getAddressList(allocator, name, port);	400	const list = try getAddressList(allocator, name, port);
401	defer list.deinit();	401	defer list.deinit();
402		402
403	const addrs = list.addrs.toSliceConst();	403	if (list.addrs.len == 0) return error.UnknownHostName;
404	if (addrs.len == 0) return error.UnknownHostName;
405		404
406	return tcpConnectToAddress(addrs[0], port);	405	return tcpConnectToAddress(list.addrs[0]);
407	}	406	}
408		407
409	pub fn tcpConnectToAddress(address: Address) !fs.File {	408	pub fn tcpConnectToAddress(address: Address) !fs.File {
...	@@ -491,7 +490,7 @@ pub fn getAddressList(allocator: mem.Allocator, name: []const u8, port: u16) !	...	@@ -491,7 +490,7 @@ pub fn getAddressList(allocator: mem.Allocator, name: []const u8, port: u16) !
491		490
492	if (info.canonname) \|n\| {	491	if (info.canonname) \|n\| {
493	if (result.canon_name == null) {	492	if (result.canon_name == null) {
494	result.canon_name = try mem.dupe(arena, u8, mem.toSliceConst(u8, n));	493	result.canon_name = try mem.dupe(arena, u8, mem.spanZ(n));
495	}	494	}
496	}	495	}
497	i += 1;	496	i += 1;
...	@@ -505,7 +504,7 @@ pub fn getAddressList(allocator: mem.Allocator, name: []const u8, port: u16) !	...	@@ -505,7 +504,7 @@ pub fn getAddressList(allocator: mem.Allocator, name: []const u8, port: u16) !
505	var lookup_addrs = std.ArrayList(LookupAddr).init(allocator);	504	var lookup_addrs = std.ArrayList(LookupAddr).init(allocator);
506	defer lookup_addrs.deinit();	505	defer lookup_addrs.deinit();
507		506
508	var canon = std.Buffer.initNull(arena);	507	var canon = std.ArrayListSentineled(u8, 0).initNull(arena);
509	defer canon.deinit();	508	defer canon.deinit();
510		509
511	try linuxLookupName(&lookup_addrs, &canon, name, family, flags, port);	510	try linuxLookupName(&lookup_addrs, &canon, name, family, flags, port);
...	@@ -515,7 +514,7 @@ pub fn getAddressList(allocator: mem.Allocator, name: []const u8, port: u16) !	...	@@ -515,7 +514,7 @@ pub fn getAddressList(allocator: mem.Allocator, name: []const u8, port: u16) !
515	result.canon_name = canon.toOwnedSlice();	514	result.canon_name = canon.toOwnedSlice();
516	}	515	}
517		516
518	for (lookup_addrs.toSliceConst()) \|lookup_addr, i\| {	517	for (lookup_addrs.span()) \|lookup_addr, i\| {
519	result.addrs[i] = lookup_addr.addr;	518	result.addrs[i] = lookup_addr.addr;
520	assert(result.addrs[i].getPort() == port);	519	assert(result.addrs[i].getPort() == port);
521	}	520	}
...	@@ -540,7 +539,7 @@ const DAS_ORDER_SHIFT = 0;	...	@@ -540,7 +539,7 @@ const DAS_ORDER_SHIFT = 0;
540		539
541	fn linuxLookupName(	540	fn linuxLookupName(
542	addrs: *std.ArrayList(LookupAddr),	541	addrs: *std.ArrayList(LookupAddr),
543	canon: *std.Buffer,	542	canon: *std.ArrayListSentineled(u8, 0),
544	opt_name: ?[]const u8,	543	opt_name: ?[]const u8,
545	family: os.sa_family_t,	544	family: os.sa_family_t,
546	flags: u32,	545	flags: u32,
...	@@ -568,7 +567,7 @@ fn linuxLookupName(	...	@@ -568,7 +567,7 @@ fn linuxLookupName(
568	// No further processing is needed if there are fewer than 2	567	// No further processing is needed if there are fewer than 2
569	// results or if there are only IPv4 results.	568	// results or if there are only IPv4 results.
570	if (addrs.len == 1 or family == os.AF_INET) return;	569	if (addrs.len == 1 or family == os.AF_INET) return;
571	const all_ip4 = for (addrs.toSliceConst()) \|addr\| {	570	const all_ip4 = for (addrs.span()) \|addr\| {
572	if (addr.addr.any.family != os.AF_INET) break false;	571	if (addr.addr.any.family != os.AF_INET) break false;
573	} else true;	572	} else true;
574	if (all_ip4) return;	573	if (all_ip4) return;
...	@@ -580,7 +579,7 @@ fn linuxLookupName(	...	@@ -580,7 +579,7 @@ fn linuxLookupName(
580	// So far the label/precedence table cannot be customized.	579	// So far the label/precedence table cannot be customized.
581	// This implementation is ported from musl libc.	580	// This implementation is ported from musl libc.
582	// A more idiomatic "ziggy" implementation would be welcome.	581	// A more idiomatic "ziggy" implementation would be welcome.
583	for (addrs.toSlice()) \|*addr, i\| {	582	for (addrs.span()) \|*addr, i\| {
584	var key: i32 = 0;	583	var key: i32 = 0;
585	var sa6: os.sockaddr_in6 = undefined;	584	var sa6: os.sockaddr_in6 = undefined;
586	@memset(@ptrCast([*]u8, &sa6), 0, @sizeOf(os.sockaddr_in6));	585	@memset(@ptrCast([*]u8, &sa6), 0, @sizeOf(os.sockaddr_in6));
...	@@ -645,7 +644,7 @@ fn linuxLookupName(	...	@@ -645,7 +644,7 @@ fn linuxLookupName(
645	key \|= (MAXADDRS - @intCast(i32, i)) << DAS_ORDER_SHIFT;	644	key \|= (MAXADDRS - @intCast(i32, i)) << DAS_ORDER_SHIFT;
646	addr.sortkey = key;	645	addr.sortkey = key;
647	}	646	}
648	std.sort.sort(LookupAddr, addrs.toSlice(), addrCmpLessThan);	647	std.sort.sort(LookupAddr, addrs.span(), addrCmpLessThan);
649	}	648	}
650		649
651	const Policy = struct {	650	const Policy = struct {
...	@@ -799,12 +798,12 @@ fn linuxLookupNameFromNull(	...	@@ -799,12 +798,12 @@ fn linuxLookupNameFromNull(
799		798
800	fn linuxLookupNameFromHosts(	799	fn linuxLookupNameFromHosts(
801	addrs: *std.ArrayList(LookupAddr),	800	addrs: *std.ArrayList(LookupAddr),
802	canon: *std.Buffer,	801	canon: *std.ArrayListSentineled(u8, 0),
803	name: []const u8,	802	name: []const u8,
804	family: os.sa_family_t,	803	family: os.sa_family_t,
805	port: u16,	804	port: u16,
806	) !void {	805	) !void {
807	const file = fs.openFileAbsoluteC("/etc/hosts", .{}) catch \|err\| switch (err) {	806	const file = fs.openFileAbsoluteZ("/etc/hosts", .{}) catch \|err\| switch (err) {
808	error.FileNotFound,	807	error.FileNotFound,
809	error.NotDir,	808	error.NotDir,
810	error.AccessDenied,	809	error.AccessDenied,
...	@@ -869,7 +868,7 @@ pub fn isValidHostName(hostname: []const u8) bool {	...	@@ -869,7 +868,7 @@ pub fn isValidHostName(hostname: []const u8) bool {
869		868
870	fn linuxLookupNameFromDnsSearch(	869	fn linuxLookupNameFromDnsSearch(
871	addrs: *std.ArrayList(LookupAddr),	870	addrs: *std.ArrayList(LookupAddr),
872	canon: *std.Buffer,	871	canon: *std.ArrayListSentineled(u8, 0),
873	name: []const u8,	872	name: []const u8,
874	family: os.sa_family_t,	873	family: os.sa_family_t,
875	port: u16,	874	port: u16,
...	@@ -888,7 +887,7 @@ fn linuxLookupNameFromDnsSearch(	...	@@ -888,7 +887,7 @@ fn linuxLookupNameFromDnsSearch(
888	const search = if (rc.search.isNull() or dots >= rc.ndots or mem.endsWith(u8, name, "."))	887	const search = if (rc.search.isNull() or dots >= rc.ndots or mem.endsWith(u8, name, "."))
889	&[_]u8{}	888	&[_]u8{}
890	else	889	else
891	rc.search.toSliceConst();	890	rc.search.span();
892		891
893	var canon_name = name;	892	var canon_name = name;
894		893
...	@@ -901,14 +900,14 @@ fn linuxLookupNameFromDnsSearch(	...	@@ -901,14 +900,14 @@ fn linuxLookupNameFromDnsSearch(
901	// name is not a CNAME record) and serves as a buffer for passing	900	// name is not a CNAME record) and serves as a buffer for passing
902	// the full requested name to name_from_dns.	901	// the full requested name to name_from_dns.
903	try canon.resize(canon_name.len);	902	try canon.resize(canon_name.len);
904	mem.copy(u8, canon.toSlice(), canon_name);	903	mem.copy(u8, canon.span(), canon_name);
905	try canon.appendByte('.');	904	try canon.append('.');
906		905
907	var tok_it = mem.tokenize(search, " \t");	906	var tok_it = mem.tokenize(search, " \t");
908	while (tok_it.next()) \|tok\| {	907	while (tok_it.next()) \|tok\| {
909	canon.shrink(canon_name.len + 1);	908	canon.shrink(canon_name.len + 1);
910	try canon.append(tok);	909	try canon.appendSlice(tok);
911	try linuxLookupNameFromDns(addrs, canon, canon.toSliceConst(), family, rc, port);	910	try linuxLookupNameFromDns(addrs, canon, canon.span(), family, rc, port);
912	if (addrs.len != 0) return;	911	if (addrs.len != 0) return;
913	}	912	}
914		913
...	@@ -918,13 +917,13 @@ fn linuxLookupNameFromDnsSearch(	...	@@ -918,13 +917,13 @@ fn linuxLookupNameFromDnsSearch(
918		917
919	const dpc_ctx = struct {	918	const dpc_ctx = struct {
920	addrs: *std.ArrayList(LookupAddr),	919	addrs: *std.ArrayList(LookupAddr),
921	canon: *std.Buffer,	920	canon: *std.ArrayListSentineled(u8, 0),
922	port: u16,	921	port: u16,
923	};	922	};
924		923
925	fn linuxLookupNameFromDns(	924	fn linuxLookupNameFromDns(
926	addrs: *std.ArrayList(LookupAddr),	925	addrs: *std.ArrayList(LookupAddr),
927	canon: *std.Buffer,	926	canon: *std.ArrayListSentineled(u8, 0),
928	name: []const u8,	927	name: []const u8,
929	family: os.sa_family_t,	928	family: os.sa_family_t,
930	rc: ResolvConf,	929	rc: ResolvConf,
...	@@ -979,7 +978,7 @@ const ResolvConf = struct {	...	@@ -979,7 +978,7 @@ const ResolvConf = struct {
979	attempts: u32,	978	attempts: u32,
980	ndots: u32,	979	ndots: u32,
981	timeout: u32,	980	timeout: u32,
982	search: std.Buffer,	981	search: std.ArrayListSentineled(u8, 0),
983	ns: std.ArrayList(LookupAddr),	982	ns: std.ArrayList(LookupAddr),
984		983
985	fn deinit(rc: *ResolvConf) void {	984	fn deinit(rc: *ResolvConf) void {
...	@@ -994,14 +993,14 @@ const ResolvConf = struct {	...	@@ -994,14 +993,14 @@ const ResolvConf = struct {
994	fn getResolvConf(allocator: mem.Allocator, rc: ResolvConf) !void {	993	fn getResolvConf(allocator: mem.Allocator, rc: ResolvConf) !void {
995	rc.* = ResolvConf{	994	rc.* = ResolvConf{
996	.ns = std.ArrayList(LookupAddr).init(allocator),	995	.ns = std.ArrayList(LookupAddr).init(allocator),
997	.search = std.Buffer.initNull(allocator),	996	.search = std.ArrayListSentineled(u8, 0).initNull(allocator),
998	.ndots = 1,	997	.ndots = 1,
999	.timeout = 5,	998	.timeout = 5,
1000	.attempts = 2,	999	.attempts = 2,
1001	};	1000	};
1002	errdefer rc.deinit();	1001	errdefer rc.deinit();
1003		1002
1004	const file = fs.openFileAbsoluteC("/etc/resolv.conf", .{}) catch \|err\| switch (err) {	1003	const file = fs.openFileAbsoluteZ("/etc/resolv.conf", .{}) catch \|err\| switch (err) {
1005	error.FileNotFound,	1004	error.FileNotFound,
1006	error.NotDir,	1005	error.NotDir,
1007	error.AccessDenied,	1006	error.AccessDenied,
...	@@ -1080,9 +1079,9 @@ fn resMSendRc(	...	@@ -1080,9 +1079,9 @@ fn resMSendRc(
1080	defer ns_list.deinit();	1079	defer ns_list.deinit();
1081		1080
1082	try ns_list.resize(rc.ns.len);	1081	try ns_list.resize(rc.ns.len);
1083	const ns = ns_list.toSlice();	1082	const ns = ns_list.span();
1084		1083
1085	for (rc.ns.toSliceConst()) \|iplit, i\| {	1084	for (rc.ns.span()) \|iplit, i\| {
1086	ns[i] = iplit.addr;	1085	ns[i] = iplit.addr;
1087	assert(ns[i].getPort() == 53);	1086	assert(ns[i].getPort() == 53);
1088	if (iplit.addr.any.family != os.AF_INET) {	1087	if (iplit.addr.any.family != os.AF_INET) {
...	@@ -1266,7 +1265,7 @@ fn dnsParseCallback(ctx: dpc_ctx, rr: u8, data: []const u8, packet: []const u8)	...	@@ -1266,7 +1265,7 @@ fn dnsParseCallback(ctx: dpc_ctx, rr: u8, data: []const u8, packet: []const u8)
1266	var tmp: [256]u8 = undefined;	1265	var tmp: [256]u8 = undefined;
1267	// Returns len of compressed name. strlen to get canon name.	1266	// Returns len of compressed name. strlen to get canon name.
1268	_ = try os.dn_expand(packet, data, &tmp);	1267	_ = try os.dn_expand(packet, data, &tmp);
1269	const canon_name = mem.toSliceConst(u8, @ptrCast([*:0]const u8, &tmp));	1268	const canon_name = mem.spanZ(@ptrCast([*:0]const u8, &tmp));
1270	if (isValidHostName(canon_name)) {	1269	if (isValidHostName(canon_name)) {
1271	try ctx.canon.replaceContents(canon_name);	1270	try ctx.canon.replaceContents(canon_name);
1272	}	1271	}

lib/std/os.zig+105-83

 @@ -163,7 +163,7 @@ pub fn getrandom(buffer: []u8) GetRandomError!void {
 }
 fn getRandomBytesDevURandom(buf: []u8) !void {
-    const fd = try openC("/dev/urandom", O_RDONLY | O_CLOEXEC, 0);
+    const fd = try openZ("/dev/urandom", O_RDONLY | O_CLOEXEC, 0);
     defer close(fd);
     const st = try fstat(fd);
 @@ -853,13 +853,15 @@ pub const OpenError = error{
 /// TODO support windows
 pub fn open(file_path: []const u8, flags: u32, perm: usize) OpenError!fd_t {
     const file_path_c = try toPosixPath(file_path);
-    return openC(&file_path_c, flags, perm);
+    return openZ(&file_path_c, flags, perm);
 }
+pub const openC = @compileError("deprecated: renamed to openZ");
 /// Open and possibly create a file. Keeps trying if it gets interrupted.
 /// See also `open`.
 /// TODO support windows
-pub fn openC(file_path: [*:0]const u8, flags: u32, perm: usize) OpenError!fd_t {
+pub fn openZ(file_path: [*:0]const u8, flags: u32, perm: usize) OpenError!fd_t {
     while (true) {
         const rc = system.open(file_path, flags, perm);
         switch (errno(rc)) {
 @@ -895,14 +897,16 @@ pub fn openC(file_path: [*:0]const u8, flags: u32, perm: usize) OpenError!fd_t {
 /// TODO support windows
 pub fn openat(dir_fd: fd_t, file_path: []const u8, flags: u32, mode: mode_t) OpenError!fd_t {
     const file_path_c = try toPosixPath(file_path);
-    return openatC(dir_fd, &file_path_c, flags, mode);
+    return openatZ(dir_fd, &file_path_c, flags, mode);
 }
+pub const openatC = @compileError("deprecated: renamed to openatZ");
 /// Open and possibly create a file. Keeps trying if it gets interrupted.
 /// `file_path` is relative to the open directory handle `dir_fd`.
 /// See also `openat`.
 /// TODO support windows
-pub fn openatC(dir_fd: fd_t, file_path: [*:0]const u8, flags: u32, mode: mode_t) OpenError!fd_t {
+pub fn openatZ(dir_fd: fd_t, file_path: [*:0]const u8, flags: u32, mode: mode_t) OpenError!fd_t {
     while (true) {
         const rc = system.openat(dir_fd, file_path, flags, mode);
         switch (errno(rc)) {
 @@ -959,8 +963,7 @@ pub const ExecveError = error{
     NameTooLong,
 } || UnexpectedError;
-/// Deprecated in favor of `execveZ`.
+pub const execveC = @compileError("deprecated: use execveZ");
-pub const execveC = execveZ;
 /// Like `execve` except the parameters are null-terminated,
 /// matching the syscall API on all targets. This removes the need for an allocator.
 @@ -992,8 +995,7 @@ pub fn execveZ(
     }
 }
-/// Deprecated in favor of `execvpeZ`.
+pub const execvpeC = @compileError("deprecated in favor of execvpeZ");
-pub const execvpeC = execvpeZ;
 pub const Arg0Expand = enum {
     expand,
 @@ -1012,7 +1014,7 @@ pub fn execvpeZ_expandArg0(
     },
     envp: [*:null]const ?[*:0]const u8,
 ) ExecveError {
-    const file_slice = mem.toSliceConst(u8, file);
+    const file_slice = mem.spanZ(file);
     if (mem.indexOfScalar(u8, file_slice, '/') != null) return execveZ(file, child_argv, envp);
     const PATH = getenvZ("PATH") orelse "/usr/local/bin:/bin/:/usr/bin";
 @@ -1076,7 +1078,7 @@ pub fn execvpe_expandArg0(
     mem.set(?[*:0]u8, argv_buf, null);
     defer {
         for (argv_buf) |arg| {
-            const arg_buf = if (arg) |ptr| mem.toSlice(u8, ptr) else break;
+            const arg_buf = mem.spanZ(arg) orelse break;
             allocator.free(arg_buf);
         }
         allocator.free(argv_buf);
 @@ -1189,30 +1191,32 @@ pub fn getenv(key: []const u8) ?[]const u8 {
     return null;
 }
-/// Deprecated in favor of `getenvZ`.
+pub const getenvC = @compileError("Deprecated in favor of `getenvZ`");
-pub const getenvC = getenvZ;
 /// Get an environment variable with a null-terminated name.
 /// See also `getenv`.
 pub fn getenvZ(key: [*:0]const u8) ?[]const u8 {
     if (builtin.link_libc) {
         const value = system.getenv(key) orelse return null;
-        return mem.toSliceConst(u8, value);
+        return mem.spanZ(value);
     }
     if (builtin.os.tag == .windows) {
         @compileError("std.os.getenvZ is unavailable for Windows because environment string is in WTF-16 format. See std.process.getEnvVarOwned for cross-platform API or std.os.getenvW for Windows-specific API.");
     }
-    return getenv(mem.toSliceConst(u8, key));
+    return getenv(mem.spanZ(key));
 }
 /// Windows-only. Get an environment variable with a null-terminated, WTF-16 encoded name.
 /// See also `getenv`.
+/// This function first attempts a case-sensitive lookup. If no match is found, and `key`
+/// is ASCII, then it attempts a second case-insensitive lookup.
 pub fn getenvW(key: [*:0]const u16) ?[:0]const u16 {
     if (builtin.os.tag != .windows) {
         @compileError("std.os.getenvW is a Windows-only API");
     }
-    const key_slice = mem.toSliceConst(u16, key);
+    const key_slice = mem.spanZ(key);
     const ptr = windows.peb().ProcessParameters.Environment;
+    var ascii_match: ?[:0]const u16 = null;
     var i: usize = 0;
     while (ptr[i] != 0) {
         const key_start = i;
 @@ -1228,9 +1232,20 @@ pub fn getenvW(key: [*:0]const u16) ?[:0]const u16 {
         if (mem.eql(u16, key_slice, this_key)) return this_value;
+        ascii_check: {
+            if (ascii_match != null) break :ascii_check;
+            if (key_slice.len != this_key.len) break :ascii_check;
+            for (key_slice) |a_c, key_index| {
+                const a = math.cast(u8, a_c) catch break :ascii_check;
+                const b = math.cast(u8, this_key[key_index]) catch break :ascii_check;
+                if (std.ascii.toLower(a) != std.ascii.toLower(b)) break :ascii_check;
+            }
+            ascii_match = this_value;
+        }
         i += 1; // skip over null byte
     }
-    return null;
+    return ascii_match;
 }
 pub const GetCwdError = error{
 @@ -1250,7 +1265,7 @@ pub fn getcwd(out_buffer: []u8) GetCwdError![]u8 {
         break :blk errno(system.getcwd(out_buffer.ptr, out_buffer.len));
     };
     switch (err) {
-        0 => return mem.toSlice(u8, @ptrCast([*:0]u8, out_buffer.ptr)),
+        0 => return mem.spanZ(@ptrCast([*:0]u8, out_buffer.ptr)),
         EFAULT => unreachable,
         EINVAL => unreachable,
         ENOENT => return error.CurrentWorkingDirectoryUnlinked,
 @@ -1288,13 +1303,15 @@ pub fn symlink(target_path: []const u8, sym_link_path: []const u8) SymLinkError!
     } else {
         const target_path_c = try toPosixPath(target_path);
         const sym_link_path_c = try toPosixPath(sym_link_path);
-        return symlinkC(&target_path_c, &sym_link_path_c);
+        return symlinkZ(&target_path_c, &sym_link_path_c);
     }
 }
+pub const symlinkC = @compileError("deprecated: renamed to symlinkZ");
 /// This is the same as `symlink` except the parameters are null-terminated pointers.
 /// See also `symlink`.
-pub fn symlinkC(target_path: [*:0]const u8, sym_link_path: [*:0]const u8) SymLinkError!void {
+pub fn symlinkZ(target_path: [*:0]const u8, sym_link_path: [*:0]const u8) SymLinkError!void {
     if (builtin.os.tag == .windows) {
         const target_path_w = try windows.cStrToPrefixedFileW(target_path);
         const sym_link_path_w = try windows.cStrToPrefixedFileW(sym_link_path);
 @@ -1323,10 +1340,12 @@ pub fn symlinkC(target_path: [*:0]const u8, sym_link_path: [*:0]const u8) SymLin
 pub fn symlinkat(target_path: []const u8, newdirfd: fd_t, sym_link_path: []const u8) SymLinkError!void {
     const target_path_c = try toPosixPath(target_path);
     const sym_link_path_c = try toPosixPath(sym_link_path);
-    return symlinkatC(target_path_c, newdirfd, sym_link_path_c);
+    return symlinkatZ(target_path_c, newdirfd, sym_link_path_c);
 }
-pub fn symlinkatC(target_path: [*:0]const u8, newdirfd: fd_t, sym_link_path: [*:0]const u8) SymLinkError!void {
+pub const symlinkatC = @compileError("deprecated: renamed to symlinkatZ");
+pub fn symlinkatZ(target_path: [*:0]const u8, newdirfd: fd_t, sym_link_path: [*:0]const u8) SymLinkError!void {
     switch (errno(system.symlinkat(target_path, newdirfd, sym_link_path))) {
         0 => return,
         EFAULT => unreachable,
 @@ -1375,12 +1394,14 @@ pub fn unlink(file_path: []const u8) UnlinkError!void {
         return windows.DeleteFileW(&file_path_w);
     } else {
         const file_path_c = try toPosixPath(file_path);
-        return unlinkC(&file_path_c);
+        return unlinkZ(&file_path_c);
     }
 }
+pub const unlinkC = @compileError("deprecated: renamed to unlinkZ");
 /// Same as `unlink` except the parameter is a null terminated UTF8-encoded string.
-pub fn unlinkC(file_path: [*:0]const u8) UnlinkError!void {
+pub fn unlinkZ(file_path: [*:0]const u8) UnlinkError!void {
     if (builtin.os.tag == .windows) {
         const file_path_w = try windows.cStrToPrefixedFileW(file_path);
         return windows.DeleteFileW(&file_path_w);
 @@ -1417,11 +1438,13 @@ pub fn unlinkat(dirfd: fd_t, file_path: []const u8, flags: u32) UnlinkatError!vo
         return unlinkatW(dirfd, &file_path_w, flags);
     }
     const file_path_c = try toPosixPath(file_path);
-    return unlinkatC(dirfd, &file_path_c, flags);
+    return unlinkatZ(dirfd, &file_path_c, flags);
 }
+pub const unlinkatC = @compileError("deprecated: renamed to unlinkatZ");
 /// Same as `unlinkat` but `file_path` is a null-terminated string.
-pub fn unlinkatC(dirfd: fd_t, file_path_c: [*:0]const u8, flags: u32) UnlinkatError!void {
+pub fn unlinkatZ(dirfd: fd_t, file_path_c: [*:0]const u8, flags: u32) UnlinkatError!void {
     if (builtin.os.tag == .windows) {
         const file_path_w = try windows.cStrToPrefixedFileW(file_path_c);
         return unlinkatW(dirfd, &file_path_w, flags);
 @@ -1459,7 +1482,7 @@ pub fn unlinkatW(dirfd: fd_t, sub_path_w: [*:0]const u16, flags: u32) UnlinkatEr
     else
         @as(w.ULONG, w.FILE_DELETE_ON_CLOSE | w.FILE_NON_DIRECTORY_FILE);
-    const path_len_bytes = @intCast(u16, mem.toSliceConst(u16, sub_path_w).len * 2);
+    const path_len_bytes = @intCast(u16, mem.lenZ(sub_path_w) * 2);
     var nt_name = w.UNICODE_STRING{
         .Length = path_len_bytes,
         .MaximumLength = path_len_bytes,
 @@ -1543,12 +1566,14 @@ pub fn rename(old_path: []const u8, new_path: []const u8) RenameError!void {
     } else {
         const old_path_c = try toPosixPath(old_path);
         const new_path_c = try toPosixPath(new_path);
-        return renameC(&old_path_c, &new_path_c);
+        return renameZ(&old_path_c, &new_path_c);
     }
 }
+pub const renameC = @compileError("deprecated: renamed to renameZ");
 /// Same as `rename` except the parameters are null-terminated byte arrays.
-pub fn renameC(old_path: [*:0]const u8, new_path: [*:0]const u8) RenameError!void {
+pub fn renameZ(old_path: [*:0]const u8, new_path: [*:0]const u8) RenameError!void {
     if (builtin.os.tag == .windows) {
         const old_path_w = try windows.cStrToPrefixedFileW(old_path);
         const new_path_w = try windows.cStrToPrefixedFileW(new_path);
 @@ -1715,11 +1740,13 @@ pub fn mkdirat(dir_fd: fd_t, sub_dir_path: []const u8, mode: u32) MakeDirError!v
         return mkdiratW(dir_fd, &sub_dir_path_w, mode);
     } else {
         const sub_dir_path_c = try toPosixPath(sub_dir_path);
-        return mkdiratC(dir_fd, &sub_dir_path_c, mode);
+        return mkdiratZ(dir_fd, &sub_dir_path_c, mode);
     }
 }
-pub fn mkdiratC(dir_fd: fd_t, sub_dir_path: [*:0]const u8, mode: u32) MakeDirError!void {
+pub const mkdiratC = @compileError("deprecated: renamed to mkdiratZ");
+pub fn mkdiratZ(dir_fd: fd_t, sub_dir_path: [*:0]const u8, mode: u32) MakeDirError!void {
     if (builtin.os.tag == .windows) {
         const sub_dir_path_w = try windows.cStrToPrefixedFileW(sub_dir_path);
         return mkdiratW(dir_fd, &sub_dir_path_w, mode);
 @@ -1810,12 +1837,14 @@ pub fn rmdir(dir_path: []const u8) DeleteDirError!void {
         return windows.RemoveDirectoryW(&dir_path_w);
     } else {
         const dir_path_c = try toPosixPath(dir_path);
-        return rmdirC(&dir_path_c);
+        return rmdirZ(&dir_path_c);
     }
 }
+pub const rmdirC = @compileError("deprecated: renamed to rmdirZ");
 /// Same as `rmdir` except the parameter is null-terminated.
-pub fn rmdirC(dir_path: [*:0]const u8) DeleteDirError!void {
+pub fn rmdirZ(dir_path: [*:0]const u8) DeleteDirError!void {
     if (builtin.os.tag == .windows) {
         const dir_path_w = try windows.cStrToPrefixedFileW(dir_path);
         return windows.RemoveDirectoryW(&dir_path_w);
 @@ -1857,12 +1886,14 @@ pub fn chdir(dir_path: []const u8) ChangeCurDirError!void {
         @compileError("TODO implement chdir for Windows");
     } else {
         const dir_path_c = try toPosixPath(dir_path);
-        return chdirC(&dir_path_c);
+        return chdirZ(&dir_path_c);
     }
 }
+pub const chdirC = @compileError("deprecated: renamed to chdirZ");
 /// Same as `chdir` except the parameter is null-terminated.
-pub fn chdirC(dir_path: [*:0]const u8) ChangeCurDirError!void {
+pub fn chdirZ(dir_path: [*:0]const u8) ChangeCurDirError!void {
     if (builtin.os.tag == .windows) {
         const dir_path_w = try windows.cStrToPrefixedFileW(dir_path);
         @compileError("TODO implement chdir for Windows");
 @@ -1919,12 +1950,14 @@ pub fn readlink(file_path: []const u8, out_buffer: []u8) ReadLinkError![]u8 {
         @compileError("TODO implement readlink for Windows");
     } else {
         const file_path_c = try toPosixPath(file_path);
-        return readlinkC(&file_path_c, out_buffer);
+        return readlinkZ(&file_path_c, out_buffer);
     }
 }
+pub const readlinkC = @compileError("deprecated: renamed to readlinkZ");
 /// Same as `readlink` except `file_path` is null-terminated.
-pub fn readlinkC(file_path: [*:0]const u8, out_buffer: []u8) ReadLinkError![]u8 {
+pub fn readlinkZ(file_path: [*:0]const u8, out_buffer: []u8) ReadLinkError![]u8 {
     if (builtin.os.tag == .windows) {
         const file_path_w = try windows.cStrToPrefixedFileW(file_path);
         @compileError("TODO implement readlink for Windows");
 @@ -1945,7 +1978,9 @@ pub fn readlinkC(file_path: [*:0]const u8, out_buffer: []u8) ReadLinkError![]u8
     }
 }
-pub fn readlinkatC(dirfd: fd_t, file_path: [*:0]const u8, out_buffer: []u8) ReadLinkError![]u8 {
+pub const readlinkatC = @compileError("deprecated: renamed to readlinkatZ");
+pub fn readlinkatZ(dirfd: fd_t, file_path: [*:0]const u8, out_buffer: []u8) ReadLinkError![]u8 {
     if (builtin.os.tag == .windows) {
         const file_path_w = try windows.cStrToPrefixedFileW(file_path);
         @compileError("TODO implement readlink for Windows");
 @@ -2044,7 +2079,7 @@ pub fn isatty(handle: fd_t) bool {
     }
     if (builtin.os.tag == .linux) {
         var wsz: linux.winsize = undefined;
-        return linux.syscall3(linux.SYS_ioctl, @bitCast(usize, @as(isize, handle)), linux.TIOCGWINSZ, @ptrToInt(&wsz)) == 0;
+        return linux.syscall3(.ioctl, @bitCast(usize, @as(isize, handle)), linux.TIOCGWINSZ, @ptrToInt(&wsz)) == 0;
     }
     unreachable;
 }
 @@ -2532,14 +2567,7 @@ pub const FStatError = error{
 pub fn fstat(fd: fd_t) FStatError!Stat {
     var stat: Stat = undefined;
-    const symbol_name = if (comptime std.Target.current.isDarwin())
+    switch (errno(system.fstat(fd, &stat))) {
-        "fstat$INODE64"
-    else if (std.Target.current.os.tag == .netbsd)
-        "__fstat50"
-    else
-        "fstat";
-    switch (errno(@field(system, symbol_name)(fd, &stat))) {
         0 => return stat,
         EINVAL => unreachable,
         EBADF => unreachable, // Always a race condition.
 @@ -2553,10 +2581,12 @@ const FStatAtError = FStatError || error{NameTooLong};
 pub fn fstatat(dirfd: fd_t, pathname: []const u8, flags: u32) FStatAtError![]Stat {
     const pathname_c = try toPosixPath(pathname);
-    return fstatatC(dirfd, &pathname_c, flags);
+    return fstatatZ(dirfd, &pathname_c, flags);
 }
-pub fn fstatatC(dirfd: fd_t, pathname: [*:0]const u8, flags: u32) FStatAtError!Stat {
+pub const fstatatC = @compileError("deprecated: renamed to fstatatZ");
+pub fn fstatatZ(dirfd: fd_t, pathname: [*:0]const u8, flags: u32) FStatAtError!Stat {
     var stat: Stat = undefined;
     switch (errno(system.fstatat(dirfd, pathname, &stat, flags))) {
         0 => return stat,
 @@ -2668,11 +2698,13 @@ pub const INotifyAddWatchError = error{
 /// add a watch to an initialized inotify instance
 pub fn inotify_add_watch(inotify_fd: i32, pathname: []const u8, mask: u32) INotifyAddWatchError!i32 {
     const pathname_c = try toPosixPath(pathname);
-    return inotify_add_watchC(inotify_fd, &pathname_c, mask);
+    return inotify_add_watchZ(inotify_fd, &pathname_c, mask);
 }
+pub const inotify_add_watchC = @compileError("deprecated: renamed to inotify_add_watchZ");
 /// Same as `inotify_add_watch` except pathname is null-terminated.
-pub fn inotify_add_watchC(inotify_fd: i32, pathname: [*:0]const u8, mask: u32) INotifyAddWatchError!i32 {
+pub fn inotify_add_watchZ(inotify_fd: i32, pathname: [*:0]const u8, mask: u32) INotifyAddWatchError!i32 {
     const rc = system.inotify_add_watch(inotify_fd, pathname, mask);
     switch (errno(rc)) {
         0 => return @intCast(i32, rc),
 @@ -2829,11 +2861,10 @@ pub fn access(path: []const u8, mode: u32) AccessError!void {
         return;
     }
     const path_c = try toPosixPath(path);
-    return accessC(&path_c, mode);
+    return accessZ(&path_c, mode);
 }
-/// Deprecated in favor of `accessZ`.
+pub const accessC = @compileError("Deprecated in favor of `accessZ`");
-pub const accessC = accessZ;
 /// Same as `access` except `path` is null-terminated.
 pub fn accessZ(path: [*:0]const u8, mode: u32) AccessError!void {
 @@ -2920,7 +2951,7 @@ pub fn faccessatW(dirfd: fd_t, sub_path_w: [*:0]const u16, mode: u32, flags: u32
         return;
     }
-    const path_len_bytes = math.cast(u16, mem.toSliceConst(u16, sub_path_w).len * 2) catch |err| switch (err) {
+    const path_len_bytes = math.cast(u16, mem.lenZ(sub_path_w) * 2) catch |err| switch (err) {
         error.Overflow => return error.NameTooLong,
     };
     var nt_name = windows.UNICODE_STRING{
 @@ -3019,7 +3050,9 @@ pub fn sysctl(
     }
 }
-pub fn sysctlbynameC(
+pub const sysctlbynameC = @compileError("deprecated: renamed to sysctlbynameZ");
+pub fn sysctlbynameZ(
     name: [*:0]const u8,
     oldp: ?*c_void,
     oldlenp: ?*usize,
 @@ -3224,23 +3257,25 @@ pub fn realpath(pathname: []const u8, out_buffer: *[MAX_PATH_BYTES]u8) RealPathE
         return realpathW(&pathname_w, out_buffer);
     }
     const pathname_c = try toPosixPath(pathname);
-    return realpathC(&pathname_c, out_buffer);
+    return realpathZ(&pathname_c, out_buffer);
 }
+pub const realpathC = @compileError("deprecated: renamed realpathZ");
 /// Same as `realpath` except `pathname` is null-terminated.
-pub fn realpathC(pathname: [*:0]const u8, out_buffer: *[MAX_PATH_BYTES]u8) RealPathError![]u8 {
+pub fn realpathZ(pathname: [*:0]const u8, out_buffer: *[MAX_PATH_BYTES]u8) RealPathError![]u8 {
     if (builtin.os.tag == .windows) {
         const pathname_w = try windows.cStrToPrefixedFileW(pathname);
         return realpathW(&pathname_w, out_buffer);
     }
     if (builtin.os.tag == .linux and !builtin.link_libc) {
-        const fd = try openC(pathname, linux.O_PATH | linux.O_NONBLOCK | linux.O_CLOEXEC, 0);
+        const fd = try openZ(pathname, linux.O_PATH | linux.O_NONBLOCK | linux.O_CLOEXEC, 0);
         defer close(fd);
         var procfs_buf: ["/proc/self/fd/-2147483648".len:0]u8 = undefined;
         const proc_path = std.fmt.bufPrint(procfs_buf[0..], "/proc/self/fd/{}\x00", .{fd}) catch unreachable;
-        return readlinkC(@ptrCast([*:0]const u8, proc_path.ptr), out_buffer);
+        return readlinkZ(@ptrCast([*:0]const u8, proc_path.ptr), out_buffer);
     }
     const result_path = std.c.realpath(pathname, out_buffer) orelse switch (std.c._errno().*) {
         EINVAL => unreachable,
 @@ -3255,7 +3290,7 @@ pub fn realpathC(pathname: [*:0]const u8, out_buffer: *[MAX_PATH_BYTES]u8) RealP
         EIO => return error.InputOutput,
         else => |err| return unexpectedErrno(@intCast(usize, err)),
     };
-    return mem.toSlice(u8, result_path);
+    return mem.spanZ(result_path);
 }
 /// Same as `realpath` except `pathname` is null-terminated and UTF16LE-encoded.
 @@ -3399,12 +3434,7 @@ pub fn clock_gettime(clk_id: i32, tp: *timespec) ClockGetTimeError!void {
         return;
     }
-    const symbol_name = if (std.Target.current.os.tag == .netbsd)
+    switch (errno(system.clock_gettime(clk_id, tp))) {
-        "__clock_gettime50"
-    else
-        "clock_gettime";
-    switch (errno(@field(system, symbol_name)(clk_id, tp))) {
         0 => return,
         EFAULT => unreachable,
         EINVAL => return error.UnsupportedClock,
 @@ -3426,12 +3456,7 @@ pub fn clock_getres(clk_id: i32, res: *timespec) ClockGetTimeError!void {
         return;
     }
-    const symbol_name = if (std.Target.current.os.tag == .netbsd)
+    switch (errno(system.clock_getres(clk_id, res))) {
-        "__clock_getres50"
-    else
-        "clock_getres";
-    switch (errno(@field(system, symbol_name)(clk_id, res))) {
         0 => return,
         EFAULT => unreachable,
         EINVAL => return error.UnsupportedClock,
 @@ -3497,12 +3522,7 @@ pub const SigaltstackError = error{
 } || UnexpectedError;
 pub fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) SigaltstackError!void {
-    const symbol_name = if (std.Target.current.os.tag == .netbsd)
+    switch (errno(system.sigaltstack(ss, old_ss))) {
-        "__sigaltstack14"
-    else
-        "sigaltstack";
-    switch (errno(@field(system, symbol_name)(ss, old_ss))) {
         0 => return,
         EFAULT => unreachable,
         EINVAL => unreachable,
 @@ -3564,7 +3584,7 @@ pub const GetHostNameError = error{PermissionDenied} || UnexpectedError;
 pub fn gethostname(name_buffer: *[HOST_NAME_MAX]u8) GetHostNameError![]u8 {
     if (builtin.link_libc) {
         switch (errno(system.gethostname(name_buffer, name_buffer.len))) {
-            0 => return mem.toSlice(u8, @ptrCast([*:0]u8, name_buffer)),
+            0 => return mem.spanZ(@ptrCast([*:0]u8, name_buffer)),
             EFAULT => unreachable,
             ENAMETOOLONG => unreachable, // HOST_NAME_MAX prevents this
             EPERM => return error.PermissionDenied,
 @@ -3573,7 +3593,7 @@ pub fn gethostname(name_buffer: *[HOST_NAME_MAX]u8) GetHostNameError![]u8 {
     }
     if (builtin.os.tag == .linux) {
         const uts = uname();
-        const hostname = mem.toSliceConst(u8, @ptrCast([*:0]const u8, &uts.nodename));
+        const hostname = mem.spanZ(@ptrCast([*:0]const u8, &uts.nodename));
         mem.copy(u8, name_buffer, hostname);
         return name_buffer[0..hostname.len];
     }
 @@ -4260,7 +4280,9 @@ pub const MemFdCreateError = error{
     SystemOutdated,
 } || UnexpectedError;
-pub fn memfd_createC(name: [*:0]const u8, flags: u32) MemFdCreateError!fd_t {
+pub const memfd_createC = @compileError("deprecated: renamed to memfd_createZ");
+pub fn memfd_createZ(name: [*:0]const u8, flags: u32) MemFdCreateError!fd_t {
     // memfd_create is available only in glibc versions starting with 2.27.
     const use_c = std.c.versionCheck(.{ .major = 2, .minor = 27, .patch = 0 }).ok;
     const sys = if (use_c) std.c else linux;
 @@ -4291,7 +4313,7 @@ fn toMemFdPath(name: []const u8) ![MFD_MAX_NAME_LEN:0]u8 {
 pub fn memfd_create(name: []const u8, flags: u32) !fd_t {
     const name_t = try toMemFdPath(name);
-    return memfd_createC(&name_t, flags);
+    return memfd_createZ(&name_t, flags);
 }
 pub fn getrusage(who: i32) rusage {

lib/std/os/bits/linux.zig+128-25

...	@@ -88,11 +88,29 @@ pub const FUTEX_PRIVATE_FLAG = 128;	...	@@ -88,11 +88,29 @@ pub const FUTEX_PRIVATE_FLAG = 128;
88		88
89	pub const FUTEX_CLOCK_REALTIME = 256;	89	pub const FUTEX_CLOCK_REALTIME = 256;
90		90
91	pub const PROT_NONE = 0;	91	/// page can not be accessed
92	pub const PROT_READ = 1;	92	pub const PROT_NONE = 0x0;
93	pub const PROT_WRITE = 2;	93
94	pub const PROT_EXEC = 4;	94	/// page can be read
		95	pub const PROT_READ = 0x1;
		96
		97	/// page can be written
		98	pub const PROT_WRITE = 0x2;
		99
		100	/// page can be executed
		101	pub const PROT_EXEC = 0x4;
		102
		103	/// page may be used for atomic ops
		104	pub const PROT_SEM = switch (builtin.arch) {
		105	// TODO: also xtensa
		106	.mips, .mipsel, .mips64, .mips64el => 0x10,
		107	else => 0x8,
		108	};
		109
		110	/// mprotect flag: extend change to start of growsdown vma
95	pub const PROT_GROWSDOWN = 0x01000000;	111	pub const PROT_GROWSDOWN = 0x01000000;
		112
		113	/// mprotect flag: extend change to end of growsup vma
96	pub const PROT_GROWSUP = 0x02000000;	114	pub const PROT_GROWSUP = 0x02000000;
97		115
98	/// Share changes	116	/// Share changes
...	@@ -617,6 +635,11 @@ pub const CLONE_IO = 0x80000000;	...	@@ -617,6 +635,11 @@ pub const CLONE_IO = 0x80000000;
617	/// Clear any signal handler and reset to SIG_DFL.	635	/// Clear any signal handler and reset to SIG_DFL.
618	pub const CLONE_CLEAR_SIGHAND = 0x100000000;	636	pub const CLONE_CLEAR_SIGHAND = 0x100000000;
619		637
		638	// cloning flags intersect with CSIGNAL so can be used with unshare and clone3 syscalls only.
		639
		640	/// New time namespace
		641	pub const CLONE_NEWTIME = 0x00000080;
		642
620	pub const EFD_SEMAPHORE = 1;	643	pub const EFD_SEMAPHORE = 1;
621	pub const EFD_CLOEXEC = O_CLOEXEC;	644	pub const EFD_CLOEXEC = O_CLOEXEC;
622	pub const EFD_NONBLOCK = O_NONBLOCK;	645	pub const EFD_NONBLOCK = O_NONBLOCK;
...	@@ -790,13 +813,13 @@ pub const app_mask: sigset_t = [2]u32{ 0xfffffffc, 0x7fffffff } ++ [_]u32{0xffff	...	@@ -790,13 +813,13 @@ pub const app_mask: sigset_t = [2]u32{ 0xfffffffc, 0x7fffffff } ++ [_]u32{0xffff
790	pub const k_sigaction = if (is_mips)	813	pub const k_sigaction = if (is_mips)
791	extern struct {	814	extern struct {
792	flags: usize,	815	flags: usize,
793	sigaction: ?extern fn (i32, siginfo_t, c_void) void,	816	sigaction: ?extern fn (i32, siginfo_t, ?c_void) void,
794	mask: [4]u32,	817	mask: [4]u32,
795	restorer: extern fn () void,	818	restorer: extern fn () void,
796	}	819	}
797	else	820	else
798	extern struct {	821	extern struct {
799	sigaction: ?extern fn (i32, siginfo_t, c_void) void,	822	sigaction: ?extern fn (i32, siginfo_t, ?c_void) void,
800	flags: usize,	823	flags: usize,
801	restorer: extern fn () void,	824	restorer: extern fn () void,
802	mask: [2]u32,	825	mask: [2]u32,
...	@@ -804,15 +827,17 @@ else	...	@@ -804,15 +827,17 @@ else
804		827
805	/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.	828	/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
806	pub const Sigaction = extern struct {	829	pub const Sigaction = extern struct {
807	sigaction: ?extern fn (i32, siginfo_t, c_void) void,	830	pub const sigaction_fn = fn (i32, siginfo_t, ?c_void) callconv(.C) void;
		831	sigaction: ?sigaction_fn,
808	mask: sigset_t,	832	mask: sigset_t,
809	flags: u32,	833	flags: u32,
810	restorer: ?extern fn () void = null,	834	restorer: ?extern fn () void = null,
811	};	835	};
812		836
813	pub const SIG_ERR = @intToPtr(extern fn (i32, siginfo_t, c_void) void, maxInt(usize));	837	pub const SIG_ERR = @intToPtr(?Sigaction.sigaction_fn, maxInt(usize));
814	pub const SIG_DFL = @intToPtr(?extern fn (i32, siginfo_t, c_void) void, 0);	838	pub const SIG_DFL = @intToPtr(?Sigaction.sigaction_fn, 0);
815	pub const SIG_IGN = @intToPtr(extern fn (i32, siginfo_t, c_void) void, 1);	839	pub const SIG_IGN = @intToPtr(?Sigaction.sigaction_fn, 1);
		840
816	pub const empty_sigset = [_]u32{0} ** sigset_t.len;	841	pub const empty_sigset = [_]u32{0} ** sigset_t.len;
817		842
818	pub const in_port_t = u16;	843	pub const in_port_t = u16;
...	@@ -1125,7 +1150,8 @@ pub const io_uring_params = extern struct {	...	@@ -1125,7 +1150,8 @@ pub const io_uring_params = extern struct {
1125	sq_thread_cpu: u32,	1150	sq_thread_cpu: u32,
1126	sq_thread_idle: u32,	1151	sq_thread_idle: u32,
1127	features: u32,	1152	features: u32,
1128	resv: [4]u32,	1153	wq_fd: u32,
		1154	resv: [3]u32,
1129	sq_off: io_sqring_offsets,	1155	sq_off: io_sqring_offsets,
1130	cq_off: io_cqring_offsets,	1156	cq_off: io_cqring_offsets,
1131	};	1157	};
...	@@ -1135,6 +1161,8 @@ pub const io_uring_params = extern struct {	...	@@ -1135,6 +1161,8 @@ pub const io_uring_params = extern struct {
1135	pub const IORING_FEAT_SINGLE_MMAP = 1 << 0;	1161	pub const IORING_FEAT_SINGLE_MMAP = 1 << 0;
1136	pub const IORING_FEAT_NODROP = 1 << 1;	1162	pub const IORING_FEAT_NODROP = 1 << 1;
1137	pub const IORING_FEAT_SUBMIT_STABLE = 1 << 2;	1163	pub const IORING_FEAT_SUBMIT_STABLE = 1 << 2;
		1164	pub const IORING_FEAT_RW_CUR_POS = 1 << 3;
		1165	pub const IORING_FEAT_CUR_PERSONALITY = 1 << 4;
1138		1166
1139	// io_uring_params.flags	1167	// io_uring_params.flags
1140		1168
...	@@ -1150,6 +1178,12 @@ pub const IORING_SETUP_SQ_AFF = 1 << 2;	...	@@ -1150,6 +1178,12 @@ pub const IORING_SETUP_SQ_AFF = 1 << 2;
1150	/// app defines CQ size	1178	/// app defines CQ size
1151	pub const IORING_SETUP_CQSIZE = 1 << 3;	1179	pub const IORING_SETUP_CQSIZE = 1 << 3;
1152		1180
		1181	/// clamp SQ/CQ ring sizes
		1182	pub const IORING_SETUP_CLAMP = 1 << 4;
		1183
		1184	/// attach to existing wq
		1185	pub const IORING_SETUP_ATTACH_WQ = 1 << 5;
		1186
1153	pub const io_sqring_offsets = extern struct {	1187	pub const io_sqring_offsets = extern struct {
1154	/// offset of ring head	1188	/// offset of ring head
1155	head: u32,	1189	head: u32,
...	@@ -1192,7 +1226,7 @@ pub const io_cqring_offsets = extern struct {	...	@@ -1192,7 +1226,7 @@ pub const io_cqring_offsets = extern struct {
1192	};	1226	};
1193		1227
1194	pub const io_uring_sqe = extern struct {	1228	pub const io_uring_sqe = extern struct {
1195	opcode: u8,	1229	opcode: IORING_OP,
1196	flags: u8,	1230	flags: u8,
1197	ioprio: u16,	1231	ioprio: u16,
1198	fd: i32,	1232	fd: i32,
...	@@ -1212,31 +1246,53 @@ pub const io_uring_sqe = extern struct {	...	@@ -1212,31 +1246,53 @@ pub const io_uring_sqe = extern struct {
1212	timeout_flags: u32,	1246	timeout_flags: u32,
1213	accept_flags: u32,	1247	accept_flags: u32,
1214	cancel_flags: u32,	1248	cancel_flags: u32,
		1249	open_flags: u32,
		1250	statx_flags: u32,
		1251	fadvise_flags: u32,
1215	};	1252	};
1216	union2: union2,	1253	union2: union2,
1217	user_data: u64,	1254	user_data: u64,
1218	pub const union3 = extern union {	1255	pub const union3 = extern union {
1219	buf_index: u16,	1256	struct1: extern struct {
		1257	/// index into fixed buffers, if used
		1258	buf_index: u16,
		1259
		1260	/// personality to use, if used
		1261	personality: u16,
		1262	},
1220	__pad2: [3]u64,	1263	__pad2: [3]u64,
1221	};	1264	};
1222	union3: union3,	1265	union3: union3,
1223	};	1266	};
1224		1267
		1268	pub const IOSQE_BIT = extern enum {
		1269	FIXED_FILE,
		1270	IO_DRAIN,
		1271	IO_LINK,
		1272	IO_HARDLINK,
		1273	ASYNC,
		1274
		1275	_,
		1276	};
		1277
1225	// io_uring_sqe.flags	1278	// io_uring_sqe.flags
1226		1279
1227	/// use fixed fileset	1280	/// use fixed fileset
1228	pub const IOSQE_FIXED_FILE = 1 << 0;	1281	pub const IOSQE_FIXED_FILE = 1 << IOSQE_BIT.FIXED_FILE;
1229		1282
1230	/// issue after inflight IO	1283	/// issue after inflight IO
1231	pub const IOSQE_IO_DRAIN = 1 << 1;	1284	pub const IOSQE_IO_DRAIN = 1 << IOSQE_BIT.IO_DRAIN;
1232		1285
1233	/// links next sqe	1286	/// links next sqe
1234	pub const IOSQE_IO_LINK = 1 << 2;	1287	pub const IOSQE_IO_LINK = 1 << IOSQE_BIT.IO_LINK;
1235		1288
1236	/// like LINK, but stronger	1289	/// like LINK, but stronger
1237	pub const IOSQE_IO_HARDLINK = 1 << 3;	1290	pub const IOSQE_IO_HARDLINK = 1 << IOSQE_BIT.IO_HARDLINK;
		1291
		1292	/// always go async
		1293	pub const IOSQE_ASYNC = 1 << IOSQE_BIT.ASYNC;
1238		1294
1239	pub const IORING_OP = extern enum {	1295	pub const IORING_OP = extern enum(u8) {
1240	NOP,	1296	NOP,
1241	READV,	1297	READV,
1242	WRITEV,	1298	WRITEV,
...	@@ -1254,6 +1310,19 @@ pub const IORING_OP = extern enum {	...	@@ -1254,6 +1310,19 @@ pub const IORING_OP = extern enum {
1254	ASYNC_CANCEL,	1310	ASYNC_CANCEL,
1255	LINK_TIMEOUT,	1311	LINK_TIMEOUT,
1256	CONNECT,	1312	CONNECT,
		1313	FALLOCATE,
		1314	OPENAT,
		1315	CLOSE,
		1316	FILES_UPDATE,
		1317	STATX,
		1318	READ,
		1319	WRITE,
		1320	FADVISE,
		1321	MADVISE,
		1322	SEND,
		1323	RECV,
		1324	OPENAT2,
		1325	EPOLL_CTL,
1257		1326
1258	_,	1327	_,
1259	};	1328	};
...	@@ -1283,13 +1352,21 @@ pub const IORING_ENTER_GETEVENTS = 1 << 0;	...	@@ -1283,13 +1352,21 @@ pub const IORING_ENTER_GETEVENTS = 1 << 0;
1283	pub const IORING_ENTER_SQ_WAKEUP = 1 << 1;	1352	pub const IORING_ENTER_SQ_WAKEUP = 1 << 1;
1284		1353
1285	// io_uring_register opcodes and arguments	1354	// io_uring_register opcodes and arguments
1286	pub const IORING_REGISTER_BUFFERS = 0;	1355	pub const IORING_REGISTER = extern enum(u32) {
1287	pub const IORING_UNREGISTER_BUFFERS = 1;	1356	REGISTER_BUFFERS,
1288	pub const IORING_REGISTER_FILES = 2;	1357	UNREGISTER_BUFFERS,
1289	pub const IORING_UNREGISTER_FILES = 3;	1358	REGISTER_FILES,
1290	pub const IORING_REGISTER_EVENTFD = 4;	1359	UNREGISTER_FILES,
1291	pub const IORING_UNREGISTER_EVENTFD = 5;	1360	REGISTER_EVENTFD,
1292	pub const IORING_REGISTER_FILES_UPDATE = 6;	1361	UNREGISTER_EVENTFD,
		1362	REGISTER_FILES_UPDATE,
		1363	REGISTER_EVENTFD_ASYNC,
		1364	REGISTER_PROBE,
		1365	REGISTER_PERSONALITY,
		1366	UNREGISTER_PERSONALITY,
		1367
		1368	_,
		1369	};
1293		1370
1294	pub const io_uring_files_update = struct {	1371	pub const io_uring_files_update = struct {
1295	offset: u32,	1372	offset: u32,
...	@@ -1297,6 +1374,32 @@ pub const io_uring_files_update = struct {	...	@@ -1297,6 +1374,32 @@ pub const io_uring_files_update = struct {
1297	fds: u64,	1374	fds: u64,
1298	};	1375	};
1299		1376
		1377	pub const IO_URING_OP_SUPPORTED = 1 << 0;
		1378
		1379	pub const io_uring_probe_op = struct {
		1380	op: IORING_OP,
		1381
		1382	resv: u8,
		1383
		1384	/// IO_URING_OP_* flags
		1385	flags: u16,
		1386
		1387	resv2: u32,
		1388	};
		1389
		1390	pub const io_uring_probe = struct {
		1391	/// last opcode supported
		1392	last_op: IORING_OP,
		1393
		1394	/// Number of io_uring_probe_op following
		1395	ops_len: u8,
		1396
		1397	resv: u16,
		1398	resv2: u32[3],
		1399
		1400	// Followed by up to `ops_len` io_uring_probe_op structures
		1401	};
		1402
1300	pub const utsname = extern struct {	1403	pub const utsname = extern struct {
1301	sysname: [64:0]u8,	1404	sysname: [64:0]u8,
1302	nodename: [64:0]u8,	1405	nodename: [64:0]u8,

lib/std/os/bits/linux/arm-eabi.zig+404-398

...	@@ -10,404 +10,410 @@ const uid_t = linux.uid_t;	...	@@ -10,404 +10,410 @@ const uid_t = linux.uid_t;
10	const gid_t = linux.gid_t;	10	const gid_t = linux.gid_t;
11	const pid_t = linux.pid_t;	11	const pid_t = linux.pid_t;
12		12
13	pub const SYS_restart_syscall = 0;	13	pub const SYS = extern enum(usize) {
14	pub const SYS_exit = 1;	14	restart_syscall = 0,
15	pub const SYS_fork = 2;	15	exit = 1,
16	pub const SYS_read = 3;	16	fork = 2,
17	pub const SYS_write = 4;	17	read = 3,
18	pub const SYS_open = 5;	18	write = 4,
19	pub const SYS_close = 6;	19	open = 5,
20	pub const SYS_creat = 8;	20	close = 6,
21	pub const SYS_link = 9;	21	creat = 8,
22	pub const SYS_unlink = 10;	22	link = 9,
23	pub const SYS_execve = 11;	23	unlink = 10,
24	pub const SYS_chdir = 12;	24	execve = 11,
25	pub const SYS_mknod = 14;	25	chdir = 12,
26	pub const SYS_chmod = 15;	26	mknod = 14,
27	pub const SYS_lchown = 16;	27	chmod = 15,
28	pub const SYS_lseek = 19;	28	lchown = 16,
29	pub const SYS_getpid = 20;	29	lseek = 19,
30	pub const SYS_mount = 21;	30	getpid = 20,
31	pub const SYS_setuid = 23;	31	mount = 21,
32	pub const SYS_getuid = 24;	32	setuid = 23,
33	pub const SYS_ptrace = 26;	33	getuid = 24,
34	pub const SYS_pause = 29;	34	ptrace = 26,
35	pub const SYS_access = 33;	35	pause = 29,
36	pub const SYS_nice = 34;	36	access = 33,
37	pub const SYS_sync = 36;	37	nice = 34,
38	pub const SYS_kill = 37;	38	sync = 36,
39	pub const SYS_rename = 38;	39	kill = 37,
40	pub const SYS_mkdir = 39;	40	rename = 38,
41	pub const SYS_rmdir = 40;	41	mkdir = 39,
42	pub const SYS_dup = 41;	42	rmdir = 40,
43	pub const SYS_pipe = 42;	43	dup = 41,
44	pub const SYS_times = 43;	44	pipe = 42,
45	pub const SYS_brk = 45;	45	times = 43,
46	pub const SYS_setgid = 46;	46	brk = 45,
47	pub const SYS_getgid = 47;	47	setgid = 46,
48	pub const SYS_geteuid = 49;	48	getgid = 47,
49	pub const SYS_getegid = 50;	49	geteuid = 49,
50	pub const SYS_acct = 51;	50	getegid = 50,
51	pub const SYS_umount2 = 52;	51	acct = 51,
52	pub const SYS_ioctl = 54;	52	umount2 = 52,
53	pub const SYS_fcntl = 55;	53	ioctl = 54,
54	pub const SYS_setpgid = 57;	54	fcntl = 55,
55	pub const SYS_umask = 60;	55	setpgid = 57,
56	pub const SYS_chroot = 61;	56	umask = 60,
57	pub const SYS_ustat = 62;	57	chroot = 61,
58	pub const SYS_dup2 = 63;	58	ustat = 62,
59	pub const SYS_getppid = 64;	59	dup2 = 63,
60	pub const SYS_getpgrp = 65;	60	getppid = 64,
61	pub const SYS_setsid = 66;	61	getpgrp = 65,
62	pub const SYS_sigaction = 67;	62	setsid = 66,
63	pub const SYS_setreuid = 70;	63	sigaction = 67,
64	pub const SYS_setregid = 71;	64	setreuid = 70,
65	pub const SYS_sigsuspend = 72;	65	setregid = 71,
66	pub const SYS_sigpending = 73;	66	sigsuspend = 72,
67	pub const SYS_sethostname = 74;	67	sigpending = 73,
68	pub const SYS_setrlimit = 75;	68	sethostname = 74,
69	pub const SYS_getrusage = 77;	69	setrlimit = 75,
70	pub const SYS_gettimeofday = 78;	70	getrusage = 77,
71	pub const SYS_settimeofday = 79;	71	gettimeofday = 78,
72	pub const SYS_getgroups = 80;	72	settimeofday = 79,
73	pub const SYS_setgroups = 81;	73	getgroups = 80,
74	pub const SYS_symlink = 83;	74	setgroups = 81,
75	pub const SYS_readlink = 85;	75	symlink = 83,
76	pub const SYS_uselib = 86;	76	readlink = 85,
77	pub const SYS_swapon = 87;	77	uselib = 86,
78	pub const SYS_reboot = 88;	78	swapon = 87,
79	pub const SYS_munmap = 91;	79	reboot = 88,
80	pub const SYS_truncate = 92;	80	munmap = 91,
81	pub const SYS_ftruncate = 93;	81	truncate = 92,
82	pub const SYS_fchmod = 94;	82	ftruncate = 93,
83	pub const SYS_fchown = 95;	83	fchmod = 94,
84	pub const SYS_getpriority = 96;	84	fchown = 95,
85	pub const SYS_setpriority = 97;	85	getpriority = 96,
86	pub const SYS_statfs = 99;	86	setpriority = 97,
87	pub const SYS_fstatfs = 100;	87	statfs = 99,
88	pub const SYS_syslog = 103;	88	fstatfs = 100,
89	pub const SYS_setitimer = 104;	89	syslog = 103,
90	pub const SYS_getitimer = 105;	90	setitimer = 104,
91	pub const SYS_stat = 106;	91	getitimer = 105,
92	pub const SYS_lstat = 107;	92	stat = 106,
93	pub const SYS_fstat = 108;	93	lstat = 107,
94	pub const SYS_vhangup = 111;	94	fstat = 108,
95	pub const SYS_wait4 = 114;	95	vhangup = 111,
96	pub const SYS_swapoff = 115;	96	wait4 = 114,
97	pub const SYS_sysinfo = 116;	97	swapoff = 115,
98	pub const SYS_fsync = 118;	98	sysinfo = 116,
99	pub const SYS_sigreturn = 119;	99	fsync = 118,
100	pub const SYS_clone = 120;	100	sigreturn = 119,
101	pub const SYS_setdomainname = 121;	101	clone = 120,
102	pub const SYS_uname = 122;	102	setdomainname = 121,
103	pub const SYS_adjtimex = 124;	103	uname = 122,
104	pub const SYS_mprotect = 125;	104	adjtimex = 124,
105	pub const SYS_sigprocmask = 126;	105	mprotect = 125,
106	pub const SYS_init_module = 128;	106	sigprocmask = 126,
107	pub const SYS_delete_module = 129;	107	init_module = 128,
108	pub const SYS_quotactl = 131;	108	delete_module = 129,
109	pub const SYS_getpgid = 132;	109	quotactl = 131,
110	pub const SYS_fchdir = 133;	110	getpgid = 132,
111	pub const SYS_bdflush = 134;	111	fchdir = 133,
112	pub const SYS_sysfs = 135;	112	bdflush = 134,
113	pub const SYS_personality = 136;	113	sysfs = 135,
114	pub const SYS_setfsuid = 138;	114	personality = 136,
115	pub const SYS_setfsgid = 139;	115	setfsuid = 138,
116	pub const SYS__llseek = 140;	116	setfsgid = 139,
117	pub const SYS_getdents = 141;	117	_llseek = 140,
118	pub const SYS__newselect = 142;	118	getdents = 141,
119	pub const SYS_flock = 143;	119	_newselect = 142,
120	pub const SYS_msync = 144;	120	flock = 143,
121	pub const SYS_readv = 145;	121	msync = 144,
122	pub const SYS_writev = 146;	122	readv = 145,
123	pub const SYS_getsid = 147;	123	writev = 146,
124	pub const SYS_fdatasync = 148;	124	getsid = 147,
125	pub const SYS__sysctl = 149;	125	fdatasync = 148,
126	pub const SYS_mlock = 150;	126	_sysctl = 149,
127	pub const SYS_munlock = 151;	127	mlock = 150,
128	pub const SYS_mlockall = 152;	128	munlock = 151,
129	pub const SYS_munlockall = 153;	129	mlockall = 152,
130	pub const SYS_sched_setparam = 154;	130	munlockall = 153,
131	pub const SYS_sched_getparam = 155;	131	sched_setparam = 154,
132	pub const SYS_sched_setscheduler = 156;	132	sched_getparam = 155,
133	pub const SYS_sched_getscheduler = 157;	133	sched_setscheduler = 156,
134	pub const SYS_sched_yield = 158;	134	sched_getscheduler = 157,
135	pub const SYS_sched_get_priority_max = 159;	135	sched_yield = 158,
136	pub const SYS_sched_get_priority_min = 160;	136	sched_get_priority_max = 159,
137	pub const SYS_sched_rr_get_interval = 161;	137	sched_get_priority_min = 160,
138	pub const SYS_nanosleep = 162;	138	sched_rr_get_interval = 161,
139	pub const SYS_mremap = 163;	139	nanosleep = 162,
140	pub const SYS_setresuid = 164;	140	mremap = 163,
141	pub const SYS_getresuid = 165;	141	setresuid = 164,
142	pub const SYS_poll = 168;	142	getresuid = 165,
143	pub const SYS_nfsservctl = 169;	143	poll = 168,
144	pub const SYS_setresgid = 170;	144	nfsservctl = 169,
145	pub const SYS_getresgid = 171;	145	setresgid = 170,
146	pub const SYS_prctl = 172;	146	getresgid = 171,
147	pub const SYS_rt_sigreturn = 173;	147	prctl = 172,
148	pub const SYS_rt_sigaction = 174;	148	rt_sigreturn = 173,
149	pub const SYS_rt_sigprocmask = 175;	149	rt_sigaction = 174,
150	pub const SYS_rt_sigpending = 176;	150	rt_sigprocmask = 175,
151	pub const SYS_rt_sigtimedwait = 177;	151	rt_sigpending = 176,
152	pub const SYS_rt_sigqueueinfo = 178;	152	rt_sigtimedwait = 177,
153	pub const SYS_rt_sigsuspend = 179;	153	rt_sigqueueinfo = 178,
154	pub const SYS_pread64 = 180;	154	rt_sigsuspend = 179,
155	pub const SYS_pwrite64 = 181;	155	pread64 = 180,
156	pub const SYS_chown = 182;	156	pwrite64 = 181,
157	pub const SYS_getcwd = 183;	157	chown = 182,
158	pub const SYS_capget = 184;	158	getcwd = 183,
159	pub const SYS_capset = 185;	159	capget = 184,
160	pub const SYS_sigaltstack = 186;	160	capset = 185,
161	pub const SYS_sendfile = 187;	161	sigaltstack = 186,
162	pub const SYS_vfork = 190;	162	sendfile = 187,
163	pub const SYS_ugetrlimit = 191;	163	vfork = 190,
164	pub const SYS_mmap2 = 192;	164	ugetrlimit = 191,
165	pub const SYS_truncate64 = 193;	165	mmap2 = 192,
166	pub const SYS_ftruncate64 = 194;	166	truncate64 = 193,
167	pub const SYS_stat64 = 195;	167	ftruncate64 = 194,
168	pub const SYS_lstat64 = 196;	168	stat64 = 195,
169	pub const SYS_fstat64 = 197;	169	lstat64 = 196,
170	pub const SYS_lchown32 = 198;	170	fstat64 = 197,
171	pub const SYS_getuid32 = 199;	171	lchown32 = 198,
172	pub const SYS_getgid32 = 200;	172	getuid32 = 199,
173	pub const SYS_geteuid32 = 201;	173	getgid32 = 200,
174	pub const SYS_getegid32 = 202;	174	geteuid32 = 201,
175	pub const SYS_setreuid32 = 203;	175	getegid32 = 202,
176	pub const SYS_setregid32 = 204;	176	setreuid32 = 203,
177	pub const SYS_getgroups32 = 205;	177	setregid32 = 204,
178	pub const SYS_setgroups32 = 206;	178	getgroups32 = 205,
179	pub const SYS_fchown32 = 207;	179	setgroups32 = 206,
180	pub const SYS_setresuid32 = 208;	180	fchown32 = 207,
181	pub const SYS_getresuid32 = 209;	181	setresuid32 = 208,
182	pub const SYS_setresgid32 = 210;	182	getresuid32 = 209,
183	pub const SYS_getresgid32 = 211;	183	setresgid32 = 210,
184	pub const SYS_chown32 = 212;	184	getresgid32 = 211,
185	pub const SYS_setuid32 = 213;	185	chown32 = 212,
186	pub const SYS_setgid32 = 214;	186	setuid32 = 213,
187	pub const SYS_setfsuid32 = 215;	187	setgid32 = 214,
188	pub const SYS_setfsgid32 = 216;	188	setfsuid32 = 215,
189	pub const SYS_getdents64 = 217;	189	setfsgid32 = 216,
190	pub const SYS_pivot_root = 218;	190	getdents64 = 217,
191	pub const SYS_mincore = 219;	191	pivot_root = 218,
192	pub const SYS_madvise = 220;	192	mincore = 219,
193	pub const SYS_fcntl64 = 221;	193	madvise = 220,
194	pub const SYS_gettid = 224;	194	fcntl64 = 221,
195	pub const SYS_readahead = 225;	195	gettid = 224,
196	pub const SYS_setxattr = 226;	196	readahead = 225,
197	pub const SYS_lsetxattr = 227;	197	setxattr = 226,
198	pub const SYS_fsetxattr = 228;	198	lsetxattr = 227,
199	pub const SYS_getxattr = 229;	199	fsetxattr = 228,
200	pub const SYS_lgetxattr = 230;	200	getxattr = 229,
201	pub const SYS_fgetxattr = 231;	201	lgetxattr = 230,
202	pub const SYS_listxattr = 232;	202	fgetxattr = 231,
203	pub const SYS_llistxattr = 233;	203	listxattr = 232,
204	pub const SYS_flistxattr = 234;	204	llistxattr = 233,
205	pub const SYS_removexattr = 235;	205	flistxattr = 234,
206	pub const SYS_lremovexattr = 236;	206	removexattr = 235,
207	pub const SYS_fremovexattr = 237;	207	lremovexattr = 236,
208	pub const SYS_tkill = 238;	208	fremovexattr = 237,
209	pub const SYS_sendfile64 = 239;	209	tkill = 238,
210	pub const SYS_futex = 240;	210	sendfile64 = 239,
211	pub const SYS_sched_setaffinity = 241;	211	futex = 240,
212	pub const SYS_sched_getaffinity = 242;	212	sched_setaffinity = 241,
213	pub const SYS_io_setup = 243;	213	sched_getaffinity = 242,
214	pub const SYS_io_destroy = 244;	214	io_setup = 243,
215	pub const SYS_io_getevents = 245;	215	io_destroy = 244,
216	pub const SYS_io_submit = 246;	216	io_getevents = 245,
217	pub const SYS_io_cancel = 247;	217	io_submit = 246,
218	pub const SYS_exit_group = 248;	218	io_cancel = 247,
219	pub const SYS_lookup_dcookie = 249;	219	exit_group = 248,
220	pub const SYS_epoll_create = 250;	220	lookup_dcookie = 249,
221	pub const SYS_epoll_ctl = 251;	221	epoll_create = 250,
222	pub const SYS_epoll_wait = 252;	222	epoll_ctl = 251,
223	pub const SYS_remap_file_pages = 253;	223	epoll_wait = 252,
224	pub const SYS_set_tid_address = 256;	224	remap_file_pages = 253,
225	pub const SYS_timer_create = 257;	225	set_tid_address = 256,
226	pub const SYS_timer_settime = 258;	226	timer_create = 257,
227	pub const SYS_timer_gettime = 259;	227	timer_settime = 258,
228	pub const SYS_timer_getoverrun = 260;	228	timer_gettime = 259,
229	pub const SYS_timer_delete = 261;	229	timer_getoverrun = 260,
230	pub const SYS_clock_settime = 262;	230	timer_delete = 261,
231	pub const SYS_clock_gettime = 263;	231	clock_settime = 262,
232	pub const SYS_clock_getres = 264;	232	clock_gettime = 263,
233	pub const SYS_clock_nanosleep = 265;	233	clock_getres = 264,
234	pub const SYS_statfs64 = 266;	234	clock_nanosleep = 265,
235	pub const SYS_fstatfs64 = 267;	235	statfs64 = 266,
236	pub const SYS_tgkill = 268;	236	fstatfs64 = 267,
237	pub const SYS_utimes = 269;	237	tgkill = 268,
238	pub const SYS_fadvise64_64 = 270;	238	utimes = 269,
239	pub const SYS_arm_fadvise64_64 = 270;	239	fadvise64_64 = 270,
240	pub const SYS_pciconfig_iobase = 271;	240	arm_fadvise64_64 = 270,
241	pub const SYS_pciconfig_read = 272;	241	pciconfig_iobase = 271,
242	pub const SYS_pciconfig_write = 273;	242	pciconfig_read = 272,
243	pub const SYS_mq_open = 274;	243	pciconfig_write = 273,
244	pub const SYS_mq_unlink = 275;	244	mq_open = 274,
245	pub const SYS_mq_timedsend = 276;	245	mq_unlink = 275,
246	pub const SYS_mq_timedreceive = 277;	246	mq_timedsend = 276,
247	pub const SYS_mq_notify = 278;	247	mq_timedreceive = 277,
248	pub const SYS_mq_getsetattr = 279;	248	mq_notify = 278,
249	pub const SYS_waitid = 280;	249	mq_getsetattr = 279,
250	pub const SYS_socket = 281;	250	waitid = 280,
251	pub const SYS_bind = 282;	251	socket = 281,
252	pub const SYS_connect = 283;	252	bind = 282,
253	pub const SYS_listen = 284;	253	connect = 283,
254	pub const SYS_accept = 285;	254	listen = 284,
255	pub const SYS_getsockname = 286;	255	accept = 285,
256	pub const SYS_getpeername = 287;	256	getsockname = 286,
257	pub const SYS_socketpair = 288;	257	getpeername = 287,
258	pub const SYS_send = 289;	258	socketpair = 288,
259	pub const SYS_sendto = 290;	259	send = 289,
260	pub const SYS_recv = 291;	260	sendto = 290,
261	pub const SYS_recvfrom = 292;	261	recv = 291,
262	pub const SYS_shutdown = 293;	262	recvfrom = 292,
263	pub const SYS_setsockopt = 294;	263	shutdown = 293,
264	pub const SYS_getsockopt = 295;	264	setsockopt = 294,
265	pub const SYS_sendmsg = 296;	265	getsockopt = 295,
266	pub const SYS_recvmsg = 297;	266	sendmsg = 296,
267	pub const SYS_semop = 298;	267	recvmsg = 297,
268	pub const SYS_semget = 299;	268	semop = 298,
269	pub const SYS_semctl = 300;	269	semget = 299,
270	pub const SYS_msgsnd = 301;	270	semctl = 300,
271	pub const SYS_msgrcv = 302;	271	msgsnd = 301,
272	pub const SYS_msgget = 303;	272	msgrcv = 302,
273	pub const SYS_msgctl = 304;	273	msgget = 303,
274	pub const SYS_shmat = 305;	274	msgctl = 304,
275	pub const SYS_shmdt = 306;	275	shmat = 305,
276	pub const SYS_shmget = 307;	276	shmdt = 306,
277	pub const SYS_shmctl = 308;	277	shmget = 307,
278	pub const SYS_add_key = 309;	278	shmctl = 308,
279	pub const SYS_request_key = 310;	279	add_key = 309,
280	pub const SYS_keyctl = 311;	280	request_key = 310,
281	pub const SYS_semtimedop = 312;	281	keyctl = 311,
282	pub const SYS_vserver = 313;	282	semtimedop = 312,
283	pub const SYS_ioprio_set = 314;	283	vserver = 313,
284	pub const SYS_ioprio_get = 315;	284	ioprio_set = 314,
285	pub const SYS_inotify_init = 316;	285	ioprio_get = 315,
286	pub const SYS_inotify_add_watch = 317;	286	inotify_init = 316,
287	pub const SYS_inotify_rm_watch = 318;	287	inotify_add_watch = 317,
288	pub const SYS_mbind = 319;	288	inotify_rm_watch = 318,
289	pub const SYS_get_mempolicy = 320;	289	mbind = 319,
290	pub const SYS_set_mempolicy = 321;	290	get_mempolicy = 320,
291	pub const SYS_openat = 322;	291	set_mempolicy = 321,
292	pub const SYS_mkdirat = 323;	292	openat = 322,
293	pub const SYS_mknodat = 324;	293	mkdirat = 323,
294	pub const SYS_fchownat = 325;	294	mknodat = 324,
295	pub const SYS_futimesat = 326;	295	fchownat = 325,
296	pub const SYS_fstatat64 = 327;	296	futimesat = 326,
297	pub const SYS_unlinkat = 328;	297	fstatat64 = 327,
298	pub const SYS_renameat = 329;	298	unlinkat = 328,
299	pub const SYS_linkat = 330;	299	renameat = 329,
300	pub const SYS_symlinkat = 331;	300	linkat = 330,
301	pub const SYS_readlinkat = 332;	301	symlinkat = 331,
302	pub const SYS_fchmodat = 333;	302	readlinkat = 332,
303	pub const SYS_faccessat = 334;	303	fchmodat = 333,
304	pub const SYS_pselect6 = 335;	304	faccessat = 334,
305	pub const SYS_ppoll = 336;	305	pselect6 = 335,
306	pub const SYS_unshare = 337;	306	ppoll = 336,
307	pub const SYS_set_robust_list = 338;	307	unshare = 337,
308	pub const SYS_get_robust_list = 339;	308	set_robust_list = 338,
309	pub const SYS_splice = 340;	309	get_robust_list = 339,
310	pub const SYS_sync_file_range2 = 341;	310	splice = 340,
311	pub const SYS_arm_sync_file_range = 341;	311	sync_file_range2 = 341,
312	pub const SYS_tee = 342;	312	arm_sync_file_range = 341,
313	pub const SYS_vmsplice = 343;	313	tee = 342,
314	pub const SYS_move_pages = 344;	314	vmsplice = 343,
315	pub const SYS_getcpu = 345;	315	move_pages = 344,
316	pub const SYS_epoll_pwait = 346;	316	getcpu = 345,
317	pub const SYS_kexec_load = 347;	317	epoll_pwait = 346,
318	pub const SYS_utimensat = 348;	318	kexec_load = 347,
319	pub const SYS_signalfd = 349;	319	utimensat = 348,
320	pub const SYS_timerfd_create = 350;	320	signalfd = 349,
321	pub const SYS_eventfd = 351;	321	timerfd_create = 350,
322	pub const SYS_fallocate = 352;	322	eventfd = 351,
323	pub const SYS_timerfd_settime = 353;	323	fallocate = 352,
324	pub const SYS_timerfd_gettime = 354;	324	timerfd_settime = 353,
325	pub const SYS_signalfd4 = 355;	325	timerfd_gettime = 354,
326	pub const SYS_eventfd2 = 356;	326	signalfd4 = 355,
327	pub const SYS_epoll_create1 = 357;	327	eventfd2 = 356,
328	pub const SYS_dup3 = 358;	328	epoll_create1 = 357,
329	pub const SYS_pipe2 = 359;	329	dup3 = 358,
330	pub const SYS_inotify_init1 = 360;	330	pipe2 = 359,
331	pub const SYS_preadv = 361;	331	inotify_init1 = 360,
332	pub const SYS_pwritev = 362;	332	preadv = 361,
333	pub const SYS_rt_tgsigqueueinfo = 363;	333	pwritev = 362,
334	pub const SYS_perf_event_open = 364;	334	rt_tgsigqueueinfo = 363,
335	pub const SYS_recvmmsg = 365;	335	perf_event_open = 364,
336	pub const SYS_accept4 = 366;	336	recvmmsg = 365,
337	pub const SYS_fanotify_init = 367;	337	accept4 = 366,
338	pub const SYS_fanotify_mark = 368;	338	fanotify_init = 367,
339	pub const SYS_prlimit64 = 369;	339	fanotify_mark = 368,
340	pub const SYS_name_to_handle_at = 370;	340	prlimit64 = 369,
341	pub const SYS_open_by_handle_at = 371;	341	name_to_handle_at = 370,
342	pub const SYS_clock_adjtime = 372;	342	open_by_handle_at = 371,
343	pub const SYS_syncfs = 373;	343	clock_adjtime = 372,
344	pub const SYS_sendmmsg = 374;	344	syncfs = 373,
345	pub const SYS_setns = 375;	345	sendmmsg = 374,
346	pub const SYS_process_vm_readv = 376;	346	setns = 375,
347	pub const SYS_process_vm_writev = 377;	347	process_vm_readv = 376,
348	pub const SYS_kcmp = 378;	348	process_vm_writev = 377,
349	pub const SYS_finit_module = 379;	349	kcmp = 378,
350	pub const SYS_sched_setattr = 380;	350	finit_module = 379,
351	pub const SYS_sched_getattr = 381;	351	sched_setattr = 380,
352	pub const SYS_renameat2 = 382;	352	sched_getattr = 381,
353	pub const SYS_seccomp = 383;	353	renameat2 = 382,
354	pub const SYS_getrandom = 384;	354	seccomp = 383,
355	pub const SYS_memfd_create = 385;	355	getrandom = 384,
356	pub const SYS_bpf = 386;	356	memfd_create = 385,
357	pub const SYS_execveat = 387;	357	bpf = 386,
358	pub const SYS_userfaultfd = 388;	358	execveat = 387,
359	pub const SYS_membarrier = 389;	359	userfaultfd = 388,
360	pub const SYS_mlock2 = 390;	360	membarrier = 389,
361	pub const SYS_copy_file_range = 391;	361	mlock2 = 390,
362	pub const SYS_preadv2 = 392;	362	copy_file_range = 391,
363	pub const SYS_pwritev2 = 393;	363	preadv2 = 392,
364	pub const SYS_pkey_mprotect = 394;	364	pwritev2 = 393,
365	pub const SYS_pkey_alloc = 395;	365	pkey_mprotect = 394,
366	pub const SYS_pkey_free = 396;	366	pkey_alloc = 395,
367	pub const SYS_statx = 397;	367	pkey_free = 396,
368	pub const SYS_rseq = 398;	368	statx = 397,
369	pub const SYS_io_pgetevents = 399;	369	rseq = 398,
370	pub const SYS_migrate_pages = 400;	370	io_pgetevents = 399,
371	pub const SYS_kexec_file_load = 401;	371	migrate_pages = 400,
372	pub const SYS_clock_gettime64 = 403;	372	kexec_file_load = 401,
373	pub const SYS_clock_settime64 = 404;	373	clock_gettime64 = 403,
374	pub const SYS_clock_adjtime64 = 405;	374	clock_settime64 = 404,
375	pub const SYS_clock_getres_time64 = 406;	375	clock_adjtime64 = 405,
376	pub const SYS_clock_nanosleep_time64 = 407;	376	clock_getres_time64 = 406,
377	pub const SYS_timer_gettime64 = 408;	377	clock_nanosleep_time64 = 407,
378	pub const SYS_timer_settime64 = 409;	378	timer_gettime64 = 408,
379	pub const SYS_timerfd_gettime64 = 410;	379	timer_settime64 = 409,
380	pub const SYS_timerfd_settime64 = 411;	380	timerfd_gettime64 = 410,
381	pub const SYS_utimensat_time64 = 412;	381	timerfd_settime64 = 411,
382	pub const SYS_pselect6_time64 = 413;	382	utimensat_time64 = 412,
383	pub const SYS_ppoll_time64 = 414;	383	pselect6_time64 = 413,
384	pub const SYS_io_pgetevents_time64 = 416;	384	ppoll_time64 = 414,
385	pub const SYS_recvmmsg_time64 = 417;	385	io_pgetevents_time64 = 416,
386	pub const SYS_mq_timedsend_time64 = 418;	386	recvmmsg_time64 = 417,
387	pub const SYS_mq_timedreceive_time64 = 419;	387	mq_timedsend_time64 = 418,
388	pub const SYS_semtimedop_time64 = 420;	388	mq_timedreceive_time64 = 419,
389	pub const SYS_rt_sigtimedwait_time64 = 421;	389	semtimedop_time64 = 420,
390	pub const SYS_futex_time64 = 422;	390	rt_sigtimedwait_time64 = 421,
391	pub const SYS_sched_rr_get_interval_time64 = 423;	391	futex_time64 = 422,
392	pub const SYS_pidfd_send_signal = 424;	392	sched_rr_get_interval_time64 = 423,
393	pub const SYS_io_uring_setup = 425;	393	pidfd_send_signal = 424,
394	pub const SYS_io_uring_enter = 426;	394	io_uring_setup = 425,
395	pub const SYS_io_uring_register = 427;	395	io_uring_enter = 426,
396	pub const SYS_open_tree = 428;	396	io_uring_register = 427,
397	pub const SYS_move_mount = 429;	397	open_tree = 428,
398	pub const SYS_fsopen = 430;	398	move_mount = 429,
399	pub const SYS_fsconfig = 431;	399	fsopen = 430,
400	pub const SYS_fsmount = 432;	400	fsconfig = 431,
401	pub const SYS_fspick = 433;	401	fsmount = 432,
402	pub const SYS_pidfd_open = 434;	402	fspick = 433,
403	pub const SYS_clone3 = 435;	403	pidfd_open = 434,
404		404	clone3 = 435,
405	pub const SYS_breakpoint = 0x0f0001;	405	openat2 = 437,
406	pub const SYS_cacheflush = 0x0f0002;	406	pidfd_getfd = 438,
407	pub const SYS_usr26 = 0x0f0003;	407
408	pub const SYS_usr32 = 0x0f0004;	408	breakpoint = 0x0f0001,
409	pub const SYS_set_tls = 0x0f0005;	409	cacheflush = 0x0f0002,
410	pub const SYS_get_tls = 0x0f0006;	410	usr26 = 0x0f0003,
		411	usr32 = 0x0f0004,
		412	set_tls = 0x0f0005,
		413	get_tls = 0x0f0006,
		414
		415	_,
		416	};
411		417
412	pub const MMAP2_UNIT = 4096;	418	pub const MMAP2_UNIT = 4096;
413		419

lib/std/os/bits/linux/arm64.zig+296-291

 @@ -11,298 +11,303 @@ const gid_t = linux.gid_t;
 const pid_t = linux.pid_t;
 const stack_t = linux.stack_t;
 const sigset_t = linux.sigset_t;
+pub const SYS = extern enum(usize) {
+    io_setup = 0,
+    io_destroy = 1,
+    io_submit = 2,
+    io_cancel = 3,
+    io_getevents = 4,
+    setxattr = 5,
+    lsetxattr = 6,
+    fsetxattr = 7,
+    getxattr = 8,
+    lgetxattr = 9,
+    fgetxattr = 10,
+    listxattr = 11,
+    llistxattr = 12,
+    flistxattr = 13,
+    removexattr = 14,
+    lremovexattr = 15,
+    fremovexattr = 16,
+    getcwd = 17,
+    lookup_dcookie = 18,
+    eventfd2 = 19,
+    epoll_create1 = 20,
+    epoll_ctl = 21,
+    epoll_pwait = 22,
+    dup = 23,
+    dup3 = 24,
+    fcntl = 25,
+    inotify_init1 = 26,
+    inotify_add_watch = 27,
+    inotify_rm_watch = 28,
+    ioctl = 29,
+    ioprio_set = 30,
+    ioprio_get = 31,
+    flock = 32,
+    mknodat = 33,
+    mkdirat = 34,
+    unlinkat = 35,
+    symlinkat = 36,
+    linkat = 37,
+    renameat = 38,
+    umount2 = 39,
+    mount = 40,
+    pivot_root = 41,
+    nfsservctl = 42,
+    statfs = 43,
+    fstatfs = 44,
+    truncate = 45,
+    ftruncate = 46,
+    fallocate = 47,
+    faccessat = 48,
+    chdir = 49,
+    fchdir = 50,
+    chroot = 51,
+    fchmod = 52,
+    fchmodat = 53,
+    fchownat = 54,
+    fchown = 55,
+    openat = 56,
+    close = 57,
+    vhangup = 58,
+    pipe2 = 59,
+    quotactl = 60,
+    getdents64 = 61,
+    lseek = 62,
+    read = 63,
+    write = 64,
+    readv = 65,
+    writev = 66,
+    pread64 = 67,
+    pwrite64 = 68,
+    preadv = 69,
+    pwritev = 70,
+    sendfile = 71,
+    pselect6 = 72,
+    ppoll = 73,
+    signalfd4 = 74,
+    vmsplice = 75,
+    splice = 76,
+    tee = 77,
+    readlinkat = 78,
+    fstatat = 79,
+    fstat = 80,
+    sync = 81,
+    fsync = 82,
+    fdatasync = 83,
+    sync_file_range2 = 84,
+    sync_file_range = 84,
+    timerfd_create = 85,
+    timerfd_settime = 86,
+    timerfd_gettime = 87,
+    utimensat = 88,
+    acct = 89,
+    capget = 90,
+    capset = 91,
+    personality = 92,
+    exit = 93,
+    exit_group = 94,
+    waitid = 95,
+    set_tid_address = 96,
+    unshare = 97,
+    futex = 98,
+    set_robust_list = 99,
+    get_robust_list = 100,
+    nanosleep = 101,
+    getitimer = 102,
+    setitimer = 103,
+    kexec_load = 104,
+    init_module = 105,
+    delete_module = 106,
+    timer_create = 107,
+    timer_gettime = 108,
+    timer_getoverrun = 109,
+    timer_settime = 110,
+    timer_delete = 111,
+    clock_settime = 112,
+    clock_gettime = 113,
+    clock_getres = 114,
+    clock_nanosleep = 115,
+    syslog = 116,
+    ptrace = 117,
+    sched_setparam = 118,
+    sched_setscheduler = 119,
+    sched_getscheduler = 120,
+    sched_getparam = 121,
+    sched_setaffinity = 122,
+    sched_getaffinity = 123,
+    sched_yield = 124,
+    sched_get_priority_max = 125,
+    sched_get_priority_min = 126,
+    sched_rr_get_interval = 127,
+    restart_syscall = 128,
+    kill = 129,
+    tkill = 130,
+    tgkill = 131,
+    sigaltstack = 132,
+    rt_sigsuspend = 133,
+    rt_sigaction = 134,
+    rt_sigprocmask = 135,
+    rt_sigpending = 136,
+    rt_sigtimedwait = 137,
+    rt_sigqueueinfo = 138,
+    rt_sigreturn = 139,
+    setpriority = 140,
+    getpriority = 141,
+    reboot = 142,
+    setregid = 143,
+    setgid = 144,
+    setreuid = 145,
+    setuid = 146,
+    setresuid = 147,
+    getresuid = 148,
+    setresgid = 149,
+    getresgid = 150,
+    setfsuid = 151,
+    setfsgid = 152,
+    times = 153,
+    setpgid = 154,
+    getpgid = 155,
+    getsid = 156,
+    setsid = 157,
+    getgroups = 158,
+    setgroups = 159,
+    uname = 160,
+    sethostname = 161,
+    setdomainname = 162,
+    getrlimit = 163,
+    setrlimit = 164,
+    getrusage = 165,
+    umask = 166,
+    prctl = 167,
+    getcpu = 168,
+    gettimeofday = 169,
+    settimeofday = 170,
+    adjtimex = 171,
+    getpid = 172,
+    getppid = 173,
+    getuid = 174,
+    geteuid = 175,
+    getgid = 176,
+    getegid = 177,
+    gettid = 178,
+    sysinfo = 179,
+    mq_open = 180,
+    mq_unlink = 181,
+    mq_timedsend = 182,
+    mq_timedreceive = 183,
+    mq_notify = 184,
+    mq_getsetattr = 185,
+    msgget = 186,
+    msgctl = 187,
+    msgrcv = 188,
+    msgsnd = 189,
+    semget = 190,
+    semctl = 191,
+    semtimedop = 192,
+    semop = 193,
+    shmget = 194,
+    shmctl = 195,
+    shmat = 196,
+    shmdt = 197,
+    socket = 198,
+    socketpair = 199,
+    bind = 200,
+    listen = 201,
+    accept = 202,
+    connect = 203,
+    getsockname = 204,
+    getpeername = 205,
+    sendto = 206,
+    recvfrom = 207,
+    setsockopt = 208,
+    getsockopt = 209,
+    shutdown = 210,
+    sendmsg = 211,
+    recvmsg = 212,
+    readahead = 213,
+    brk = 214,
+    munmap = 215,
+    mremap = 216,
+    add_key = 217,
+    request_key = 218,
+    keyctl = 219,
+    clone = 220,
+    execve = 221,
+    mmap = 222,
+    fadvise64 = 223,
+    swapon = 224,
+    swapoff = 225,
+    mprotect = 226,
+    msync = 227,
+    mlock = 228,
+    munlock = 229,
+    mlockall = 230,
+    munlockall = 231,
+    mincore = 232,
+    madvise = 233,
+    remap_file_pages = 234,
+    mbind = 235,
+    get_mempolicy = 236,
+    set_mempolicy = 237,
+    migrate_pages = 238,
+    move_pages = 239,
+    rt_tgsigqueueinfo = 240,
+    perf_event_open = 241,
+    accept4 = 242,
+    recvmmsg = 243,
+    arch_specific_syscall = 244,
+    wait4 = 260,
+    prlimit64 = 261,
+    fanotify_init = 262,
+    fanotify_mark = 263,
+    clock_adjtime = 266,
+    syncfs = 267,
+    setns = 268,
+    sendmmsg = 269,
+    process_vm_readv = 270,
+    process_vm_writev = 271,
+    kcmp = 272,
+    finit_module = 273,
+    sched_setattr = 274,
+    sched_getattr = 275,
+    renameat2 = 276,
+    seccomp = 277,
+    getrandom = 278,
+    memfd_create = 279,
+    bpf = 280,
+    execveat = 281,
+    userfaultfd = 282,
+    membarrier = 283,
+    mlock2 = 284,
+    copy_file_range = 285,
+    preadv2 = 286,
+    pwritev2 = 287,
+    pkey_mprotect = 288,
+    pkey_alloc = 289,
+    pkey_free = 290,
+    statx = 291,
+    io_pgetevents = 292,
+    rseq = 293,
+    kexec_file_load = 294,
+    pidfd_send_signal = 424,
+    io_uring_setup = 425,
+    io_uring_enter = 426,
+    io_uring_register = 427,
+    open_tree = 428,
+    move_mount = 429,
+    fsopen = 430,
+    fsconfig = 431,
+    fsmount = 432,
+    fspick = 433,
+    pidfd_open = 434,
+    clone3 = 435,
+    openat2 = 437,
+    pidfd_getfd = 438,
-pub const SYS_io_setup = 0;
+    _,
-pub const SYS_io_destroy = 1;
+};
-pub const SYS_io_submit = 2;
-pub const SYS_io_cancel = 3;
-pub const SYS_io_getevents = 4;
-pub const SYS_setxattr = 5;
-pub const SYS_lsetxattr = 6;
-pub const SYS_fsetxattr = 7;
-pub const SYS_getxattr = 8;
-pub const SYS_lgetxattr = 9;
-pub const SYS_fgetxattr = 10;
-pub const SYS_listxattr = 11;
-pub const SYS_llistxattr = 12;
-pub const SYS_flistxattr = 13;
-pub const SYS_removexattr = 14;
-pub const SYS_lremovexattr = 15;
-pub const SYS_fremovexattr = 16;
-pub const SYS_getcwd = 17;
-pub const SYS_lookup_dcookie = 18;
-pub const SYS_eventfd2 = 19;
-pub const SYS_epoll_create1 = 20;
-pub const SYS_epoll_ctl = 21;
-pub const SYS_epoll_pwait = 22;
-pub const SYS_dup = 23;
-pub const SYS_dup3 = 24;
-pub const SYS_fcntl = 25;
-pub const SYS_inotify_init1 = 26;
-pub const SYS_inotify_add_watch = 27;
-pub const SYS_inotify_rm_watch = 28;
-pub const SYS_ioctl = 29;
-pub const SYS_ioprio_set = 30;
-pub const SYS_ioprio_get = 31;
-pub const SYS_flock = 32;
-pub const SYS_mknodat = 33;
-pub const SYS_mkdirat = 34;
-pub const SYS_unlinkat = 35;
-pub const SYS_symlinkat = 36;
-pub const SYS_linkat = 37;
-pub const SYS_renameat = 38;
-pub const SYS_umount2 = 39;
-pub const SYS_mount = 40;
-pub const SYS_pivot_root = 41;
-pub const SYS_nfsservctl = 42;
-pub const SYS_statfs = 43;
-pub const SYS_fstatfs = 44;
-pub const SYS_truncate = 45;
-pub const SYS_ftruncate = 46;
-pub const SYS_fallocate = 47;
-pub const SYS_faccessat = 48;
-pub const SYS_chdir = 49;
-pub const SYS_fchdir = 50;
-pub const SYS_chroot = 51;
-pub const SYS_fchmod = 52;
-pub const SYS_fchmodat = 53;
-pub const SYS_fchownat = 54;
-pub const SYS_fchown = 55;
-pub const SYS_openat = 56;
-pub const SYS_close = 57;
-pub const SYS_vhangup = 58;
-pub const SYS_pipe2 = 59;
-pub const SYS_quotactl = 60;
-pub const SYS_getdents64 = 61;
-pub const SYS_lseek = 62;
-pub const SYS_read = 63;
-pub const SYS_write = 64;
-pub const SYS_readv = 65;
-pub const SYS_writev = 66;
-pub const SYS_pread64 = 67;
-pub const SYS_pwrite64 = 68;
-pub const SYS_preadv = 69;
-pub const SYS_pwritev = 70;
-pub const SYS_sendfile = 71;
-pub const SYS_pselect6 = 72;
-pub const SYS_ppoll = 73;
-pub const SYS_signalfd4 = 74;
-pub const SYS_vmsplice = 75;
-pub const SYS_splice = 76;
-pub const SYS_tee = 77;
-pub const SYS_readlinkat = 78;
-pub const SYS_fstatat = 79;
-pub const SYS_fstat = 80;
-pub const SYS_sync = 81;
-pub const SYS_fsync = 82;
-pub const SYS_fdatasync = 83;
-pub const SYS_sync_file_range2 = 84;
-pub const SYS_sync_file_range = 84;
-pub const SYS_timerfd_create = 85;
-pub const SYS_timerfd_settime = 86;
-pub const SYS_timerfd_gettime = 87;
-pub const SYS_utimensat = 88;
-pub const SYS_acct = 89;
-pub const SYS_capget = 90;
-pub const SYS_capset = 91;
-pub const SYS_personality = 92;
-pub const SYS_exit = 93;
-pub const SYS_exit_group = 94;
-pub const SYS_waitid = 95;
-pub const SYS_set_tid_address = 96;
-pub const SYS_unshare = 97;
-pub const SYS_futex = 98;
-pub const SYS_set_robust_list = 99;
-pub const SYS_get_robust_list = 100;
-pub const SYS_nanosleep = 101;
-pub const SYS_getitimer = 102;
-pub const SYS_setitimer = 103;
-pub const SYS_kexec_load = 104;
-pub const SYS_init_module = 105;
-pub const SYS_delete_module = 106;
-pub const SYS_timer_create = 107;
-pub const SYS_timer_gettime = 108;
-pub const SYS_timer_getoverrun = 109;
-pub const SYS_timer_settime = 110;
-pub const SYS_timer_delete = 111;
-pub const SYS_clock_settime = 112;
-pub const SYS_clock_gettime = 113;
-pub const SYS_clock_getres = 114;
-pub const SYS_clock_nanosleep = 115;
-pub const SYS_syslog = 116;
-pub const SYS_ptrace = 117;
-pub const SYS_sched_setparam = 118;
-pub const SYS_sched_setscheduler = 119;
-pub const SYS_sched_getscheduler = 120;
-pub const SYS_sched_getparam = 121;
-pub const SYS_sched_setaffinity = 122;
-pub const SYS_sched_getaffinity = 123;
-pub const SYS_sched_yield = 124;
-pub const SYS_sched_get_priority_max = 125;
-pub const SYS_sched_get_priority_min = 126;
-pub const SYS_sched_rr_get_interval = 127;
-pub const SYS_restart_syscall = 128;
-pub const SYS_kill = 129;
-pub const SYS_tkill = 130;
-pub const SYS_tgkill = 131;
-pub const SYS_sigaltstack = 132;
-pub const SYS_rt_sigsuspend = 133;
-pub const SYS_rt_sigaction = 134;
-pub const SYS_rt_sigprocmask = 135;
-pub const SYS_rt_sigpending = 136;
-pub const SYS_rt_sigtimedwait = 137;
-pub const SYS_rt_sigqueueinfo = 138;
-pub const SYS_rt_sigreturn = 139;
-pub const SYS_setpriority = 140;
-pub const SYS_getpriority = 141;
-pub const SYS_reboot = 142;
-pub const SYS_setregid = 143;
-pub const SYS_setgid = 144;
-pub const SYS_setreuid = 145;
-pub const SYS_setuid = 146;
-pub const SYS_setresuid = 147;
-pub const SYS_getresuid = 148;
-pub const SYS_setresgid = 149;
-pub const SYS_getresgid = 150;
-pub const SYS_setfsuid = 151;
-pub const SYS_setfsgid = 152;
-pub const SYS_times = 153;
-pub const SYS_setpgid = 154;
-pub const SYS_getpgid = 155;
-pub const SYS_getsid = 156;
-pub const SYS_setsid = 157;
-pub const SYS_getgroups = 158;
-pub const SYS_setgroups = 159;
-pub const SYS_uname = 160;
-pub const SYS_sethostname = 161;
-pub const SYS_setdomainname = 162;
-pub const SYS_getrlimit = 163;
-pub const SYS_setrlimit = 164;
-pub const SYS_getrusage = 165;
-pub const SYS_umask = 166;
-pub const SYS_prctl = 167;
-pub const SYS_getcpu = 168;
-pub const SYS_gettimeofday = 169;
-pub const SYS_settimeofday = 170;
-pub const SYS_adjtimex = 171;
-pub const SYS_getpid = 172;
-pub const SYS_getppid = 173;
-pub const SYS_getuid = 174;
-pub const SYS_geteuid = 175;
-pub const SYS_getgid = 176;
-pub const SYS_getegid = 177;
-pub const SYS_gettid = 178;
-pub const SYS_sysinfo = 179;
-pub const SYS_mq_open = 180;
-pub const SYS_mq_unlink = 181;
-pub const SYS_mq_timedsend = 182;
-pub const SYS_mq_timedreceive = 183;
-pub const SYS_mq_notify = 184;
-pub const SYS_mq_getsetattr = 185;
-pub const SYS_msgget = 186;
-pub const SYS_msgctl = 187;
-pub const SYS_msgrcv = 188;
-pub const SYS_msgsnd = 189;
-pub const SYS_semget = 190;
-pub const SYS_semctl = 191;
-pub const SYS_semtimedop = 192;
-pub const SYS_semop = 193;
-pub const SYS_shmget = 194;
-pub const SYS_shmctl = 195;
-pub const SYS_shmat = 196;
-pub const SYS_shmdt = 197;
-pub const SYS_socket = 198;
-pub const SYS_socketpair = 199;
-pub const SYS_bind = 200;
-pub const SYS_listen = 201;
-pub const SYS_accept = 202;
-pub const SYS_connect = 203;
-pub const SYS_getsockname = 204;
-pub const SYS_getpeername = 205;
-pub const SYS_sendto = 206;
-pub const SYS_recvfrom = 207;
-pub const SYS_setsockopt = 208;
-pub const SYS_getsockopt = 209;
-pub const SYS_shutdown = 210;
-pub const SYS_sendmsg = 211;
-pub const SYS_recvmsg = 212;
-pub const SYS_readahead = 213;
-pub const SYS_brk = 214;
-pub const SYS_munmap = 215;
-pub const SYS_mremap = 216;
-pub const SYS_add_key = 217;
-pub const SYS_request_key = 218;
-pub const SYS_keyctl = 219;
-pub const SYS_clone = 220;
-pub const SYS_execve = 221;
-pub const SYS_mmap = 222;
-pub const SYS_fadvise64 = 223;
-pub const SYS_swapon = 224;
-pub const SYS_swapoff = 225;
-pub const SYS_mprotect = 226;
-pub const SYS_msync = 227;
-pub const SYS_mlock = 228;
-pub const SYS_munlock = 229;
-pub const SYS_mlockall = 230;
-pub const SYS_munlockall = 231;
-pub const SYS_mincore = 232;
-pub const SYS_madvise = 233;
-pub const SYS_remap_file_pages = 234;
-pub const SYS_mbind = 235;
-pub const SYS_get_mempolicy = 236;
-pub const SYS_set_mempolicy = 237;
-pub const SYS_migrate_pages = 238;
-pub const SYS_move_pages = 239;
-pub const SYS_rt_tgsigqueueinfo = 240;
-pub const SYS_perf_event_open = 241;
-pub const SYS_accept4 = 242;
-pub const SYS_recvmmsg = 243;
-pub const SYS_arch_specific_syscall = 244;
-pub const SYS_wait4 = 260;
-pub const SYS_prlimit64 = 261;
-pub const SYS_fanotify_init = 262;
-pub const SYS_fanotify_mark = 263;
-pub const SYS_clock_adjtime = 266;
-pub const SYS_syncfs = 267;
-pub const SYS_setns = 268;
-pub const SYS_sendmmsg = 269;
-pub const SYS_process_vm_readv = 270;
-pub const SYS_process_vm_writev = 271;
-pub const SYS_kcmp = 272;
-pub const SYS_finit_module = 273;
-pub const SYS_sched_setattr = 274;
-pub const SYS_sched_getattr = 275;
-pub const SYS_renameat2 = 276;
-pub const SYS_seccomp = 277;
-pub const SYS_getrandom = 278;
-pub const SYS_memfd_create = 279;
-pub const SYS_bpf = 280;
-pub const SYS_execveat = 281;
-pub const SYS_userfaultfd = 282;
-pub const SYS_membarrier = 283;
-pub const SYS_mlock2 = 284;
-pub const SYS_copy_file_range = 285;
-pub const SYS_preadv2 = 286;
-pub const SYS_pwritev2 = 287;
-pub const SYS_pkey_mprotect = 288;
-pub const SYS_pkey_alloc = 289;
-pub const SYS_pkey_free = 290;
-pub const SYS_statx = 291;
-pub const SYS_io_pgetevents = 292;
-pub const SYS_rseq = 293;
-pub const SYS_kexec_file_load = 294;
-pub const SYS_pidfd_send_signal = 424;
-pub const SYS_io_uring_setup = 425;
-pub const SYS_io_uring_enter = 426;
-pub const SYS_io_uring_register = 427;
-pub const SYS_open_tree = 428;
-pub const SYS_move_mount = 429;
-pub const SYS_fsopen = 430;
-pub const SYS_fsconfig = 431;
-pub const SYS_fsmount = 432;
-pub const SYS_fspick = 433;
-pub const SYS_pidfd_open = 434;
-pub const SYS_clone3 = 435;
 pub const O_CREAT = 0o100;
 pub const O_EXCL = 0o200;

lib/std/os/bits/linux/errno-generic.zig+27

...	@@ -368,6 +368,33 @@ pub const ENOMEDIUM = 123;	...	@@ -368,6 +368,33 @@ pub const ENOMEDIUM = 123;
368	/// Wrong medium type	368	/// Wrong medium type
369	pub const EMEDIUMTYPE = 124;	369	pub const EMEDIUMTYPE = 124;
370		370
		371	/// Operation canceled
		372	pub const ECANCELED = 125;
		373
		374	/// Required key not available
		375	pub const ENOKEY = 126;
		376
		377	/// Key has expired
		378	pub const EKEYEXPIRED = 127;
		379
		380	/// Key has been revoked
		381	pub const EKEYREVOKED = 128;
		382
		383	/// Key was rejected by service
		384	pub const EKEYREJECTED = 129;
		385
		386	// for robust mutexes
		387	/// Owner died
		388	pub const EOWNERDEAD = 130;
		389	/// State not recoverable
		390	pub const ENOTRECOVERABLE = 131;
		391
		392	/// Operation not possible due to RF-kill
		393	pub const ERFKILL = 132;
		394
		395	/// Memory page has hardware error
		396	pub const EHWPOISON = 133;
		397
371	// nameserver query return codes	398	// nameserver query return codes
372		399
373	/// DNS server returned answer with no data	400	/// DNS server returned answer with no data

lib/std/os/bits/linux/i386.zig+429-423

...	@@ -12,429 +12,435 @@ const pid_t = linux.pid_t;	...	@@ -12,429 +12,435 @@ const pid_t = linux.pid_t;
12	const stack_t = linux.stack_t;	12	const stack_t = linux.stack_t;
13	const sigset_t = linux.sigset_t;	13	const sigset_t = linux.sigset_t;
14		14
15	pub const SYS_restart_syscall = 0;	15	pub const SYS = extern enum(usize) {
16	pub const SYS_exit = 1;	16	restart_syscall = 0,
17	pub const SYS_fork = 2;	17	exit = 1,
18	pub const SYS_read = 3;	18	fork = 2,
19	pub const SYS_write = 4;	19	read = 3,
20	pub const SYS_open = 5;	20	write = 4,
21	pub const SYS_close = 6;	21	open = 5,
22	pub const SYS_waitpid = 7;	22	close = 6,
23	pub const SYS_creat = 8;	23	waitpid = 7,
24	pub const SYS_link = 9;	24	creat = 8,
25	pub const SYS_unlink = 10;	25	link = 9,
26	pub const SYS_execve = 11;	26	unlink = 10,
27	pub const SYS_chdir = 12;	27	execve = 11,
28	pub const SYS_time = 13;	28	chdir = 12,
29	pub const SYS_mknod = 14;	29	time = 13,
30	pub const SYS_chmod = 15;	30	mknod = 14,
31	pub const SYS_lchown = 16;	31	chmod = 15,
32	pub const SYS_break = 17;	32	lchown = 16,
33	pub const SYS_oldstat = 18;	33	@"break" = 17,
34	pub const SYS_lseek = 19;	34	oldstat = 18,
35	pub const SYS_getpid = 20;	35	lseek = 19,
36	pub const SYS_mount = 21;	36	getpid = 20,
37	pub const SYS_umount = 22;	37	mount = 21,
38	pub const SYS_setuid = 23;	38	umount = 22,
39	pub const SYS_getuid = 24;	39	setuid = 23,
40	pub const SYS_stime = 25;	40	getuid = 24,
41	pub const SYS_ptrace = 26;	41	stime = 25,
42	pub const SYS_alarm = 27;	42	ptrace = 26,
43	pub const SYS_oldfstat = 28;	43	alarm = 27,
44	pub const SYS_pause = 29;	44	oldfstat = 28,
45	pub const SYS_utime = 30;	45	pause = 29,
46	pub const SYS_stty = 31;	46	utime = 30,
47	pub const SYS_gtty = 32;	47	stty = 31,
48	pub const SYS_access = 33;	48	gtty = 32,
49	pub const SYS_nice = 34;	49	access = 33,
50	pub const SYS_ftime = 35;	50	nice = 34,
51	pub const SYS_sync = 36;	51	ftime = 35,
52	pub const SYS_kill = 37;	52	sync = 36,
53	pub const SYS_rename = 38;	53	kill = 37,
54	pub const SYS_mkdir = 39;	54	rename = 38,
55	pub const SYS_rmdir = 40;	55	mkdir = 39,
56	pub const SYS_dup = 41;	56	rmdir = 40,
57	pub const SYS_pipe = 42;	57	dup = 41,
58	pub const SYS_times = 43;	58	pipe = 42,
59	pub const SYS_prof = 44;	59	times = 43,
60	pub const SYS_brk = 45;	60	prof = 44,
61	pub const SYS_setgid = 46;	61	brk = 45,
62	pub const SYS_getgid = 47;	62	setgid = 46,
63	pub const SYS_signal = 48;	63	getgid = 47,
64	pub const SYS_geteuid = 49;	64	signal = 48,
65	pub const SYS_getegid = 50;	65	geteuid = 49,
66	pub const SYS_acct = 51;	66	getegid = 50,
67	pub const SYS_umount2 = 52;	67	acct = 51,
68	pub const SYS_lock = 53;	68	umount2 = 52,
69	pub const SYS_ioctl = 54;	69	lock = 53,
70	pub const SYS_fcntl = 55;	70	ioctl = 54,
71	pub const SYS_mpx = 56;	71	fcntl = 55,
72	pub const SYS_setpgid = 57;	72	mpx = 56,
73	pub const SYS_ulimit = 58;	73	setpgid = 57,
74	pub const SYS_oldolduname = 59;	74	ulimit = 58,
75	pub const SYS_umask = 60;	75	oldolduname = 59,
76	pub const SYS_chroot = 61;	76	umask = 60,
77	pub const SYS_ustat = 62;	77	chroot = 61,
78	pub const SYS_dup2 = 63;	78	ustat = 62,
79	pub const SYS_getppid = 64;	79	dup2 = 63,
80	pub const SYS_getpgrp = 65;	80	getppid = 64,
81	pub const SYS_setsid = 66;	81	getpgrp = 65,
82	pub const SYS_sigaction = 67;	82	setsid = 66,
83	pub const SYS_sgetmask = 68;	83	sigaction = 67,
84	pub const SYS_ssetmask = 69;	84	sgetmask = 68,
85	pub const SYS_setreuid = 70;	85	ssetmask = 69,
86	pub const SYS_setregid = 71;	86	setreuid = 70,
87	pub const SYS_sigsuspend = 72;	87	setregid = 71,
88	pub const SYS_sigpending = 73;	88	sigsuspend = 72,
89	pub const SYS_sethostname = 74;	89	sigpending = 73,
90	pub const SYS_setrlimit = 75;	90	sethostname = 74,
91	pub const SYS_getrlimit = 76;	91	setrlimit = 75,
92	pub const SYS_getrusage = 77;	92	getrlimit = 76,
93	pub const SYS_gettimeofday = 78;	93	getrusage = 77,
94	pub const SYS_settimeofday = 79;	94	gettimeofday = 78,
95	pub const SYS_getgroups = 80;	95	settimeofday = 79,
96	pub const SYS_setgroups = 81;	96	getgroups = 80,
97	pub const SYS_select = 82;	97	setgroups = 81,
98	pub const SYS_symlink = 83;	98	select = 82,
99	pub const SYS_oldlstat = 84;	99	symlink = 83,
100	pub const SYS_readlink = 85;	100	oldlstat = 84,
101	pub const SYS_uselib = 86;	101	readlink = 85,
102	pub const SYS_swapon = 87;	102	uselib = 86,
103	pub const SYS_reboot = 88;	103	swapon = 87,
104	pub const SYS_readdir = 89;	104	reboot = 88,
105	pub const SYS_mmap = 90;	105	readdir = 89,
106	pub const SYS_munmap = 91;	106	mmap = 90,
107	pub const SYS_truncate = 92;	107	munmap = 91,
108	pub const SYS_ftruncate = 93;	108	truncate = 92,
109	pub const SYS_fchmod = 94;	109	ftruncate = 93,
110	pub const SYS_fchown = 95;	110	fchmod = 94,
111	pub const SYS_getpriority = 96;	111	fchown = 95,
112	pub const SYS_setpriority = 97;	112	getpriority = 96,
113	pub const SYS_profil = 98;	113	setpriority = 97,
114	pub const SYS_statfs = 99;	114	profil = 98,
115	pub const SYS_fstatfs = 100;	115	statfs = 99,
116	pub const SYS_ioperm = 101;	116	fstatfs = 100,
117	pub const SYS_socketcall = 102;	117	ioperm = 101,
118	pub const SYS_syslog = 103;	118	socketcall = 102,
119	pub const SYS_setitimer = 104;	119	syslog = 103,
120	pub const SYS_getitimer = 105;	120	setitimer = 104,
121	pub const SYS_stat = 106;	121	getitimer = 105,
122	pub const SYS_lstat = 107;	122	stat = 106,
123	pub const SYS_fstat = 108;	123	lstat = 107,
124	pub const SYS_olduname = 109;	124	fstat = 108,
125	pub const SYS_iopl = 110;	125	olduname = 109,
126	pub const SYS_vhangup = 111;	126	iopl = 110,
127	pub const SYS_idle = 112;	127	vhangup = 111,
128	pub const SYS_vm86old = 113;	128	idle = 112,
129	pub const SYS_wait4 = 114;	129	vm86old = 113,
130	pub const SYS_swapoff = 115;	130	wait4 = 114,
131	pub const SYS_sysinfo = 116;	131	swapoff = 115,
132	pub const SYS_ipc = 117;	132	sysinfo = 116,
133	pub const SYS_fsync = 118;	133	ipc = 117,
134	pub const SYS_sigreturn = 119;	134	fsync = 118,
135	pub const SYS_clone = 120;	135	sigreturn = 119,
136	pub const SYS_setdomainname = 121;	136	clone = 120,
137	pub const SYS_uname = 122;	137	setdomainname = 121,
138	pub const SYS_modify_ldt = 123;	138	uname = 122,
139	pub const SYS_adjtimex = 124;	139	modify_ldt = 123,
140	pub const SYS_mprotect = 125;	140	adjtimex = 124,
141	pub const SYS_sigprocmask = 126;	141	mprotect = 125,
142	pub const SYS_create_module = 127;	142	sigprocmask = 126,
143	pub const SYS_init_module = 128;	143	create_module = 127,
144	pub const SYS_delete_module = 129;	144	init_module = 128,
145	pub const SYS_get_kernel_syms = 130;	145	delete_module = 129,
146	pub const SYS_quotactl = 131;	146	get_kernel_syms = 130,
147	pub const SYS_getpgid = 132;	147	quotactl = 131,
148	pub const SYS_fchdir = 133;	148	getpgid = 132,
149	pub const SYS_bdflush = 134;	149	fchdir = 133,
150	pub const SYS_sysfs = 135;	150	bdflush = 134,
151	pub const SYS_personality = 136;	151	sysfs = 135,
152	pub const SYS_afs_syscall = 137;	152	personality = 136,
153	pub const SYS_setfsuid = 138;	153	afs_syscall = 137,
154	pub const SYS_setfsgid = 139;	154	setfsuid = 138,
155	pub const SYS__llseek = 140;	155	setfsgid = 139,
156	pub const SYS_getdents = 141;	156	_llseek = 140,
157	pub const SYS__newselect = 142;	157	getdents = 141,
158	pub const SYS_flock = 143;	158	_newselect = 142,
159	pub const SYS_msync = 144;	159	flock = 143,
160	pub const SYS_readv = 145;	160	msync = 144,
161	pub const SYS_writev = 146;	161	readv = 145,
162	pub const SYS_getsid = 147;	162	writev = 146,
163	pub const SYS_fdatasync = 148;	163	getsid = 147,
164	pub const SYS__sysctl = 149;	164	fdatasync = 148,
165	pub const SYS_mlock = 150;	165	_sysctl = 149,
166	pub const SYS_munlock = 151;	166	mlock = 150,
167	pub const SYS_mlockall = 152;	167	munlock = 151,
168	pub const SYS_munlockall = 153;	168	mlockall = 152,
169	pub const SYS_sched_setparam = 154;	169	munlockall = 153,
170	pub const SYS_sched_getparam = 155;	170	sched_setparam = 154,
171	pub const SYS_sched_setscheduler = 156;	171	sched_getparam = 155,
172	pub const SYS_sched_getscheduler = 157;	172	sched_setscheduler = 156,
173	pub const SYS_sched_yield = 158;	173	sched_getscheduler = 157,
174	pub const SYS_sched_get_priority_max = 159;	174	sched_yield = 158,
175	pub const SYS_sched_get_priority_min = 160;	175	sched_get_priority_max = 159,
176	pub const SYS_sched_rr_get_interval = 161;	176	sched_get_priority_min = 160,
177	pub const SYS_nanosleep = 162;	177	sched_rr_get_interval = 161,
178	pub const SYS_mremap = 163;	178	nanosleep = 162,
179	pub const SYS_setresuid = 164;	179	mremap = 163,
180	pub const SYS_getresuid = 165;	180	setresuid = 164,
181	pub const SYS_vm86 = 166;	181	getresuid = 165,
182	pub const SYS_query_module = 167;	182	vm86 = 166,
183	pub const SYS_poll = 168;	183	query_module = 167,
184	pub const SYS_nfsservctl = 169;	184	poll = 168,
185	pub const SYS_setresgid = 170;	185	nfsservctl = 169,
186	pub const SYS_getresgid = 171;	186	setresgid = 170,
187	pub const SYS_prctl = 172;	187	getresgid = 171,
188	pub const SYS_rt_sigreturn = 173;	188	prctl = 172,
189	pub const SYS_rt_sigaction = 174;	189	rt_sigreturn = 173,
190	pub const SYS_rt_sigprocmask = 175;	190	rt_sigaction = 174,
191	pub const SYS_rt_sigpending = 176;	191	rt_sigprocmask = 175,
192	pub const SYS_rt_sigtimedwait = 177;	192	rt_sigpending = 176,
193	pub const SYS_rt_sigqueueinfo = 178;	193	rt_sigtimedwait = 177,
194	pub const SYS_rt_sigsuspend = 179;	194	rt_sigqueueinfo = 178,
195	pub const SYS_pread64 = 180;	195	rt_sigsuspend = 179,
196	pub const SYS_pwrite64 = 181;	196	pread64 = 180,
197	pub const SYS_chown = 182;	197	pwrite64 = 181,
198	pub const SYS_getcwd = 183;	198	chown = 182,
199	pub const SYS_capget = 184;	199	getcwd = 183,
200	pub const SYS_capset = 185;	200	capget = 184,
201	pub const SYS_sigaltstack = 186;	201	capset = 185,
202	pub const SYS_sendfile = 187;	202	sigaltstack = 186,
203	pub const SYS_getpmsg = 188;	203	sendfile = 187,
204	pub const SYS_putpmsg = 189;	204	getpmsg = 188,
205	pub const SYS_vfork = 190;	205	putpmsg = 189,
206	pub const SYS_ugetrlimit = 191;	206	vfork = 190,
207	pub const SYS_mmap2 = 192;	207	ugetrlimit = 191,
208	pub const SYS_truncate64 = 193;	208	mmap2 = 192,
209	pub const SYS_ftruncate64 = 194;	209	truncate64 = 193,
210	pub const SYS_stat64 = 195;	210	ftruncate64 = 194,
211	pub const SYS_lstat64 = 196;	211	stat64 = 195,
212	pub const SYS_fstat64 = 197;	212	lstat64 = 196,
213	pub const SYS_lchown32 = 198;	213	fstat64 = 197,
214	pub const SYS_getuid32 = 199;	214	lchown32 = 198,
215	pub const SYS_getgid32 = 200;	215	getuid32 = 199,
216	pub const SYS_geteuid32 = 201;	216	getgid32 = 200,
217	pub const SYS_getegid32 = 202;	217	geteuid32 = 201,
218	pub const SYS_setreuid32 = 203;	218	getegid32 = 202,
219	pub const SYS_setregid32 = 204;	219	setreuid32 = 203,
220	pub const SYS_getgroups32 = 205;	220	setregid32 = 204,
221	pub const SYS_setgroups32 = 206;	221	getgroups32 = 205,
222	pub const SYS_fchown32 = 207;	222	setgroups32 = 206,
223	pub const SYS_setresuid32 = 208;	223	fchown32 = 207,
224	pub const SYS_getresuid32 = 209;	224	setresuid32 = 208,
225	pub const SYS_setresgid32 = 210;	225	getresuid32 = 209,
226	pub const SYS_getresgid32 = 211;	226	setresgid32 = 210,
227	pub const SYS_chown32 = 212;	227	getresgid32 = 211,
228	pub const SYS_setuid32 = 213;	228	chown32 = 212,
229	pub const SYS_setgid32 = 214;	229	setuid32 = 213,
230	pub const SYS_setfsuid32 = 215;	230	setgid32 = 214,
231	pub const SYS_setfsgid32 = 216;	231	setfsuid32 = 215,
232	pub const SYS_pivot_root = 217;	232	setfsgid32 = 216,
233	pub const SYS_mincore = 218;	233	pivot_root = 217,
234	pub const SYS_madvise = 219;	234	mincore = 218,
235	pub const SYS_getdents64 = 220;	235	madvise = 219,
236	pub const SYS_fcntl64 = 221;	236	getdents64 = 220,
237	pub const SYS_gettid = 224;	237	fcntl64 = 221,
238	pub const SYS_readahead = 225;	238	gettid = 224,
239	pub const SYS_setxattr = 226;	239	readahead = 225,
240	pub const SYS_lsetxattr = 227;	240	setxattr = 226,
241	pub const SYS_fsetxattr = 228;	241	lsetxattr = 227,
242	pub const SYS_getxattr = 229;	242	fsetxattr = 228,
243	pub const SYS_lgetxattr = 230;	243	getxattr = 229,
244	pub const SYS_fgetxattr = 231;	244	lgetxattr = 230,
245	pub const SYS_listxattr = 232;	245	fgetxattr = 231,
246	pub const SYS_llistxattr = 233;	246	listxattr = 232,
247	pub const SYS_flistxattr = 234;	247	llistxattr = 233,
248	pub const SYS_removexattr = 235;	248	flistxattr = 234,
249	pub const SYS_lremovexattr = 236;	249	removexattr = 235,
250	pub const SYS_fremovexattr = 237;	250	lremovexattr = 236,
251	pub const SYS_tkill = 238;	251	fremovexattr = 237,
252	pub const SYS_sendfile64 = 239;	252	tkill = 238,
253	pub const SYS_futex = 240;	253	sendfile64 = 239,
254	pub const SYS_sched_setaffinity = 241;	254	futex = 240,
255	pub const SYS_sched_getaffinity = 242;	255	sched_setaffinity = 241,
256	pub const SYS_set_thread_area = 243;	256	sched_getaffinity = 242,
257	pub const SYS_get_thread_area = 244;	257	set_thread_area = 243,
258	pub const SYS_io_setup = 245;	258	get_thread_area = 244,
259	pub const SYS_io_destroy = 246;	259	io_setup = 245,
260	pub const SYS_io_getevents = 247;	260	io_destroy = 246,
261	pub const SYS_io_submit = 248;	261	io_getevents = 247,
262	pub const SYS_io_cancel = 249;	262	io_submit = 248,
263	pub const SYS_fadvise64 = 250;	263	io_cancel = 249,
264	pub const SYS_exit_group = 252;	264	fadvise64 = 250,
265	pub const SYS_lookup_dcookie = 253;	265	exit_group = 252,
266	pub const SYS_epoll_create = 254;	266	lookup_dcookie = 253,
267	pub const SYS_epoll_ctl = 255;	267	epoll_create = 254,
268	pub const SYS_epoll_wait = 256;	268	epoll_ctl = 255,
269	pub const SYS_remap_file_pages = 257;	269	epoll_wait = 256,
270	pub const SYS_set_tid_address = 258;	270	remap_file_pages = 257,
271	pub const SYS_timer_create = 259;	271	set_tid_address = 258,
272	pub const SYS_timer_settime = SYS_timer_create + 1;	272	timer_create = 259,
273	pub const SYS_timer_gettime = SYS_timer_create + 2;	273	timer_settime, // SYS_timer_create + 1
274	pub const SYS_timer_getoverrun = SYS_timer_create + 3;	274	timer_gettime, // SYS_timer_create + 2
275	pub const SYS_timer_delete = SYS_timer_create + 4;	275	timer_getoverrun, // SYS_timer_create + 3
276	pub const SYS_clock_settime = SYS_timer_create + 5;	276	timer_delete, // SYS_timer_create + 4
277	pub const SYS_clock_gettime = SYS_timer_create + 6;	277	clock_settime, // SYS_timer_create + 5
278	pub const SYS_clock_getres = SYS_timer_create + 7;	278	clock_gettime, // SYS_timer_create + 6
279	pub const SYS_clock_nanosleep = SYS_timer_create + 8;	279	clock_getres, // SYS_timer_create + 7
280	pub const SYS_statfs64 = 268;	280	clock_nanosleep, // SYS_timer_create + 8
281	pub const SYS_fstatfs64 = 269;	281	statfs64 = 268,
282	pub const SYS_tgkill = 270;	282	fstatfs64 = 269,
283	pub const SYS_utimes = 271;	283	tgkill = 270,
284	pub const SYS_fadvise64_64 = 272;	284	utimes = 271,
285	pub const SYS_vserver = 273;	285	fadvise64_64 = 272,
286	pub const SYS_mbind = 274;	286	vserver = 273,
287	pub const SYS_get_mempolicy = 275;	287	mbind = 274,
288	pub const SYS_set_mempolicy = 276;	288	get_mempolicy = 275,
289	pub const SYS_mq_open = 277;	289	set_mempolicy = 276,
290	pub const SYS_mq_unlink = SYS_mq_open + 1;	290	mq_open = 277,
291	pub const SYS_mq_timedsend = SYS_mq_open + 2;	291	mq_unlink, // SYS_mq_open + 1
292	pub const SYS_mq_timedreceive = SYS_mq_open + 3;	292	mq_timedsend, // SYS_mq_open + 2
293	pub const SYS_mq_notify = SYS_mq_open + 4;	293	mq_timedreceive, // SYS_mq_open + 3
294	pub const SYS_mq_getsetattr = SYS_mq_open + 5;	294	mq_notify, // SYS_mq_open + 4
295	pub const SYS_kexec_load = 283;	295	mq_getsetattr, // SYS_mq_open + 5
296	pub const SYS_waitid = 284;	296	kexec_load = 283,
297	pub const SYS_add_key = 286;	297	waitid = 284,
298	pub const SYS_request_key = 287;	298	add_key = 286,
299	pub const SYS_keyctl = 288;	299	request_key = 287,
300	pub const SYS_ioprio_set = 289;	300	keyctl = 288,
301	pub const SYS_ioprio_get = 290;	301	ioprio_set = 289,
302	pub const SYS_inotify_init = 291;	302	ioprio_get = 290,
303	pub const SYS_inotify_add_watch = 292;	303	inotify_init = 291,
304	pub const SYS_inotify_rm_watch = 293;	304	inotify_add_watch = 292,
305	pub const SYS_migrate_pages = 294;	305	inotify_rm_watch = 293,
306	pub const SYS_openat = 295;	306	migrate_pages = 294,
307	pub const SYS_mkdirat = 296;	307	openat = 295,
308	pub const SYS_mknodat = 297;	308	mkdirat = 296,
309	pub const SYS_fchownat = 298;	309	mknodat = 297,
310	pub const SYS_futimesat = 299;	310	fchownat = 298,
311	pub const SYS_fstatat64 = 300;	311	futimesat = 299,
312	pub const SYS_unlinkat = 301;	312	fstatat64 = 300,
313	pub const SYS_renameat = 302;	313	unlinkat = 301,
314	pub const SYS_linkat = 303;	314	renameat = 302,
315	pub const SYS_symlinkat = 304;	315	linkat = 303,
316	pub const SYS_readlinkat = 305;	316	symlinkat = 304,
317	pub const SYS_fchmodat = 306;	317	readlinkat = 305,
318	pub const SYS_faccessat = 307;	318	fchmodat = 306,
319	pub const SYS_pselect6 = 308;	319	faccessat = 307,
320	pub const SYS_ppoll = 309;	320	pselect6 = 308,
321	pub const SYS_unshare = 310;	321	ppoll = 309,
322	pub const SYS_set_robust_list = 311;	322	unshare = 310,
323	pub const SYS_get_robust_list = 312;	323	set_robust_list = 311,
324	pub const SYS_splice = 313;	324	get_robust_list = 312,
325	pub const SYS_sync_file_range = 314;	325	splice = 313,
326	pub const SYS_tee = 315;	326	sync_file_range = 314,
327	pub const SYS_vmsplice = 316;	327	tee = 315,
328	pub const SYS_move_pages = 317;	328	vmsplice = 316,
329	pub const SYS_getcpu = 318;	329	move_pages = 317,
330	pub const SYS_epoll_pwait = 319;	330	getcpu = 318,
331	pub const SYS_utimensat = 320;	331	epoll_pwait = 319,
332	pub const SYS_signalfd = 321;	332	utimensat = 320,
333	pub const SYS_timerfd_create = 322;	333	signalfd = 321,
334	pub const SYS_eventfd = 323;	334	timerfd_create = 322,
335	pub const SYS_fallocate = 324;	335	eventfd = 323,
336	pub const SYS_timerfd_settime = 325;	336	fallocate = 324,
337	pub const SYS_timerfd_gettime = 326;	337	timerfd_settime = 325,
338	pub const SYS_signalfd4 = 327;	338	timerfd_gettime = 326,
339	pub const SYS_eventfd2 = 328;	339	signalfd4 = 327,
340	pub const SYS_epoll_create1 = 329;	340	eventfd2 = 328,
341	pub const SYS_dup3 = 330;	341	epoll_create1 = 329,
342	pub const SYS_pipe2 = 331;	342	dup3 = 330,
343	pub const SYS_inotify_init1 = 332;	343	pipe2 = 331,
344	pub const SYS_preadv = 333;	344	inotify_init1 = 332,
345	pub const SYS_pwritev = 334;	345	preadv = 333,
346	pub const SYS_rt_tgsigqueueinfo = 335;	346	pwritev = 334,
347	pub const SYS_perf_event_open = 336;	347	rt_tgsigqueueinfo = 335,
348	pub const SYS_recvmmsg = 337;	348	perf_event_open = 336,
349	pub const SYS_fanotify_init = 338;	349	recvmmsg = 337,
350	pub const SYS_fanotify_mark = 339;	350	fanotify_init = 338,
351	pub const SYS_prlimit64 = 340;	351	fanotify_mark = 339,
352	pub const SYS_name_to_handle_at = 341;	352	prlimit64 = 340,
353	pub const SYS_open_by_handle_at = 342;	353	name_to_handle_at = 341,
354	pub const SYS_clock_adjtime = 343;	354	open_by_handle_at = 342,
355	pub const SYS_syncfs = 344;	355	clock_adjtime = 343,
356	pub const SYS_sendmmsg = 345;	356	syncfs = 344,
357	pub const SYS_setns = 346;	357	sendmmsg = 345,
358	pub const SYS_process_vm_readv = 347;	358	setns = 346,
359	pub const SYS_process_vm_writev = 348;	359	process_vm_readv = 347,
360	pub const SYS_kcmp = 349;	360	process_vm_writev = 348,
361	pub const SYS_finit_module = 350;	361	kcmp = 349,
362	pub const SYS_sched_setattr = 351;	362	finit_module = 350,
363	pub const SYS_sched_getattr = 352;	363	sched_setattr = 351,
364	pub const SYS_renameat2 = 353;	364	sched_getattr = 352,
365	pub const SYS_seccomp = 354;	365	renameat2 = 353,
366	pub const SYS_getrandom = 355;	366	seccomp = 354,
367	pub const SYS_memfd_create = 356;	367	getrandom = 355,
368	pub const SYS_bpf = 357;	368	memfd_create = 356,
369	pub const SYS_execveat = 358;	369	bpf = 357,
370	pub const SYS_socket = 359;	370	execveat = 358,
371	pub const SYS_socketpair = 360;	371	socket = 359,
372	pub const SYS_bind = 361;	372	socketpair = 360,
373	pub const SYS_connect = 362;	373	bind = 361,
374	pub const SYS_listen = 363;	374	connect = 362,
375	pub const SYS_accept4 = 364;	375	listen = 363,
376	pub const SYS_getsockopt = 365;	376	accept4 = 364,
377	pub const SYS_setsockopt = 366;	377	getsockopt = 365,
378	pub const SYS_getsockname = 367;	378	setsockopt = 366,
379	pub const SYS_getpeername = 368;	379	getsockname = 367,
380	pub const SYS_sendto = 369;	380	getpeername = 368,
381	pub const SYS_sendmsg = 370;	381	sendto = 369,
382	pub const SYS_recvfrom = 371;	382	sendmsg = 370,
383	pub const SYS_recvmsg = 372;	383	recvfrom = 371,
384	pub const SYS_shutdown = 373;	384	recvmsg = 372,
385	pub const SYS_userfaultfd = 374;	385	shutdown = 373,
386	pub const SYS_membarrier = 375;	386	userfaultfd = 374,
387	pub const SYS_mlock2 = 376;	387	membarrier = 375,
388	pub const SYS_copy_file_range = 377;	388	mlock2 = 376,
389	pub const SYS_preadv2 = 378;	389	copy_file_range = 377,
390	pub const SYS_pwritev2 = 379;	390	preadv2 = 378,
391	pub const SYS_pkey_mprotect = 380;	391	pwritev2 = 379,
392	pub const SYS_pkey_alloc = 381;	392	pkey_mprotect = 380,
393	pub const SYS_pkey_free = 382;	393	pkey_alloc = 381,
394	pub const SYS_statx = 383;	394	pkey_free = 382,
395	pub const SYS_arch_prctl = 384;	395	statx = 383,
396	pub const SYS_io_pgetevents = 385;	396	arch_prctl = 384,
397	pub const SYS_rseq = 386;	397	io_pgetevents = 385,
398	pub const SYS_semget = 393;	398	rseq = 386,
399	pub const SYS_semctl = 394;	399	semget = 393,
400	pub const SYS_shmget = 395;	400	semctl = 394,
401	pub const SYS_shmctl = 396;	401	shmget = 395,
402	pub const SYS_shmat = 397;	402	shmctl = 396,
403	pub const SYS_shmdt = 398;	403	shmat = 397,
404	pub const SYS_msgget = 399;	404	shmdt = 398,
405	pub const SYS_msgsnd = 400;	405	msgget = 399,
406	pub const SYS_msgrcv = 401;	406	msgsnd = 400,
407	pub const SYS_msgctl = 402;	407	msgrcv = 401,
408	pub const SYS_clock_gettime64 = 403;	408	msgctl = 402,
409	pub const SYS_clock_settime64 = 404;	409	clock_gettime64 = 403,
410	pub const SYS_clock_adjtime64 = 405;	410	clock_settime64 = 404,
411	pub const SYS_clock_getres_time64 = 406;	411	clock_adjtime64 = 405,
412	pub const SYS_clock_nanosleep_time64 = 407;	412	clock_getres_time64 = 406,
413	pub const SYS_timer_gettime64 = 408;	413	clock_nanosleep_time64 = 407,
414	pub const SYS_timer_settime64 = 409;	414	timer_gettime64 = 408,
415	pub const SYS_timerfd_gettime64 = 410;	415	timer_settime64 = 409,
416	pub const SYS_timerfd_settime64 = 411;	416	timerfd_gettime64 = 410,
417	pub const SYS_utimensat_time64 = 412;	417	timerfd_settime64 = 411,
418	pub const SYS_pselect6_time64 = 413;	418	utimensat_time64 = 412,
419	pub const SYS_ppoll_time64 = 414;	419	pselect6_time64 = 413,
420	pub const SYS_io_pgetevents_time64 = 416;	420	ppoll_time64 = 414,
421	pub const SYS_recvmmsg_time64 = 417;	421	io_pgetevents_time64 = 416,
422	pub const SYS_mq_timedsend_time64 = 418;	422	recvmmsg_time64 = 417,
423	pub const SYS_mq_timedreceive_time64 = 419;	423	mq_timedsend_time64 = 418,
424	pub const SYS_semtimedop_time64 = 420;	424	mq_timedreceive_time64 = 419,
425	pub const SYS_rt_sigtimedwait_time64 = 421;	425	semtimedop_time64 = 420,
426	pub const SYS_futex_time64 = 422;	426	rt_sigtimedwait_time64 = 421,
427	pub const SYS_sched_rr_get_interval_time64 = 423;	427	futex_time64 = 422,
428	pub const SYS_pidfd_send_signal = 424;	428	sched_rr_get_interval_time64 = 423,
429	pub const SYS_io_uring_setup = 425;	429	pidfd_send_signal = 424,
430	pub const SYS_io_uring_enter = 426;	430	io_uring_setup = 425,
431	pub const SYS_io_uring_register = 427;	431	io_uring_enter = 426,
432	pub const SYS_open_tree = 428;	432	io_uring_register = 427,
433	pub const SYS_move_mount = 429;	433	open_tree = 428,
434	pub const SYS_fsopen = 430;	434	move_mount = 429,
435	pub const SYS_fsconfig = 431;	435	fsopen = 430,
436	pub const SYS_fsmount = 432;	436	fsconfig = 431,
437	pub const SYS_fspick = 433;	437	fsmount = 432,
		438	fspick = 433,
		439	openat2 = 437,
		440	pidfd_getfd = 438,
		441
		442	_,
		443	};
438		444
439	pub const O_CREAT = 0o100;	445	pub const O_CREAT = 0o100;
440	pub const O_EXCL = 0o200;	446	pub const O_EXCL = 0o200;

lib/std/os/bits/linux/mipsel.zig+376-369

...	@@ -7,375 +7,382 @@ const uid_t = linux.uid_t;	...	@@ -7,375 +7,382 @@ const uid_t = linux.uid_t;
7	const gid_t = linux.gid_t;	7	const gid_t = linux.gid_t;
8	const pid_t = linux.pid_t;	8	const pid_t = linux.pid_t;
9		9
10	pub const SYS_Linux = 4000;	10	pub const SYS = extern enum(usize) {
11	pub const SYS_syscall = (SYS_Linux + 0);	11	pub const Linux = 4000;
12	pub const SYS_exit = (SYS_Linux + 1);	12
13	pub const SYS_fork = (SYS_Linux + 2);	13	syscall = Linux + 0,
14	pub const SYS_read = (SYS_Linux + 3);	14	exit = Linux + 1,
15	pub const SYS_write = (SYS_Linux + 4);	15	fork = Linux + 2,
16	pub const SYS_open = (SYS_Linux + 5);	16	read = Linux + 3,
17	pub const SYS_close = (SYS_Linux + 6);	17	write = Linux + 4,
18	pub const SYS_waitpid = (SYS_Linux + 7);	18	open = Linux + 5,
19	pub const SYS_creat = (SYS_Linux + 8);	19	close = Linux + 6,
20	pub const SYS_link = (SYS_Linux + 9);	20	waitpid = Linux + 7,
21	pub const SYS_unlink = (SYS_Linux + 10);	21	creat = Linux + 8,
22	pub const SYS_execve = (SYS_Linux + 11);	22	link = Linux + 9,
23	pub const SYS_chdir = (SYS_Linux + 12);	23	unlink = Linux + 10,
24	pub const SYS_time = (SYS_Linux + 13);	24	execve = Linux + 11,
25	pub const SYS_mknod = (SYS_Linux + 14);	25	chdir = Linux + 12,
26	pub const SYS_chmod = (SYS_Linux + 15);	26	time = Linux + 13,
27	pub const SYS_lchown = (SYS_Linux + 16);	27	mknod = Linux + 14,
28	pub const SYS_break = (SYS_Linux + 17);	28	chmod = Linux + 15,
29	pub const SYS_unused18 = (SYS_Linux + 18);	29	lchown = Linux + 16,
30	pub const SYS_lseek = (SYS_Linux + 19);	30	@"break" = Linux + 17,
31	pub const SYS_getpid = (SYS_Linux + 20);	31	unused18 = Linux + 18,
32	pub const SYS_mount = (SYS_Linux + 21);	32	lseek = Linux + 19,
33	pub const SYS_umount = (SYS_Linux + 22);	33	getpid = Linux + 20,
34	pub const SYS_setuid = (SYS_Linux + 23);	34	mount = Linux + 21,
35	pub const SYS_getuid = (SYS_Linux + 24);	35	umount = Linux + 22,
36	pub const SYS_stime = (SYS_Linux + 25);	36	setuid = Linux + 23,
37	pub const SYS_ptrace = (SYS_Linux + 26);	37	getuid = Linux + 24,
38	pub const SYS_alarm = (SYS_Linux + 27);	38	stime = Linux + 25,
39	pub const SYS_unused28 = (SYS_Linux + 28);	39	ptrace = Linux + 26,
40	pub const SYS_pause = (SYS_Linux + 29);	40	alarm = Linux + 27,
41	pub const SYS_utime = (SYS_Linux + 30);	41	unused28 = Linux + 28,
42	pub const SYS_stty = (SYS_Linux + 31);	42	pause = Linux + 29,
43	pub const SYS_gtty = (SYS_Linux + 32);	43	utime = Linux + 30,
44	pub const SYS_access = (SYS_Linux + 33);	44	stty = Linux + 31,
45	pub const SYS_nice = (SYS_Linux + 34);	45	gtty = Linux + 32,
46	pub const SYS_ftime = (SYS_Linux + 35);	46	access = Linux + 33,
47	pub const SYS_sync = (SYS_Linux + 36);	47	nice = Linux + 34,
48	pub const SYS_kill = (SYS_Linux + 37);	48	ftime = Linux + 35,
49	pub const SYS_rename = (SYS_Linux + 38);	49	sync = Linux + 36,
50	pub const SYS_mkdir = (SYS_Linux + 39);	50	kill = Linux + 37,
51	pub const SYS_rmdir = (SYS_Linux + 40);	51	rename = Linux + 38,
52	pub const SYS_dup = (SYS_Linux + 41);	52	mkdir = Linux + 39,
53	pub const SYS_pipe = (SYS_Linux + 42);	53	rmdir = Linux + 40,
54	pub const SYS_times = (SYS_Linux + 43);	54	dup = Linux + 41,
55	pub const SYS_prof = (SYS_Linux + 44);	55	pipe = Linux + 42,
56	pub const SYS_brk = (SYS_Linux + 45);	56	times = Linux + 43,
57	pub const SYS_setgid = (SYS_Linux + 46);	57	prof = Linux + 44,
58	pub const SYS_getgid = (SYS_Linux + 47);	58	brk = Linux + 45,
59	pub const SYS_signal = (SYS_Linux + 48);	59	setgid = Linux + 46,
60	pub const SYS_geteuid = (SYS_Linux + 49);	60	getgid = Linux + 47,
61	pub const SYS_getegid = (SYS_Linux + 50);	61	signal = Linux + 48,
62	pub const SYS_acct = (SYS_Linux + 51);	62	geteuid = Linux + 49,
63	pub const SYS_umount2 = (SYS_Linux + 52);	63	getegid = Linux + 50,
64	pub const SYS_lock = (SYS_Linux + 53);	64	acct = Linux + 51,
65	pub const SYS_ioctl = (SYS_Linux + 54);	65	umount2 = Linux + 52,
66	pub const SYS_fcntl = (SYS_Linux + 55);	66	lock = Linux + 53,
67	pub const SYS_mpx = (SYS_Linux + 56);	67	ioctl = Linux + 54,
68	pub const SYS_setpgid = (SYS_Linux + 57);	68	fcntl = Linux + 55,
69	pub const SYS_ulimit = (SYS_Linux + 58);	69	mpx = Linux + 56,
70	pub const SYS_unused59 = (SYS_Linux + 59);	70	setpgid = Linux + 57,
71	pub const SYS_umask = (SYS_Linux + 60);	71	ulimit = Linux + 58,
72	pub const SYS_chroot = (SYS_Linux + 61);	72	unused59 = Linux + 59,
73	pub const SYS_ustat = (SYS_Linux + 62);	73	umask = Linux + 60,
74	pub const SYS_dup2 = (SYS_Linux + 63);	74	chroot = Linux + 61,
75	pub const SYS_getppid = (SYS_Linux + 64);	75	ustat = Linux + 62,
76	pub const SYS_getpgrp = (SYS_Linux + 65);	76	dup2 = Linux + 63,
77	pub const SYS_setsid = (SYS_Linux + 66);	77	getppid = Linux + 64,
78	pub const SYS_sigaction = (SYS_Linux + 67);	78	getpgrp = Linux + 65,
79	pub const SYS_sgetmask = (SYS_Linux + 68);	79	setsid = Linux + 66,
80	pub const SYS_ssetmask = (SYS_Linux + 69);	80	sigaction = Linux + 67,
81	pub const SYS_setreuid = (SYS_Linux + 70);	81	sgetmask = Linux + 68,
82	pub const SYS_setregid = (SYS_Linux + 71);	82	ssetmask = Linux + 69,
83	pub const SYS_sigsuspend = (SYS_Linux + 72);	83	setreuid = Linux + 70,
84	pub const SYS_sigpending = (SYS_Linux + 73);	84	setregid = Linux + 71,
85	pub const SYS_sethostname = (SYS_Linux + 74);	85	sigsuspend = Linux + 72,
86	pub const SYS_setrlimit = (SYS_Linux + 75);	86	sigpending = Linux + 73,
87	pub const SYS_getrlimit = (SYS_Linux + 76);	87	sethostname = Linux + 74,
88	pub const SYS_getrusage = (SYS_Linux + 77);	88	setrlimit = Linux + 75,
89	pub const SYS_gettimeofday = (SYS_Linux + 78);	89	getrlimit = Linux + 76,
90	pub const SYS_settimeofday = (SYS_Linux + 79);	90	getrusage = Linux + 77,
91	pub const SYS_getgroups = (SYS_Linux + 80);	91	gettimeofday = Linux + 78,
92	pub const SYS_setgroups = (SYS_Linux + 81);	92	settimeofday = Linux + 79,
93	pub const SYS_reserved82 = (SYS_Linux + 82);	93	getgroups = Linux + 80,
94	pub const SYS_symlink = (SYS_Linux + 83);	94	setgroups = Linux + 81,
95	pub const SYS_unused84 = (SYS_Linux + 84);	95	reserved82 = Linux + 82,
96	pub const SYS_readlink = (SYS_Linux + 85);	96	symlink = Linux + 83,
97	pub const SYS_uselib = (SYS_Linux + 86);	97	unused84 = Linux + 84,
98	pub const SYS_swapon = (SYS_Linux + 87);	98	readlink = Linux + 85,
99	pub const SYS_reboot = (SYS_Linux + 88);	99	uselib = Linux + 86,
100	pub const SYS_readdir = (SYS_Linux + 89);	100	swapon = Linux + 87,
101	pub const SYS_mmap = (SYS_Linux + 90);	101	reboot = Linux + 88,
102	pub const SYS_munmap = (SYS_Linux + 91);	102	readdir = Linux + 89,
103	pub const SYS_truncate = (SYS_Linux + 92);	103	mmap = Linux + 90,
104	pub const SYS_ftruncate = (SYS_Linux + 93);	104	munmap = Linux + 91,
105	pub const SYS_fchmod = (SYS_Linux + 94);	105	truncate = Linux + 92,
106	pub const SYS_fchown = (SYS_Linux + 95);	106	ftruncate = Linux + 93,
107	pub const SYS_getpriority = (SYS_Linux + 96);	107	fchmod = Linux + 94,
108	pub const SYS_setpriority = (SYS_Linux + 97);	108	fchown = Linux + 95,
109	pub const SYS_profil = (SYS_Linux + 98);	109	getpriority = Linux + 96,
110	pub const SYS_statfs = (SYS_Linux + 99);	110	setpriority = Linux + 97,
111	pub const SYS_fstatfs = (SYS_Linux + 100);	111	profil = Linux + 98,
112	pub const SYS_ioperm = (SYS_Linux + 101);	112	statfs = Linux + 99,
113	pub const SYS_socketcall = (SYS_Linux + 102);	113	fstatfs = Linux + 100,
114	pub const SYS_syslog = (SYS_Linux + 103);	114	ioperm = Linux + 101,
115	pub const SYS_setitimer = (SYS_Linux + 104);	115	socketcall = Linux + 102,
116	pub const SYS_getitimer = (SYS_Linux + 105);	116	syslog = Linux + 103,
117	pub const SYS_stat = (SYS_Linux + 106);	117	setitimer = Linux + 104,
118	pub const SYS_lstat = (SYS_Linux + 107);	118	getitimer = Linux + 105,
119	pub const SYS_fstat = (SYS_Linux + 108);	119	stat = Linux + 106,
120	pub const SYS_unused109 = (SYS_Linux + 109);	120	lstat = Linux + 107,
121	pub const SYS_iopl = (SYS_Linux + 110);	121	fstat = Linux + 108,
122	pub const SYS_vhangup = (SYS_Linux + 111);	122	unused109 = Linux + 109,
123	pub const SYS_idle = (SYS_Linux + 112);	123	iopl = Linux + 110,
124	pub const SYS_vm86 = (SYS_Linux + 113);	124	vhangup = Linux + 111,
125	pub const SYS_wait4 = (SYS_Linux + 114);	125	idle = Linux + 112,
126	pub const SYS_swapoff = (SYS_Linux + 115);	126	vm86 = Linux + 113,
127	pub const SYS_sysinfo = (SYS_Linux + 116);	127	wait4 = Linux + 114,
128	pub const SYS_ipc = (SYS_Linux + 117);	128	swapoff = Linux + 115,
129	pub const SYS_fsync = (SYS_Linux + 118);	129	sysinfo = Linux + 116,
130	pub const SYS_sigreturn = (SYS_Linux + 119);	130	ipc = Linux + 117,
131	pub const SYS_clone = (SYS_Linux + 120);	131	fsync = Linux + 118,
132	pub const SYS_setdomainname = (SYS_Linux + 121);	132	sigreturn = Linux + 119,
133	pub const SYS_uname = (SYS_Linux + 122);	133	clone = Linux + 120,
134	pub const SYS_modify_ldt = (SYS_Linux + 123);	134	setdomainname = Linux + 121,
135	pub const SYS_adjtimex = (SYS_Linux + 124);	135	uname = Linux + 122,
136	pub const SYS_mprotect = (SYS_Linux + 125);	136	modify_ldt = Linux + 123,
137	pub const SYS_sigprocmask = (SYS_Linux + 126);	137	adjtimex = Linux + 124,
138	pub const SYS_create_module = (SYS_Linux + 127);	138	mprotect = Linux + 125,
139	pub const SYS_init_module = (SYS_Linux + 128);	139	sigprocmask = Linux + 126,
140	pub const SYS_delete_module = (SYS_Linux + 129);	140	create_module = Linux + 127,
141	pub const SYS_get_kernel_syms = (SYS_Linux + 130);	141	init_module = Linux + 128,
142	pub const SYS_quotactl = (SYS_Linux + 131);	142	delete_module = Linux + 129,
143	pub const SYS_getpgid = (SYS_Linux + 132);	143	get_kernel_syms = Linux + 130,
144	pub const SYS_fchdir = (SYS_Linux + 133);	144	quotactl = Linux + 131,
145	pub const SYS_bdflush = (SYS_Linux + 134);	145	getpgid = Linux + 132,
146	pub const SYS_sysfs = (SYS_Linux + 135);	146	fchdir = Linux + 133,
147	pub const SYS_personality = (SYS_Linux + 136);	147	bdflush = Linux + 134,
148	pub const SYS_afs_syscall = (SYS_Linux + 137);	148	sysfs = Linux + 135,
149	pub const SYS_setfsuid = (SYS_Linux + 138);	149	personality = Linux + 136,
150	pub const SYS_setfsgid = (SYS_Linux + 139);	150	afs_syscall = Linux + 137,
151	pub const SYS__llseek = (SYS_Linux + 140);	151	setfsuid = Linux + 138,
152	pub const SYS_getdents = (SYS_Linux + 141);	152	setfsgid = Linux + 139,
153	pub const SYS__newselect = (SYS_Linux + 142);	153	_llseek = Linux + 140,
154	pub const SYS_flock = (SYS_Linux + 143);	154	getdents = Linux + 141,
155	pub const SYS_msync = (SYS_Linux + 144);	155	_newselect = Linux + 142,
156	pub const SYS_readv = (SYS_Linux + 145);	156	flock = Linux + 143,
157	pub const SYS_writev = (SYS_Linux + 146);	157	msync = Linux + 144,
158	pub const SYS_cacheflush = (SYS_Linux + 147);	158	readv = Linux + 145,
159	pub const SYS_cachectl = (SYS_Linux + 148);	159	writev = Linux + 146,
160	pub const SYS_sysmips = (SYS_Linux + 149);	160	cacheflush = Linux + 147,
161	pub const SYS_unused150 = (SYS_Linux + 150);	161	cachectl = Linux + 148,
162	pub const SYS_getsid = (SYS_Linux + 151);	162	sysmips = Linux + 149,
163	pub const SYS_fdatasync = (SYS_Linux + 152);	163	unused150 = Linux + 150,
164	pub const SYS__sysctl = (SYS_Linux + 153);	164	getsid = Linux + 151,
165	pub const SYS_mlock = (SYS_Linux + 154);	165	fdatasync = Linux + 152,
166	pub const SYS_munlock = (SYS_Linux + 155);	166	_sysctl = Linux + 153,
167	pub const SYS_mlockall = (SYS_Linux + 156);	167	mlock = Linux + 154,
168	pub const SYS_munlockall = (SYS_Linux + 157);	168	munlock = Linux + 155,
169	pub const SYS_sched_setparam = (SYS_Linux + 158);	169	mlockall = Linux + 156,
170	pub const SYS_sched_getparam = (SYS_Linux + 159);	170	munlockall = Linux + 157,
171	pub const SYS_sched_setscheduler = (SYS_Linux + 160);	171	sched_setparam = Linux + 158,
172	pub const SYS_sched_getscheduler = (SYS_Linux + 161);	172	sched_getparam = Linux + 159,
173	pub const SYS_sched_yield = (SYS_Linux + 162);	173	sched_setscheduler = Linux + 160,
174	pub const SYS_sched_get_priority_max = (SYS_Linux + 163);	174	sched_getscheduler = Linux + 161,
175	pub const SYS_sched_get_priority_min = (SYS_Linux + 164);	175	sched_yield = Linux + 162,
176	pub const SYS_sched_rr_get_interval = (SYS_Linux + 165);	176	sched_get_priority_max = Linux + 163,
177	pub const SYS_nanosleep = (SYS_Linux + 166);	177	sched_get_priority_min = Linux + 164,
178	pub const SYS_mremap = (SYS_Linux + 167);	178	sched_rr_get_interval = Linux + 165,
179	pub const SYS_accept = (SYS_Linux + 168);	179	nanosleep = Linux + 166,
180	pub const SYS_bind = (SYS_Linux + 169);	180	mremap = Linux + 167,
181	pub const SYS_connect = (SYS_Linux + 170);	181	accept = Linux + 168,
182	pub const SYS_getpeername = (SYS_Linux + 171);	182	bind = Linux + 169,
183	pub const SYS_getsockname = (SYS_Linux + 172);	183	connect = Linux + 170,
184	pub const SYS_getsockopt = (SYS_Linux + 173);	184	getpeername = Linux + 171,
185	pub const SYS_listen = (SYS_Linux + 174);	185	getsockname = Linux + 172,
186	pub const SYS_recv = (SYS_Linux + 175);	186	getsockopt = Linux + 173,
187	pub const SYS_recvfrom = (SYS_Linux + 176);	187	listen = Linux + 174,
188	pub const SYS_recvmsg = (SYS_Linux + 177);	188	recv = Linux + 175,
189	pub const SYS_send = (SYS_Linux + 178);	189	recvfrom = Linux + 176,
190	pub const SYS_sendmsg = (SYS_Linux + 179);	190	recvmsg = Linux + 177,
191	pub const SYS_sendto = (SYS_Linux + 180);	191	send = Linux + 178,
192	pub const SYS_setsockopt = (SYS_Linux + 181);	192	sendmsg = Linux + 179,
193	pub const SYS_shutdown = (SYS_Linux + 182);	193	sendto = Linux + 180,
194	pub const SYS_socket = (SYS_Linux + 183);	194	setsockopt = Linux + 181,
195	pub const SYS_socketpair = (SYS_Linux + 184);	195	shutdown = Linux + 182,
196	pub const SYS_setresuid = (SYS_Linux + 185);	196	socket = Linux + 183,
197	pub const SYS_getresuid = (SYS_Linux + 186);	197	socketpair = Linux + 184,
198	pub const SYS_query_module = (SYS_Linux + 187);	198	setresuid = Linux + 185,
199	pub const SYS_poll = (SYS_Linux + 188);	199	getresuid = Linux + 186,
200	pub const SYS_nfsservctl = (SYS_Linux + 189);	200	query_module = Linux + 187,
201	pub const SYS_setresgid = (SYS_Linux + 190);	201	poll = Linux + 188,
202	pub const SYS_getresgid = (SYS_Linux + 191);	202	nfsservctl = Linux + 189,
203	pub const SYS_prctl = (SYS_Linux + 192);	203	setresgid = Linux + 190,
204	pub const SYS_rt_sigreturn = (SYS_Linux + 193);	204	getresgid = Linux + 191,
205	pub const SYS_rt_sigaction = (SYS_Linux + 194);	205	prctl = Linux + 192,
206	pub const SYS_rt_sigprocmask = (SYS_Linux + 195);	206	rt_sigreturn = Linux + 193,
207	pub const SYS_rt_sigpending = (SYS_Linux + 196);	207	rt_sigaction = Linux + 194,
208	pub const SYS_rt_sigtimedwait = (SYS_Linux + 197);	208	rt_sigprocmask = Linux + 195,
209	pub const SYS_rt_sigqueueinfo = (SYS_Linux + 198);	209	rt_sigpending = Linux + 196,
210	pub const SYS_rt_sigsuspend = (SYS_Linux + 199);	210	rt_sigtimedwait = Linux + 197,
211	pub const SYS_pread64 = (SYS_Linux + 200);	211	rt_sigqueueinfo = Linux + 198,
212	pub const SYS_pwrite64 = (SYS_Linux + 201);	212	rt_sigsuspend = Linux + 199,
213	pub const SYS_chown = (SYS_Linux + 202);	213	pread64 = Linux + 200,
214	pub const SYS_getcwd = (SYS_Linux + 203);	214	pwrite64 = Linux + 201,
215	pub const SYS_capget = (SYS_Linux + 204);	215	chown = Linux + 202,
216	pub const SYS_capset = (SYS_Linux + 205);	216	getcwd = Linux + 203,
217	pub const SYS_sigaltstack = (SYS_Linux + 206);	217	capget = Linux + 204,
218	pub const SYS_sendfile = (SYS_Linux + 207);	218	capset = Linux + 205,
219	pub const SYS_getpmsg = (SYS_Linux + 208);	219	sigaltstack = Linux + 206,
220	pub const SYS_putpmsg = (SYS_Linux + 209);	220	sendfile = Linux + 207,
221	pub const SYS_mmap2 = (SYS_Linux + 210);	221	getpmsg = Linux + 208,
222	pub const SYS_truncate64 = (SYS_Linux + 211);	222	putpmsg = Linux + 209,
223	pub const SYS_ftruncate64 = (SYS_Linux + 212);	223	mmap2 = Linux + 210,
224	pub const SYS_stat64 = (SYS_Linux + 213);	224	truncate64 = Linux + 211,
225	pub const SYS_lstat64 = (SYS_Linux + 214);	225	ftruncate64 = Linux + 212,
226	pub const SYS_fstat64 = (SYS_Linux + 215);	226	stat64 = Linux + 213,
227	pub const SYS_pivot_root = (SYS_Linux + 216);	227	lstat64 = Linux + 214,
228	pub const SYS_mincore = (SYS_Linux + 217);	228	fstat64 = Linux + 215,
229	pub const SYS_madvise = (SYS_Linux + 218);	229	pivot_root = Linux + 216,
230	pub const SYS_getdents64 = (SYS_Linux + 219);	230	mincore = Linux + 217,
231	pub const SYS_fcntl64 = (SYS_Linux + 220);	231	madvise = Linux + 218,
232	pub const SYS_reserved221 = (SYS_Linux + 221);	232	getdents64 = Linux + 219,
233	pub const SYS_gettid = (SYS_Linux + 222);	233	fcntl64 = Linux + 220,
234	pub const SYS_readahead = (SYS_Linux + 223);	234	reserved221 = Linux + 221,
235	pub const SYS_setxattr = (SYS_Linux + 224);	235	gettid = Linux + 222,
236	pub const SYS_lsetxattr = (SYS_Linux + 225);	236	readahead = Linux + 223,
237	pub const SYS_fsetxattr = (SYS_Linux + 226);	237	setxattr = Linux + 224,
238	pub const SYS_getxattr = (SYS_Linux + 227);	238	lsetxattr = Linux + 225,
239	pub const SYS_lgetxattr = (SYS_Linux + 228);	239	fsetxattr = Linux + 226,
240	pub const SYS_fgetxattr = (SYS_Linux + 229);	240	getxattr = Linux + 227,
241	pub const SYS_listxattr = (SYS_Linux + 230);	241	lgetxattr = Linux + 228,
242	pub const SYS_llistxattr = (SYS_Linux + 231);	242	fgetxattr = Linux + 229,
243	pub const SYS_flistxattr = (SYS_Linux + 232);	243	listxattr = Linux + 230,
244	pub const SYS_removexattr = (SYS_Linux + 233);	244	llistxattr = Linux + 231,
245	pub const SYS_lremovexattr = (SYS_Linux + 234);	245	flistxattr = Linux + 232,
246	pub const SYS_fremovexattr = (SYS_Linux + 235);	246	removexattr = Linux + 233,
247	pub const SYS_tkill = (SYS_Linux + 236);	247	lremovexattr = Linux + 234,
248	pub const SYS_sendfile64 = (SYS_Linux + 237);	248	fremovexattr = Linux + 235,
249	pub const SYS_futex = (SYS_Linux + 238);	249	tkill = Linux + 236,
250	pub const SYS_sched_setaffinity = (SYS_Linux + 239);	250	sendfile64 = Linux + 237,
251	pub const SYS_sched_getaffinity = (SYS_Linux + 240);	251	futex = Linux + 238,
252	pub const SYS_io_setup = (SYS_Linux + 241);	252	sched_setaffinity = Linux + 239,
253	pub const SYS_io_destroy = (SYS_Linux + 242);	253	sched_getaffinity = Linux + 240,
254	pub const SYS_io_getevents = (SYS_Linux + 243);	254	io_setup = Linux + 241,
255	pub const SYS_io_submit = (SYS_Linux + 244);	255	io_destroy = Linux + 242,
256	pub const SYS_io_cancel = (SYS_Linux + 245);	256	io_getevents = Linux + 243,
257	pub const SYS_exit_group = (SYS_Linux + 246);	257	io_submit = Linux + 244,
258	pub const SYS_lookup_dcookie = (SYS_Linux + 247);	258	io_cancel = Linux + 245,
259	pub const SYS_epoll_create = (SYS_Linux + 248);	259	exit_group = Linux + 246,
260	pub const SYS_epoll_ctl = (SYS_Linux + 249);	260	lookup_dcookie = Linux + 247,
261	pub const SYS_epoll_wait = (SYS_Linux + 250);	261	epoll_create = Linux + 248,
262	pub const SYS_remap_file_pages = (SYS_Linux + 251);	262	epoll_ctl = Linux + 249,
263	pub const SYS_set_tid_address = (SYS_Linux + 252);	263	epoll_wait = Linux + 250,
264	pub const SYS_restart_syscall = (SYS_Linux + 253);	264	remap_file_pages = Linux + 251,
265	pub const SYS_fadvise64 = (SYS_Linux + 254);	265	set_tid_address = Linux + 252,
266	pub const SYS_statfs64 = (SYS_Linux + 255);	266	restart_syscall = Linux + 253,
267	pub const SYS_fstatfs64 = (SYS_Linux + 256);	267	fadvise64 = Linux + 254,
268	pub const SYS_timer_create = (SYS_Linux + 257);	268	statfs64 = Linux + 255,
269	pub const SYS_timer_settime = (SYS_Linux + 258);	269	fstatfs64 = Linux + 256,
270	pub const SYS_timer_gettime = (SYS_Linux + 259);	270	timer_create = Linux + 257,
271	pub const SYS_timer_getoverrun = (SYS_Linux + 260);	271	timer_settime = Linux + 258,
272	pub const SYS_timer_delete = (SYS_Linux + 261);	272	timer_gettime = Linux + 259,
273	pub const SYS_clock_settime = (SYS_Linux + 262);	273	timer_getoverrun = Linux + 260,
274	pub const SYS_clock_gettime = (SYS_Linux + 263);	274	timer_delete = Linux + 261,
275	pub const SYS_clock_getres = (SYS_Linux + 264);	275	clock_settime = Linux + 262,
276	pub const SYS_clock_nanosleep = (SYS_Linux + 265);	276	clock_gettime = Linux + 263,
277	pub const SYS_tgkill = (SYS_Linux + 266);	277	clock_getres = Linux + 264,
278	pub const SYS_utimes = (SYS_Linux + 267);	278	clock_nanosleep = Linux + 265,
279	pub const SYS_mbind = (SYS_Linux + 268);	279	tgkill = Linux + 266,
280	pub const SYS_get_mempolicy = (SYS_Linux + 269);	280	utimes = Linux + 267,
281	pub const SYS_set_mempolicy = (SYS_Linux + 270);	281	mbind = Linux + 268,
282	pub const SYS_mq_open = (SYS_Linux + 271);	282	get_mempolicy = Linux + 269,
283	pub const SYS_mq_unlink = (SYS_Linux + 272);	283	set_mempolicy = Linux + 270,
284	pub const SYS_mq_timedsend = (SYS_Linux + 273);	284	mq_open = Linux + 271,
285	pub const SYS_mq_timedreceive = (SYS_Linux + 274);	285	mq_unlink = Linux + 272,
286	pub const SYS_mq_notify = (SYS_Linux + 275);	286	mq_timedsend = Linux + 273,
287	pub const SYS_mq_getsetattr = (SYS_Linux + 276);	287	mq_timedreceive = Linux + 274,
288	pub const SYS_vserver = (SYS_Linux + 277);	288	mq_notify = Linux + 275,
289	pub const SYS_waitid = (SYS_Linux + 278);	289	mq_getsetattr = Linux + 276,
290	pub const SYS_add_key = (SYS_Linux + 280);	290	vserver = Linux + 277,
291	pub const SYS_request_key = (SYS_Linux + 281);	291	waitid = Linux + 278,
292	pub const SYS_keyctl = (SYS_Linux + 282);	292	add_key = Linux + 280,
293	pub const SYS_set_thread_area = (SYS_Linux + 283);	293	request_key = Linux + 281,
294	pub const SYS_inotify_init = (SYS_Linux + 284);	294	keyctl = Linux + 282,
295	pub const SYS_inotify_add_watch = (SYS_Linux + 285);	295	set_thread_area = Linux + 283,
296	pub const SYS_inotify_rm_watch = (SYS_Linux + 286);	296	inotify_init = Linux + 284,
297	pub const SYS_migrate_pages = (SYS_Linux + 287);	297	inotify_add_watch = Linux + 285,
298	pub const SYS_openat = (SYS_Linux + 288);	298	inotify_rm_watch = Linux + 286,
299	pub const SYS_mkdirat = (SYS_Linux + 289);	299	migrate_pages = Linux + 287,
300	pub const SYS_mknodat = (SYS_Linux + 290);	300	openat = Linux + 288,
301	pub const SYS_fchownat = (SYS_Linux + 291);	301	mkdirat = Linux + 289,
302	pub const SYS_futimesat = (SYS_Linux + 292);	302	mknodat = Linux + 290,
303	pub const SYS_fstatat64 = (SYS_Linux + 293);	303	fchownat = Linux + 291,
304	pub const SYS_unlinkat = (SYS_Linux + 294);	304	futimesat = Linux + 292,
305	pub const SYS_renameat = (SYS_Linux + 295);	305	fstatat64 = Linux + 293,
306	pub const SYS_linkat = (SYS_Linux + 296);	306	unlinkat = Linux + 294,
307	pub const SYS_symlinkat = (SYS_Linux + 297);	307	renameat = Linux + 295,
308	pub const SYS_readlinkat = (SYS_Linux + 298);	308	linkat = Linux + 296,
309	pub const SYS_fchmodat = (SYS_Linux + 299);	309	symlinkat = Linux + 297,
310	pub const SYS_faccessat = (SYS_Linux + 300);	310	readlinkat = Linux + 298,
311	pub const SYS_pselect6 = (SYS_Linux + 301);	311	fchmodat = Linux + 299,
312	pub const SYS_ppoll = (SYS_Linux + 302);	312	faccessat = Linux + 300,
313	pub const SYS_unshare = (SYS_Linux + 303);	313	pselect6 = Linux + 301,
314	pub const SYS_splice = (SYS_Linux + 304);	314	ppoll = Linux + 302,
315	pub const SYS_sync_file_range = (SYS_Linux + 305);	315	unshare = Linux + 303,
316	pub const SYS_tee = (SYS_Linux + 306);	316	splice = Linux + 304,
317	pub const SYS_vmsplice = (SYS_Linux + 307);	317	sync_file_range = Linux + 305,
318	pub const SYS_move_pages = (SYS_Linux + 308);	318	tee = Linux + 306,
319	pub const SYS_set_robust_list = (SYS_Linux + 309);	319	vmsplice = Linux + 307,
320	pub const SYS_get_robust_list = (SYS_Linux + 310);	320	move_pages = Linux + 308,
321	pub const SYS_kexec_load = (SYS_Linux + 311);	321	set_robust_list = Linux + 309,
322	pub const SYS_getcpu = (SYS_Linux + 312);	322	get_robust_list = Linux + 310,
323	pub const SYS_epoll_pwait = (SYS_Linux + 313);	323	kexec_load = Linux + 311,
324	pub const SYS_ioprio_set = (SYS_Linux + 314);	324	getcpu = Linux + 312,
325	pub const SYS_ioprio_get = (SYS_Linux + 315);	325	epoll_pwait = Linux + 313,
326	pub const SYS_utimensat = (SYS_Linux + 316);	326	ioprio_set = Linux + 314,
327	pub const SYS_signalfd = (SYS_Linux + 317);	327	ioprio_get = Linux + 315,
328	pub const SYS_timerfd = (SYS_Linux + 318);	328	utimensat = Linux + 316,
329	pub const SYS_eventfd = (SYS_Linux + 319);	329	signalfd = Linux + 317,
330	pub const SYS_fallocate = (SYS_Linux + 320);	330	timerfd = Linux + 318,
331	pub const SYS_timerfd_create = (SYS_Linux + 321);	331	eventfd = Linux + 319,
332	pub const SYS_timerfd_gettime = (SYS_Linux + 322);	332	fallocate = Linux + 320,
333	pub const SYS_timerfd_settime = (SYS_Linux + 323);	333	timerfd_create = Linux + 321,
334	pub const SYS_signalfd4 = (SYS_Linux + 324);	334	timerfd_gettime = Linux + 322,
335	pub const SYS_eventfd2 = (SYS_Linux + 325);	335	timerfd_settime = Linux + 323,
336	pub const SYS_epoll_create1 = (SYS_Linux + 326);	336	signalfd4 = Linux + 324,
337	pub const SYS_dup3 = (SYS_Linux + 327);	337	eventfd2 = Linux + 325,
338	pub const SYS_pipe2 = (SYS_Linux + 328);	338	epoll_create1 = Linux + 326,
339	pub const SYS_inotify_init1 = (SYS_Linux + 329);	339	dup3 = Linux + 327,
340	pub const SYS_preadv = (SYS_Linux + 330);	340	pipe2 = Linux + 328,
341	pub const SYS_pwritev = (SYS_Linux + 331);	341	inotify_init1 = Linux + 329,
342	pub const SYS_rt_tgsigqueueinfo = (SYS_Linux + 332);	342	preadv = Linux + 330,
343	pub const SYS_perf_event_open = (SYS_Linux + 333);	343	pwritev = Linux + 331,
344	pub const SYS_accept4 = (SYS_Linux + 334);	344	rt_tgsigqueueinfo = Linux + 332,
345	pub const SYS_recvmmsg = (SYS_Linux + 335);	345	perf_event_open = Linux + 333,
346	pub const SYS_fanotify_init = (SYS_Linux + 336);	346	accept4 = Linux + 334,
347	pub const SYS_fanotify_mark = (SYS_Linux + 337);	347	recvmmsg = Linux + 335,
348	pub const SYS_prlimit64 = (SYS_Linux + 338);	348	fanotify_init = Linux + 336,
349	pub const SYS_name_to_handle_at = (SYS_Linux + 339);	349	fanotify_mark = Linux + 337,
350	pub const SYS_open_by_handle_at = (SYS_Linux + 340);	350	prlimit64 = Linux + 338,
351	pub const SYS_clock_adjtime = (SYS_Linux + 341);	351	name_to_handle_at = Linux + 339,
352	pub const SYS_syncfs = (SYS_Linux + 342);	352	open_by_handle_at = Linux + 340,
353	pub const SYS_sendmmsg = (SYS_Linux + 343);	353	clock_adjtime = Linux + 341,
354	pub const SYS_setns = (SYS_Linux + 344);	354	syncfs = Linux + 342,
355	pub const SYS_process_vm_readv = (SYS_Linux + 345);	355	sendmmsg = Linux + 343,
356	pub const SYS_process_vm_writev = (SYS_Linux + 346);	356	setns = Linux + 344,
357	pub const SYS_kcmp = (SYS_Linux + 347);	357	process_vm_readv = Linux + 345,
358	pub const SYS_finit_module = (SYS_Linux + 348);	358	process_vm_writev = Linux + 346,
359	pub const SYS_sched_setattr = (SYS_Linux + 349);	359	kcmp = Linux + 347,
360	pub const SYS_sched_getattr = (SYS_Linux + 350);	360	finit_module = Linux + 348,
361	pub const SYS_renameat2 = (SYS_Linux + 351);	361	sched_setattr = Linux + 349,
362	pub const SYS_seccomp = (SYS_Linux + 352);	362	sched_getattr = Linux + 350,
363	pub const SYS_getrandom = (SYS_Linux + 353);	363	renameat2 = Linux + 351,
364	pub const SYS_memfd_create = (SYS_Linux + 354);	364	seccomp = Linux + 352,
365	pub const SYS_bpf = (SYS_Linux + 355);	365	getrandom = Linux + 353,
366	pub const SYS_execveat = (SYS_Linux + 356);	366	memfd_create = Linux + 354,
367	pub const SYS_userfaultfd = (SYS_Linux + 357);	367	bpf = Linux + 355,
368	pub const SYS_membarrier = (SYS_Linux + 358);	368	execveat = Linux + 356,
369	pub const SYS_mlock2 = (SYS_Linux + 359);	369	userfaultfd = Linux + 357,
370	pub const SYS_copy_file_range = (SYS_Linux + 360);	370	membarrier = Linux + 358,
371	pub const SYS_preadv2 = (SYS_Linux + 361);	371	mlock2 = Linux + 359,
372	pub const SYS_pwritev2 = (SYS_Linux + 362);	372	copy_file_range = Linux + 360,
373	pub const SYS_pkey_mprotect = (SYS_Linux + 363);	373	preadv2 = Linux + 361,
374	pub const SYS_pkey_alloc = (SYS_Linux + 364);	374	pwritev2 = Linux + 362,
375	pub const SYS_pkey_free = (SYS_Linux + 365);	375	pkey_mprotect = Linux + 363,
376	pub const SYS_statx = (SYS_Linux + 366);	376	pkey_alloc = Linux + 364,
377	pub const SYS_rseq = (SYS_Linux + 367);	377	pkey_free = Linux + 365,
378	pub const SYS_io_pgetevents = (SYS_Linux + 368);	378	statx = Linux + 366,
		379	rseq = Linux + 367,
		380	io_pgetevents = Linux + 368,
		381	openat2 = Linux + 437,
		382	pidfd_getfd = Linux + 438,
		383
		384	_,
		385	};
379		386
380	pub const O_CREAT = 0o0400;	387	pub const O_CREAT = 0o0400;
381	pub const O_EXCL = 0o02000;	388	pub const O_EXCL = 0o02000;

lib/std/os/bits/linux/riscv64.zig+298-292

...	@@ -4,300 +4,306 @@ const uid_t = std.os.linux.uid_t;	...	@@ -4,300 +4,306 @@ const uid_t = std.os.linux.uid_t;
4	const gid_t = std.os.linux.gid_t;	4	const gid_t = std.os.linux.gid_t;
5	const pid_t = std.os.linux.pid_t;	5	const pid_t = std.os.linux.pid_t;
6		6
7	pub const SYS_io_setup = 0;	7	pub const SYS = extern enum(usize) {
8	pub const SYS_io_destroy = 1;	8	io_setup = 0,
9	pub const SYS_io_submit = 2;	9	io_destroy = 1,
10	pub const SYS_io_cancel = 3;	10	io_submit = 2,
11	pub const SYS_io_getevents = 4;	11	io_cancel = 3,
12	pub const SYS_setxattr = 5;	12	io_getevents = 4,
13	pub const SYS_lsetxattr = 6;	13	setxattr = 5,
14	pub const SYS_fsetxattr = 7;	14	lsetxattr = 6,
15	pub const SYS_getxattr = 8;	15	fsetxattr = 7,
16	pub const SYS_lgetxattr = 9;	16	getxattr = 8,
17	pub const SYS_fgetxattr = 10;	17	lgetxattr = 9,
18	pub const SYS_listxattr = 11;	18	fgetxattr = 10,
19	pub const SYS_llistxattr = 12;	19	listxattr = 11,
20	pub const SYS_flistxattr = 13;	20	llistxattr = 12,
21	pub const SYS_removexattr = 14;	21	flistxattr = 13,
22	pub const SYS_lremovexattr = 15;	22	removexattr = 14,
23	pub const SYS_fremovexattr = 16;	23	lremovexattr = 15,
24	pub const SYS_getcwd = 17;	24	fremovexattr = 16,
25	pub const SYS_lookup_dcookie = 18;	25	getcwd = 17,
26	pub const SYS_eventfd2 = 19;	26	lookup_dcookie = 18,
27	pub const SYS_epoll_create1 = 20;	27	eventfd2 = 19,
28	pub const SYS_epoll_ctl = 21;	28	epoll_create1 = 20,
29	pub const SYS_epoll_pwait = 22;	29	epoll_ctl = 21,
30	pub const SYS_dup = 23;	30	epoll_pwait = 22,
31	pub const SYS_dup3 = 24;	31	dup = 23,
32	pub const SYS_fcntl = 25;	32	dup3 = 24,
33	pub const SYS_inotify_init1 = 26;	33	fcntl = 25,
34	pub const SYS_inotify_add_watch = 27;	34	inotify_init1 = 26,
35	pub const SYS_inotify_rm_watch = 28;	35	inotify_add_watch = 27,
36	pub const SYS_ioctl = 29;	36	inotify_rm_watch = 28,
37	pub const SYS_ioprio_set = 30;	37	ioctl = 29,
38	pub const SYS_ioprio_get = 31;	38	ioprio_set = 30,
39	pub const SYS_flock = 32;	39	ioprio_get = 31,
40	pub const SYS_mknodat = 33;	40	flock = 32,
41	pub const SYS_mkdirat = 34;	41	mknodat = 33,
42	pub const SYS_unlinkat = 35;	42	mkdirat = 34,
43	pub const SYS_symlinkat = 36;	43	unlinkat = 35,
44	pub const SYS_linkat = 37;	44	symlinkat = 36,
45	pub const SYS_umount2 = 39;	45	linkat = 37,
46	pub const SYS_mount = 40;	46	umount2 = 39,
47	pub const SYS_pivot_root = 41;	47	mount = 40,
48	pub const SYS_nfsservctl = 42;	48	pivot_root = 41,
49	pub const SYS_statfs = 43;	49	nfsservctl = 42,
50	pub const SYS_fstatfs = 44;	50	statfs = 43,
51	pub const SYS_truncate = 45;	51	fstatfs = 44,
52	pub const SYS_ftruncate = 46;	52	truncate = 45,
53	pub const SYS_fallocate = 47;	53	ftruncate = 46,
54	pub const SYS_faccessat = 48;	54	fallocate = 47,
55	pub const SYS_chdir = 49;	55	faccessat = 48,
56	pub const SYS_fchdir = 50;	56	chdir = 49,
57	pub const SYS_chroot = 51;	57	fchdir = 50,
58	pub const SYS_fchmod = 52;	58	chroot = 51,
59	pub const SYS_fchmodat = 53;	59	fchmod = 52,
60	pub const SYS_fchownat = 54;	60	fchmodat = 53,
61	pub const SYS_fchown = 55;	61	fchownat = 54,
62	pub const SYS_openat = 56;	62	fchown = 55,
63	pub const SYS_close = 57;	63	openat = 56,
64	pub const SYS_vhangup = 58;	64	close = 57,
65	pub const SYS_pipe2 = 59;	65	vhangup = 58,
66	pub const SYS_quotactl = 60;	66	pipe2 = 59,
67	pub const SYS_getdents64 = 61;	67	quotactl = 60,
68	pub const SYS_lseek = 62;	68	getdents64 = 61,
69	pub const SYS_read = 63;	69	lseek = 62,
70	pub const SYS_write = 64;	70	read = 63,
71	pub const SYS_readv = 65;	71	write = 64,
72	pub const SYS_writev = 66;	72	readv = 65,
73	pub const SYS_pread64 = 67;	73	writev = 66,
74	pub const SYS_pwrite64 = 68;	74	pread64 = 67,
75	pub const SYS_preadv = 69;	75	pwrite64 = 68,
76	pub const SYS_pwritev = 70;	76	preadv = 69,
77	pub const SYS_sendfile = 71;	77	pwritev = 70,
78	pub const SYS_pselect6 = 72;	78	sendfile = 71,
79	pub const SYS_ppoll = 73;	79	pselect6 = 72,
80	pub const SYS_signalfd4 = 74;	80	ppoll = 73,
81	pub const SYS_vmsplice = 75;	81	signalfd4 = 74,
82	pub const SYS_splice = 76;	82	vmsplice = 75,
83	pub const SYS_tee = 77;	83	splice = 76,
84	pub const SYS_readlinkat = 78;	84	tee = 77,
85	pub const SYS_fstatat = 79;	85	readlinkat = 78,
86	pub const SYS_fstat = 80;	86	fstatat = 79,
87	pub const SYS_sync = 81;	87	fstat = 80,
88	pub const SYS_fsync = 82;	88	sync = 81,
89	pub const SYS_fdatasync = 83;	89	fsync = 82,
90	pub const SYS_sync_file_range = 84;	90	fdatasync = 83,
91	pub const SYS_timerfd_create = 85;	91	sync_file_range = 84,
92	pub const SYS_timerfd_settime = 86;	92	timerfd_create = 85,
93	pub const SYS_timerfd_gettime = 87;	93	timerfd_settime = 86,
94	pub const SYS_utimensat = 88;	94	timerfd_gettime = 87,
95	pub const SYS_acct = 89;	95	utimensat = 88,
96	pub const SYS_capget = 90;	96	acct = 89,
97	pub const SYS_capset = 91;	97	capget = 90,
98	pub const SYS_personality = 92;	98	capset = 91,
99	pub const SYS_exit = 93;	99	personality = 92,
100	pub const SYS_exit_group = 94;	100	exit = 93,
101	pub const SYS_waitid = 95;	101	exit_group = 94,
102	pub const SYS_set_tid_address = 96;	102	waitid = 95,
103	pub const SYS_unshare = 97;	103	set_tid_address = 96,
104	pub const SYS_futex = 98;	104	unshare = 97,
105	pub const SYS_set_robust_list = 99;	105	futex = 98,
106	pub const SYS_get_robust_list = 100;	106	set_robust_list = 99,
107	pub const SYS_nanosleep = 101;	107	get_robust_list = 100,
108	pub const SYS_getitimer = 102;	108	nanosleep = 101,
109	pub const SYS_setitimer = 103;	109	getitimer = 102,
110	pub const SYS_kexec_load = 104;	110	setitimer = 103,
111	pub const SYS_init_module = 105;	111	kexec_load = 104,
112	pub const SYS_delete_module = 106;	112	init_module = 105,
113	pub const SYS_timer_create = 107;	113	delete_module = 106,
114	pub const SYS_timer_gettime = 108;	114	timer_create = 107,
115	pub const SYS_timer_getoverrun = 109;	115	timer_gettime = 108,
116	pub const SYS_timer_settime = 110;	116	timer_getoverrun = 109,
117	pub const SYS_timer_delete = 111;	117	timer_settime = 110,
118	pub const SYS_clock_settime = 112;	118	timer_delete = 111,
119	pub const SYS_clock_gettime = 113;	119	clock_settime = 112,
120	pub const SYS_clock_getres = 114;	120	clock_gettime = 113,
121	pub const SYS_clock_nanosleep = 115;	121	clock_getres = 114,
122	pub const SYS_syslog = 116;	122	clock_nanosleep = 115,
123	pub const SYS_ptrace = 117;	123	syslog = 116,
124	pub const SYS_sched_setparam = 118;	124	ptrace = 117,
125	pub const SYS_sched_setscheduler = 119;	125	sched_setparam = 118,
126	pub const SYS_sched_getscheduler = 120;	126	sched_setscheduler = 119,
127	pub const SYS_sched_getparam = 121;	127	sched_getscheduler = 120,
128	pub const SYS_sched_setaffinity = 122;	128	sched_getparam = 121,
129	pub const SYS_sched_getaffinity = 123;	129	sched_setaffinity = 122,
130	pub const SYS_sched_yield = 124;	130	sched_getaffinity = 123,
131	pub const SYS_sched_get_priority_max = 125;	131	sched_yield = 124,
132	pub const SYS_sched_get_priority_min = 126;	132	sched_get_priority_max = 125,
133	pub const SYS_sched_rr_get_interval = 127;	133	sched_get_priority_min = 126,
134	pub const SYS_restart_syscall = 128;	134	sched_rr_get_interval = 127,
135	pub const SYS_kill = 129;	135	restart_syscall = 128,
136	pub const SYS_tkill = 130;	136	kill = 129,
137	pub const SYS_tgkill = 131;	137	tkill = 130,
138	pub const SYS_sigaltstack = 132;	138	tgkill = 131,
139	pub const SYS_rt_sigsuspend = 133;	139	sigaltstack = 132,
140	pub const SYS_rt_sigaction = 134;	140	rt_sigsuspend = 133,
141	pub const SYS_rt_sigprocmask = 135;	141	rt_sigaction = 134,
142	pub const SYS_rt_sigpending = 136;	142	rt_sigprocmask = 135,
143	pub const SYS_rt_sigtimedwait = 137;	143	rt_sigpending = 136,
144	pub const SYS_rt_sigqueueinfo = 138;	144	rt_sigtimedwait = 137,
145	pub const SYS_rt_sigreturn = 139;	145	rt_sigqueueinfo = 138,
146	pub const SYS_setpriority = 140;	146	rt_sigreturn = 139,
147	pub const SYS_getpriority = 141;	147	setpriority = 140,
148	pub const SYS_reboot = 142;	148	getpriority = 141,
149	pub const SYS_setregid = 143;	149	reboot = 142,
150	pub const SYS_setgid = 144;	150	setregid = 143,
151	pub const SYS_setreuid = 145;	151	setgid = 144,
152	pub const SYS_setuid = 146;	152	setreuid = 145,
153	pub const SYS_setresuid = 147;	153	setuid = 146,
154	pub const SYS_getresuid = 148;	154	setresuid = 147,
155	pub const SYS_setresgid = 149;	155	getresuid = 148,
156	pub const SYS_getresgid = 150;	156	setresgid = 149,
157	pub const SYS_setfsuid = 151;	157	getresgid = 150,
158	pub const SYS_setfsgid = 152;	158	setfsuid = 151,
159	pub const SYS_times = 153;	159	setfsgid = 152,
160	pub const SYS_setpgid = 154;	160	times = 153,
161	pub const SYS_getpgid = 155;	161	setpgid = 154,
162	pub const SYS_getsid = 156;	162	getpgid = 155,
163	pub const SYS_setsid = 157;	163	getsid = 156,
164	pub const SYS_getgroups = 158;	164	setsid = 157,
165	pub const SYS_setgroups = 159;	165	getgroups = 158,
166	pub const SYS_uname = 160;	166	setgroups = 159,
167	pub const SYS_sethostname = 161;	167	uname = 160,
168	pub const SYS_setdomainname = 162;	168	sethostname = 161,
169	pub const SYS_getrlimit = 163;	169	setdomainname = 162,
170	pub const SYS_setrlimit = 164;	170	getrlimit = 163,
171	pub const SYS_getrusage = 165;	171	setrlimit = 164,
172	pub const SYS_umask = 166;	172	getrusage = 165,
173	pub const SYS_prctl = 167;	173	umask = 166,
174	pub const SYS_getcpu = 168;	174	prctl = 167,
175	pub const SYS_gettimeofday = 169;	175	getcpu = 168,
176	pub const SYS_settimeofday = 170;	176	gettimeofday = 169,
177	pub const SYS_adjtimex = 171;	177	settimeofday = 170,
178	pub const SYS_getpid = 172;	178	adjtimex = 171,
179	pub const SYS_getppid = 173;	179	getpid = 172,
180	pub const SYS_getuid = 174;	180	getppid = 173,
181	pub const SYS_geteuid = 175;	181	getuid = 174,
182	pub const SYS_getgid = 176;	182	geteuid = 175,
183	pub const SYS_getegid = 177;	183	getgid = 176,
184	pub const SYS_gettid = 178;	184	getegid = 177,
185	pub const SYS_sysinfo = 179;	185	gettid = 178,
186	pub const SYS_mq_open = 180;	186	sysinfo = 179,
187	pub const SYS_mq_unlink = 181;	187	mq_open = 180,
188	pub const SYS_mq_timedsend = 182;	188	mq_unlink = 181,
189	pub const SYS_mq_timedreceive = 183;	189	mq_timedsend = 182,
190	pub const SYS_mq_notify = 184;	190	mq_timedreceive = 183,
191	pub const SYS_mq_getsetattr = 185;	191	mq_notify = 184,
192	pub const SYS_msgget = 186;	192	mq_getsetattr = 185,
193	pub const SYS_msgctl = 187;	193	msgget = 186,
194	pub const SYS_msgrcv = 188;	194	msgctl = 187,
195	pub const SYS_msgsnd = 189;	195	msgrcv = 188,
196	pub const SYS_semget = 190;	196	msgsnd = 189,
197	pub const SYS_semctl = 191;	197	semget = 190,
198	pub const SYS_semtimedop = 192;	198	semctl = 191,
199	pub const SYS_semop = 193;	199	semtimedop = 192,
200	pub const SYS_shmget = 194;	200	semop = 193,
201	pub const SYS_shmctl = 195;	201	shmget = 194,
202	pub const SYS_shmat = 196;	202	shmctl = 195,
203	pub const SYS_shmdt = 197;	203	shmat = 196,
204	pub const SYS_socket = 198;	204	shmdt = 197,
205	pub const SYS_socketpair = 199;	205	socket = 198,
206	pub const SYS_bind = 200;	206	socketpair = 199,
207	pub const SYS_listen = 201;	207	bind = 200,
208	pub const SYS_accept = 202;	208	listen = 201,
209	pub const SYS_connect = 203;	209	accept = 202,
210	pub const SYS_getsockname = 204;	210	connect = 203,
211	pub const SYS_getpeername = 205;	211	getsockname = 204,
212	pub const SYS_sendto = 206;	212	getpeername = 205,
213	pub const SYS_recvfrom = 207;	213	sendto = 206,
214	pub const SYS_setsockopt = 208;	214	recvfrom = 207,
215	pub const SYS_getsockopt = 209;	215	setsockopt = 208,
216	pub const SYS_shutdown = 210;	216	getsockopt = 209,
217	pub const SYS_sendmsg = 211;	217	shutdown = 210,
218	pub const SYS_recvmsg = 212;	218	sendmsg = 211,
219	pub const SYS_readahead = 213;	219	recvmsg = 212,
220	pub const SYS_brk = 214;	220	readahead = 213,
221	pub const SYS_munmap = 215;	221	brk = 214,
222	pub const SYS_mremap = 216;	222	munmap = 215,
223	pub const SYS_add_key = 217;	223	mremap = 216,
224	pub const SYS_request_key = 218;	224	add_key = 217,
225	pub const SYS_keyctl = 219;	225	request_key = 218,
226	pub const SYS_clone = 220;	226	keyctl = 219,
227	pub const SYS_execve = 221;	227	clone = 220,
228	pub const SYS_mmap = 222;	228	execve = 221,
229	pub const SYS_fadvise64 = 223;	229	mmap = 222,
230	pub const SYS_swapon = 224;	230	fadvise64 = 223,
231	pub const SYS_swapoff = 225;	231	swapon = 224,
232	pub const SYS_mprotect = 226;	232	swapoff = 225,
233	pub const SYS_msync = 227;	233	mprotect = 226,
234	pub const SYS_mlock = 228;	234	msync = 227,
235	pub const SYS_munlock = 229;	235	mlock = 228,
236	pub const SYS_mlockall = 230;	236	munlock = 229,
237	pub const SYS_munlockall = 231;	237	mlockall = 230,
238	pub const SYS_mincore = 232;	238	munlockall = 231,
239	pub const SYS_madvise = 233;	239	mincore = 232,
240	pub const SYS_remap_file_pages = 234;	240	madvise = 233,
241	pub const SYS_mbind = 235;	241	remap_file_pages = 234,
242	pub const SYS_get_mempolicy = 236;	242	mbind = 235,
243	pub const SYS_set_mempolicy = 237;	243	get_mempolicy = 236,
244	pub const SYS_migrate_pages = 238;	244	set_mempolicy = 237,
245	pub const SYS_move_pages = 239;	245	migrate_pages = 238,
246	pub const SYS_rt_tgsigqueueinfo = 240;	246	move_pages = 239,
247	pub const SYS_perf_event_open = 241;	247	rt_tgsigqueueinfo = 240,
248	pub const SYS_accept4 = 242;	248	perf_event_open = 241,
249	pub const SYS_recvmmsg = 243;	249	accept4 = 242,
		250	recvmmsg = 243,
250		251
251	pub const SYS_arch_specific_syscall = 244;	252	pub const arch_specific_syscall = 244;
252	pub const SYS_riscv_flush_icache = SYS_arch_specific_syscall + 15;	253	riscv_flush_icache = arch_specific_syscall + 15,
253		254
254	pub const SYS_wait4 = 260;	255	wait4 = 260,
255	pub const SYS_prlimit64 = 261;	256	prlimit64 = 261,
256	pub const SYS_fanotify_init = 262;	257	fanotify_init = 262,
257	pub const SYS_fanotify_mark = 263;	258	fanotify_mark = 263,
258	pub const SYS_name_to_handle_at = 264;	259	name_to_handle_at = 264,
259	pub const SYS_open_by_handle_at = 265;	260	open_by_handle_at = 265,
260	pub const SYS_clock_adjtime = 266;	261	clock_adjtime = 266,
261	pub const SYS_syncfs = 267;	262	syncfs = 267,
262	pub const SYS_setns = 268;	263	setns = 268,
263	pub const SYS_sendmmsg = 269;	264	sendmmsg = 269,
264	pub const SYS_process_vm_readv = 270;	265	process_vm_readv = 270,
265	pub const SYS_process_vm_writev = 271;	266	process_vm_writev = 271,
266	pub const SYS_kcmp = 272;	267	kcmp = 272,
267	pub const SYS_finit_module = 273;	268	finit_module = 273,
268	pub const SYS_sched_setattr = 274;	269	sched_setattr = 274,
269	pub const SYS_sched_getattr = 275;	270	sched_getattr = 275,
270	pub const SYS_renameat2 = 276;	271	renameat2 = 276,
271	pub const SYS_seccomp = 277;	272	seccomp = 277,
272	pub const SYS_getrandom = 278;	273	getrandom = 278,
273	pub const SYS_memfd_create = 279;	274	memfd_create = 279,
274	pub const SYS_bpf = 280;	275	bpf = 280,
275	pub const SYS_execveat = 281;	276	execveat = 281,
276	pub const SYS_userfaultfd = 282;	277	userfaultfd = 282,
277	pub const SYS_membarrier = 283;	278	membarrier = 283,
278	pub const SYS_mlock2 = 284;	279	mlock2 = 284,
279	pub const SYS_copy_file_range = 285;	280	copy_file_range = 285,
280	pub const SYS_preadv2 = 286;	281	preadv2 = 286,
281	pub const SYS_pwritev2 = 287;	282	pwritev2 = 287,
282	pub const SYS_pkey_mprotect = 288;	283	pkey_mprotect = 288,
283	pub const SYS_pkey_alloc = 289;	284	pkey_alloc = 289,
284	pub const SYS_pkey_free = 290;	285	pkey_free = 290,
285	pub const SYS_statx = 291;	286	statx = 291,
286	pub const SYS_io_pgetevents = 292;	287	io_pgetevents = 292,
287	pub const SYS_rseq = 293;	288	rseq = 293,
288	pub const SYS_kexec_file_load = 294;	289	kexec_file_load = 294,
289	pub const SYS_pidfd_send_signal = 424;	290	pidfd_send_signal = 424,
290	pub const SYS_io_uring_setup = 425;	291	io_uring_setup = 425,
291	pub const SYS_io_uring_enter = 426;	292	io_uring_enter = 426,
292	pub const SYS_io_uring_register = 427;	293	io_uring_register = 427,
293	pub const SYS_open_tree = 428;	294	open_tree = 428,
294	pub const SYS_move_mount = 429;	295	move_mount = 429,
295	pub const SYS_fsopen = 430;	296	fsopen = 430,
296	pub const SYS_fsconfig = 431;	297	fsconfig = 431,
297	pub const SYS_fsmount = 432;	298	fsmount = 432,
298	pub const SYS_fspick = 433;	299	fspick = 433,
299	pub const SYS_pidfd_open = 434;	300	pidfd_open = 434,
300	pub const SYS_clone3 = 435;	301	clone3 = 435,
		302	openat2 = 437,
		303	pidfd_getfd = 438,
		304
		305	_,
		306	};
301		307
302	pub const O_CREAT = 0o100;	308	pub const O_CREAT = 0o100;
303	pub const O_EXCL = 0o200;	309	pub const O_EXCL = 0o200;

lib/std/os/bits/linux/x86_64.zig+354-348

...	@@ -14,354 +14,360 @@ const iovec_const = linux.iovec_const;	...	@@ -14,354 +14,360 @@ const iovec_const = linux.iovec_const;
14		14
15	pub const mode_t = usize;	15	pub const mode_t = usize;
16		16
17	pub const SYS_read = 0;	17	pub const SYS = extern enum(usize) {
18	pub const SYS_write = 1;	18	read = 0,
19	pub const SYS_open = 2;	19	write = 1,
20	pub const SYS_close = 3;	20	open = 2,
21	pub const SYS_stat = 4;	21	close = 3,
22	pub const SYS_fstat = 5;	22	stat = 4,
23	pub const SYS_lstat = 6;	23	fstat = 5,
24	pub const SYS_poll = 7;	24	lstat = 6,
25	pub const SYS_lseek = 8;	25	poll = 7,
26	pub const SYS_mmap = 9;	26	lseek = 8,
27	pub const SYS_mprotect = 10;	27	mmap = 9,
28	pub const SYS_munmap = 11;	28	mprotect = 10,
29	pub const SYS_brk = 12;	29	munmap = 11,
30	pub const SYS_rt_sigaction = 13;	30	brk = 12,
31	pub const SYS_rt_sigprocmask = 14;	31	rt_sigaction = 13,
32	pub const SYS_rt_sigreturn = 15;	32	rt_sigprocmask = 14,
33	pub const SYS_ioctl = 16;	33	rt_sigreturn = 15,
34	pub const SYS_pread = 17;	34	ioctl = 16,
35	pub const SYS_pwrite = 18;	35	pread = 17,
36	pub const SYS_readv = 19;	36	pwrite = 18,
37	pub const SYS_writev = 20;	37	readv = 19,
38	pub const SYS_access = 21;	38	writev = 20,
39	pub const SYS_pipe = 22;	39	access = 21,
40	pub const SYS_select = 23;	40	pipe = 22,
41	pub const SYS_sched_yield = 24;	41	select = 23,
42	pub const SYS_mremap = 25;	42	sched_yield = 24,
43	pub const SYS_msync = 26;	43	mremap = 25,
44	pub const SYS_mincore = 27;	44	msync = 26,
45	pub const SYS_madvise = 28;	45	mincore = 27,
46	pub const SYS_shmget = 29;	46	madvise = 28,
47	pub const SYS_shmat = 30;	47	shmget = 29,
48	pub const SYS_shmctl = 31;	48	shmat = 30,
49	pub const SYS_dup = 32;	49	shmctl = 31,
50	pub const SYS_dup2 = 33;	50	dup = 32,
51	pub const SYS_pause = 34;	51	dup2 = 33,
52	pub const SYS_nanosleep = 35;	52	pause = 34,
53	pub const SYS_getitimer = 36;	53	nanosleep = 35,
54	pub const SYS_alarm = 37;	54	getitimer = 36,
55	pub const SYS_setitimer = 38;	55	alarm = 37,
56	pub const SYS_getpid = 39;	56	setitimer = 38,
57	pub const SYS_sendfile = 40;	57	getpid = 39,
58	pub const SYS_socket = 41;	58	sendfile = 40,
59	pub const SYS_connect = 42;	59	socket = 41,
60	pub const SYS_accept = 43;	60	connect = 42,
61	pub const SYS_sendto = 44;	61	accept = 43,
62	pub const SYS_recvfrom = 45;	62	sendto = 44,
63	pub const SYS_sendmsg = 46;	63	recvfrom = 45,
64	pub const SYS_recvmsg = 47;	64	sendmsg = 46,
65	pub const SYS_shutdown = 48;	65	recvmsg = 47,
66	pub const SYS_bind = 49;	66	shutdown = 48,
67	pub const SYS_listen = 50;	67	bind = 49,
68	pub const SYS_getsockname = 51;	68	listen = 50,
69	pub const SYS_getpeername = 52;	69	getsockname = 51,
70	pub const SYS_socketpair = 53;	70	getpeername = 52,
71	pub const SYS_setsockopt = 54;	71	socketpair = 53,
72	pub const SYS_getsockopt = 55;	72	setsockopt = 54,
73	pub const SYS_clone = 56;	73	getsockopt = 55,
74	pub const SYS_fork = 57;	74	clone = 56,
75	pub const SYS_vfork = 58;	75	fork = 57,
76	pub const SYS_execve = 59;	76	vfork = 58,
77	pub const SYS_exit = 60;	77	execve = 59,
78	pub const SYS_wait4 = 61;	78	exit = 60,
79	pub const SYS_kill = 62;	79	wait4 = 61,
80	pub const SYS_uname = 63;	80	kill = 62,
81	pub const SYS_semget = 64;	81	uname = 63,
82	pub const SYS_semop = 65;	82	semget = 64,
83	pub const SYS_semctl = 66;	83	semop = 65,
84	pub const SYS_shmdt = 67;	84	semctl = 66,
85	pub const SYS_msgget = 68;	85	shmdt = 67,
86	pub const SYS_msgsnd = 69;	86	msgget = 68,
87	pub const SYS_msgrcv = 70;	87	msgsnd = 69,
88	pub const SYS_msgctl = 71;	88	msgrcv = 70,
89	pub const SYS_fcntl = 72;	89	msgctl = 71,
90	pub const SYS_flock = 73;	90	fcntl = 72,
91	pub const SYS_fsync = 74;	91	flock = 73,
92	pub const SYS_fdatasync = 75;	92	fsync = 74,
93	pub const SYS_truncate = 76;	93	fdatasync = 75,
94	pub const SYS_ftruncate = 77;	94	truncate = 76,
95	pub const SYS_getdents = 78;	95	ftruncate = 77,
96	pub const SYS_getcwd = 79;	96	getdents = 78,
97	pub const SYS_chdir = 80;	97	getcwd = 79,
98	pub const SYS_fchdir = 81;	98	chdir = 80,
99	pub const SYS_rename = 82;	99	fchdir = 81,
100	pub const SYS_mkdir = 83;	100	rename = 82,
101	pub const SYS_rmdir = 84;	101	mkdir = 83,
102	pub const SYS_creat = 85;	102	rmdir = 84,
103	pub const SYS_link = 86;	103	creat = 85,
104	pub const SYS_unlink = 87;	104	link = 86,
105	pub const SYS_symlink = 88;	105	unlink = 87,
106	pub const SYS_readlink = 89;	106	symlink = 88,
107	pub const SYS_chmod = 90;	107	readlink = 89,
108	pub const SYS_fchmod = 91;	108	chmod = 90,
109	pub const SYS_chown = 92;	109	fchmod = 91,
110	pub const SYS_fchown = 93;	110	chown = 92,
111	pub const SYS_lchown = 94;	111	fchown = 93,
112	pub const SYS_umask = 95;	112	lchown = 94,
113	pub const SYS_gettimeofday = 96;	113	umask = 95,
114	pub const SYS_getrlimit = 97;	114	gettimeofday = 96,
115	pub const SYS_getrusage = 98;	115	getrlimit = 97,
116	pub const SYS_sysinfo = 99;	116	getrusage = 98,
117	pub const SYS_times = 100;	117	sysinfo = 99,
118	pub const SYS_ptrace = 101;	118	times = 100,
119	pub const SYS_getuid = 102;	119	ptrace = 101,
120	pub const SYS_syslog = 103;	120	getuid = 102,
121	pub const SYS_getgid = 104;	121	syslog = 103,
122	pub const SYS_setuid = 105;	122	getgid = 104,
123	pub const SYS_setgid = 106;	123	setuid = 105,
124	pub const SYS_geteuid = 107;	124	setgid = 106,
125	pub const SYS_getegid = 108;	125	geteuid = 107,
126	pub const SYS_setpgid = 109;	126	getegid = 108,
127	pub const SYS_getppid = 110;	127	setpgid = 109,
128	pub const SYS_getpgrp = 111;	128	getppid = 110,
129	pub const SYS_setsid = 112;	129	getpgrp = 111,
130	pub const SYS_setreuid = 113;	130	setsid = 112,
131	pub const SYS_setregid = 114;	131	setreuid = 113,
132	pub const SYS_getgroups = 115;	132	setregid = 114,
133	pub const SYS_setgroups = 116;	133	getgroups = 115,
134	pub const SYS_setresuid = 117;	134	setgroups = 116,
135	pub const SYS_getresuid = 118;	135	setresuid = 117,
136	pub const SYS_setresgid = 119;	136	getresuid = 118,
137	pub const SYS_getresgid = 120;	137	setresgid = 119,
138	pub const SYS_getpgid = 121;	138	getresgid = 120,
139	pub const SYS_setfsuid = 122;	139	getpgid = 121,
140	pub const SYS_setfsgid = 123;	140	setfsuid = 122,
141	pub const SYS_getsid = 124;	141	setfsgid = 123,
142	pub const SYS_capget = 125;	142	getsid = 124,
143	pub const SYS_capset = 126;	143	capget = 125,
144	pub const SYS_rt_sigpending = 127;	144	capset = 126,
145	pub const SYS_rt_sigtimedwait = 128;	145	rt_sigpending = 127,
146	pub const SYS_rt_sigqueueinfo = 129;	146	rt_sigtimedwait = 128,
147	pub const SYS_rt_sigsuspend = 130;	147	rt_sigqueueinfo = 129,
148	pub const SYS_sigaltstack = 131;	148	rt_sigsuspend = 130,
149	pub const SYS_utime = 132;	149	sigaltstack = 131,
150	pub const SYS_mknod = 133;	150	utime = 132,
151	pub const SYS_uselib = 134;	151	mknod = 133,
152	pub const SYS_personality = 135;	152	uselib = 134,
153	pub const SYS_ustat = 136;	153	personality = 135,
154	pub const SYS_statfs = 137;	154	ustat = 136,
155	pub const SYS_fstatfs = 138;	155	statfs = 137,
156	pub const SYS_sysfs = 139;	156	fstatfs = 138,
157	pub const SYS_getpriority = 140;	157	sysfs = 139,
158	pub const SYS_setpriority = 141;	158	getpriority = 140,
159	pub const SYS_sched_setparam = 142;	159	setpriority = 141,
160	pub const SYS_sched_getparam = 143;	160	sched_setparam = 142,
161	pub const SYS_sched_setscheduler = 144;	161	sched_getparam = 143,
162	pub const SYS_sched_getscheduler = 145;	162	sched_setscheduler = 144,
163	pub const SYS_sched_get_priority_max = 146;	163	sched_getscheduler = 145,
164	pub const SYS_sched_get_priority_min = 147;	164	sched_get_priority_max = 146,
165	pub const SYS_sched_rr_get_interval = 148;	165	sched_get_priority_min = 147,
166	pub const SYS_mlock = 149;	166	sched_rr_get_interval = 148,
167	pub const SYS_munlock = 150;	167	mlock = 149,
168	pub const SYS_mlockall = 151;	168	munlock = 150,
169	pub const SYS_munlockall = 152;	169	mlockall = 151,
170	pub const SYS_vhangup = 153;	170	munlockall = 152,
171	pub const SYS_modify_ldt = 154;	171	vhangup = 153,
172	pub const SYS_pivot_root = 155;	172	modify_ldt = 154,
173	pub const SYS__sysctl = 156;	173	pivot_root = 155,
174	pub const SYS_prctl = 157;	174	_sysctl = 156,
175	pub const SYS_arch_prctl = 158;	175	prctl = 157,
176	pub const SYS_adjtimex = 159;	176	arch_prctl = 158,
177	pub const SYS_setrlimit = 160;	177	adjtimex = 159,
178	pub const SYS_chroot = 161;	178	setrlimit = 160,
179	pub const SYS_sync = 162;	179	chroot = 161,
180	pub const SYS_acct = 163;	180	sync = 162,
181	pub const SYS_settimeofday = 164;	181	acct = 163,
182	pub const SYS_mount = 165;	182	settimeofday = 164,
183	pub const SYS_umount2 = 166;	183	mount = 165,
184	pub const SYS_swapon = 167;	184	umount2 = 166,
185	pub const SYS_swapoff = 168;	185	swapon = 167,
186	pub const SYS_reboot = 169;	186	swapoff = 168,
187	pub const SYS_sethostname = 170;	187	reboot = 169,
188	pub const SYS_setdomainname = 171;	188	sethostname = 170,
189	pub const SYS_iopl = 172;	189	setdomainname = 171,
190	pub const SYS_ioperm = 173;	190	iopl = 172,
191	pub const SYS_create_module = 174;	191	ioperm = 173,
192	pub const SYS_init_module = 175;	192	create_module = 174,
193	pub const SYS_delete_module = 176;	193	init_module = 175,
194	pub const SYS_get_kernel_syms = 177;	194	delete_module = 176,
195	pub const SYS_query_module = 178;	195	get_kernel_syms = 177,
196	pub const SYS_quotactl = 179;	196	query_module = 178,
197	pub const SYS_nfsservctl = 180;	197	quotactl = 179,
198	pub const SYS_getpmsg = 181;	198	nfsservctl = 180,
199	pub const SYS_putpmsg = 182;	199	getpmsg = 181,
200	pub const SYS_afs_syscall = 183;	200	putpmsg = 182,
201	pub const SYS_tuxcall = 184;	201	afs_syscall = 183,
202	pub const SYS_security = 185;	202	tuxcall = 184,
203	pub const SYS_gettid = 186;	203	security = 185,
204	pub const SYS_readahead = 187;	204	gettid = 186,
205	pub const SYS_setxattr = 188;	205	readahead = 187,
206	pub const SYS_lsetxattr = 189;	206	setxattr = 188,
207	pub const SYS_fsetxattr = 190;	207	lsetxattr = 189,
208	pub const SYS_getxattr = 191;	208	fsetxattr = 190,
209	pub const SYS_lgetxattr = 192;	209	getxattr = 191,
210	pub const SYS_fgetxattr = 193;	210	lgetxattr = 192,
211	pub const SYS_listxattr = 194;	211	fgetxattr = 193,
212	pub const SYS_llistxattr = 195;	212	listxattr = 194,
213	pub const SYS_flistxattr = 196;	213	llistxattr = 195,
214	pub const SYS_removexattr = 197;	214	flistxattr = 196,
215	pub const SYS_lremovexattr = 198;	215	removexattr = 197,
216	pub const SYS_fremovexattr = 199;	216	lremovexattr = 198,
217	pub const SYS_tkill = 200;	217	fremovexattr = 199,
218	pub const SYS_time = 201;	218	tkill = 200,
219	pub const SYS_futex = 202;	219	time = 201,
220	pub const SYS_sched_setaffinity = 203;	220	futex = 202,
221	pub const SYS_sched_getaffinity = 204;	221	sched_setaffinity = 203,
222	pub const SYS_set_thread_area = 205;	222	sched_getaffinity = 204,
223	pub const SYS_io_setup = 206;	223	set_thread_area = 205,
224	pub const SYS_io_destroy = 207;	224	io_setup = 206,
225	pub const SYS_io_getevents = 208;	225	io_destroy = 207,
226	pub const SYS_io_submit = 209;	226	io_getevents = 208,
227	pub const SYS_io_cancel = 210;	227	io_submit = 209,
228	pub const SYS_get_thread_area = 211;	228	io_cancel = 210,
229	pub const SYS_lookup_dcookie = 212;	229	get_thread_area = 211,
230	pub const SYS_epoll_create = 213;	230	lookup_dcookie = 212,
231	pub const SYS_epoll_ctl_old = 214;	231	epoll_create = 213,
232	pub const SYS_epoll_wait_old = 215;	232	epoll_ctl_old = 214,
233	pub const SYS_remap_file_pages = 216;	233	epoll_wait_old = 215,
234	pub const SYS_getdents64 = 217;	234	remap_file_pages = 216,
235	pub const SYS_set_tid_address = 218;	235	getdents64 = 217,
236	pub const SYS_restart_syscall = 219;	236	set_tid_address = 218,
237	pub const SYS_semtimedop = 220;	237	restart_syscall = 219,
238	pub const SYS_fadvise64 = 221;	238	semtimedop = 220,
239	pub const SYS_timer_create = 222;	239	fadvise64 = 221,
240	pub const SYS_timer_settime = 223;	240	timer_create = 222,
241	pub const SYS_timer_gettime = 224;	241	timer_settime = 223,
242	pub const SYS_timer_getoverrun = 225;	242	timer_gettime = 224,
243	pub const SYS_timer_delete = 226;	243	timer_getoverrun = 225,
244	pub const SYS_clock_settime = 227;	244	timer_delete = 226,
245	pub const SYS_clock_gettime = 228;	245	clock_settime = 227,
246	pub const SYS_clock_getres = 229;	246	clock_gettime = 228,
247	pub const SYS_clock_nanosleep = 230;	247	clock_getres = 229,
248	pub const SYS_exit_group = 231;	248	clock_nanosleep = 230,
249	pub const SYS_epoll_wait = 232;	249	exit_group = 231,
250	pub const SYS_epoll_ctl = 233;	250	epoll_wait = 232,
251	pub const SYS_tgkill = 234;	251	epoll_ctl = 233,
252	pub const SYS_utimes = 235;	252	tgkill = 234,
253	pub const SYS_vserver = 236;	253	utimes = 235,
254	pub const SYS_mbind = 237;	254	vserver = 236,
255	pub const SYS_set_mempolicy = 238;	255	mbind = 237,
256	pub const SYS_get_mempolicy = 239;	256	set_mempolicy = 238,
257	pub const SYS_mq_open = 240;	257	get_mempolicy = 239,
258	pub const SYS_mq_unlink = 241;	258	mq_open = 240,
259	pub const SYS_mq_timedsend = 242;	259	mq_unlink = 241,
260	pub const SYS_mq_timedreceive = 243;	260	mq_timedsend = 242,
261	pub const SYS_mq_notify = 244;	261	mq_timedreceive = 243,
262	pub const SYS_mq_getsetattr = 245;	262	mq_notify = 244,
263	pub const SYS_kexec_load = 246;	263	mq_getsetattr = 245,
264	pub const SYS_waitid = 247;	264	kexec_load = 246,
265	pub const SYS_add_key = 248;	265	waitid = 247,
266	pub const SYS_request_key = 249;	266	add_key = 248,
267	pub const SYS_keyctl = 250;	267	request_key = 249,
268	pub const SYS_ioprio_set = 251;	268	keyctl = 250,
269	pub const SYS_ioprio_get = 252;	269	ioprio_set = 251,
270	pub const SYS_inotify_init = 253;	270	ioprio_get = 252,
271	pub const SYS_inotify_add_watch = 254;	271	inotify_init = 253,
272	pub const SYS_inotify_rm_watch = 255;	272	inotify_add_watch = 254,
273	pub const SYS_migrate_pages = 256;	273	inotify_rm_watch = 255,
274	pub const SYS_openat = 257;	274	migrate_pages = 256,
275	pub const SYS_mkdirat = 258;	275	openat = 257,
276	pub const SYS_mknodat = 259;	276	mkdirat = 258,
277	pub const SYS_fchownat = 260;	277	mknodat = 259,
278	pub const SYS_futimesat = 261;	278	fchownat = 260,
279	pub const SYS_newfstatat = 262;	279	futimesat = 261,
280	pub const SYS_fstatat = 262;	280	newfstatat = 262,
281	pub const SYS_unlinkat = 263;	281	fstatat = 262,
282	pub const SYS_renameat = 264;	282	unlinkat = 263,
283	pub const SYS_linkat = 265;	283	renameat = 264,
284	pub const SYS_symlinkat = 266;	284	linkat = 265,
285	pub const SYS_readlinkat = 267;	285	symlinkat = 266,
286	pub const SYS_fchmodat = 268;	286	readlinkat = 267,
287	pub const SYS_faccessat = 269;	287	fchmodat = 268,
288	pub const SYS_pselect6 = 270;	288	faccessat = 269,
289	pub const SYS_ppoll = 271;	289	pselect6 = 270,
290	pub const SYS_unshare = 272;	290	ppoll = 271,
291	pub const SYS_set_robust_list = 273;	291	unshare = 272,
292	pub const SYS_get_robust_list = 274;	292	set_robust_list = 273,
293	pub const SYS_splice = 275;	293	get_robust_list = 274,
294	pub const SYS_tee = 276;	294	splice = 275,
295	pub const SYS_sync_file_range = 277;	295	tee = 276,
296	pub const SYS_vmsplice = 278;	296	sync_file_range = 277,
297	pub const SYS_move_pages = 279;	297	vmsplice = 278,
298	pub const SYS_utimensat = 280;	298	move_pages = 279,
299	pub const SYS_epoll_pwait = 281;	299	utimensat = 280,
300	pub const SYS_signalfd = 282;	300	epoll_pwait = 281,
301	pub const SYS_timerfd_create = 283;	301	signalfd = 282,
302	pub const SYS_eventfd = 284;	302	timerfd_create = 283,
303	pub const SYS_fallocate = 285;	303	eventfd = 284,
304	pub const SYS_timerfd_settime = 286;	304	fallocate = 285,
305	pub const SYS_timerfd_gettime = 287;	305	timerfd_settime = 286,
306	pub const SYS_accept4 = 288;	306	timerfd_gettime = 287,
307	pub const SYS_signalfd4 = 289;	307	accept4 = 288,
308	pub const SYS_eventfd2 = 290;	308	signalfd4 = 289,
309	pub const SYS_epoll_create1 = 291;	309	eventfd2 = 290,
310	pub const SYS_dup3 = 292;	310	epoll_create1 = 291,
311	pub const SYS_pipe2 = 293;	311	dup3 = 292,
312	pub const SYS_inotify_init1 = 294;	312	pipe2 = 293,
313	pub const SYS_preadv = 295;	313	inotify_init1 = 294,
314	pub const SYS_pwritev = 296;	314	preadv = 295,
315	pub const SYS_rt_tgsigqueueinfo = 297;	315	pwritev = 296,
316	pub const SYS_perf_event_open = 298;	316	rt_tgsigqueueinfo = 297,
317	pub const SYS_recvmmsg = 299;	317	perf_event_open = 298,
318	pub const SYS_fanotify_init = 300;	318	recvmmsg = 299,
319	pub const SYS_fanotify_mark = 301;	319	fanotify_init = 300,
320	pub const SYS_prlimit64 = 302;	320	fanotify_mark = 301,
321	pub const SYS_name_to_handle_at = 303;	321	prlimit64 = 302,
322	pub const SYS_open_by_handle_at = 304;	322	name_to_handle_at = 303,
323	pub const SYS_clock_adjtime = 305;	323	open_by_handle_at = 304,
324	pub const SYS_syncfs = 306;	324	clock_adjtime = 305,
325	pub const SYS_sendmmsg = 307;	325	syncfs = 306,
326	pub const SYS_setns = 308;	326	sendmmsg = 307,
327	pub const SYS_getcpu = 309;	327	setns = 308,
328	pub const SYS_process_vm_readv = 310;	328	getcpu = 309,
329	pub const SYS_process_vm_writev = 311;	329	process_vm_readv = 310,
330	pub const SYS_kcmp = 312;	330	process_vm_writev = 311,
331	pub const SYS_finit_module = 313;	331	kcmp = 312,
332	pub const SYS_sched_setattr = 314;	332	finit_module = 313,
333	pub const SYS_sched_getattr = 315;	333	sched_setattr = 314,
334	pub const SYS_renameat2 = 316;	334	sched_getattr = 315,
335	pub const SYS_seccomp = 317;	335	renameat2 = 316,
336	pub const SYS_getrandom = 318;	336	seccomp = 317,
337	pub const SYS_memfd_create = 319;	337	getrandom = 318,
338	pub const SYS_kexec_file_load = 320;	338	memfd_create = 319,
339	pub const SYS_bpf = 321;	339	kexec_file_load = 320,
340	pub const SYS_execveat = 322;	340	bpf = 321,
341	pub const SYS_userfaultfd = 323;	341	execveat = 322,
342	pub const SYS_membarrier = 324;	342	userfaultfd = 323,
343	pub const SYS_mlock2 = 325;	343	membarrier = 324,
344	pub const SYS_copy_file_range = 326;	344	mlock2 = 325,
345	pub const SYS_preadv2 = 327;	345	copy_file_range = 326,
346	pub const SYS_pwritev2 = 328;	346	preadv2 = 327,
347	pub const SYS_pkey_mprotect = 329;	347	pwritev2 = 328,
348	pub const SYS_pkey_alloc = 330;	348	pkey_mprotect = 329,
349	pub const SYS_pkey_free = 331;	349	pkey_alloc = 330,
350	pub const SYS_statx = 332;	350	pkey_free = 331,
351	pub const SYS_io_pgetevents = 333;	351	statx = 332,
352	pub const SYS_rseq = 334;	352	io_pgetevents = 333,
353	pub const SYS_pidfd_send_signal = 424;	353	rseq = 334,
354	pub const SYS_io_uring_setup = 425;	354	pidfd_send_signal = 424,
355	pub const SYS_io_uring_enter = 426;	355	io_uring_setup = 425,
356	pub const SYS_io_uring_register = 427;	356	io_uring_enter = 426,
357	pub const SYS_open_tree = 428;	357	io_uring_register = 427,
358	pub const SYS_move_mount = 429;	358	open_tree = 428,
359	pub const SYS_fsopen = 430;	359	move_mount = 429,
360	pub const SYS_fsconfig = 431;	360	fsopen = 430,
361	pub const SYS_fsmount = 432;	361	fsconfig = 431,
362	pub const SYS_fspick = 433;	362	fsmount = 432,
363	pub const SYS_pidfd_open = 434;	363	fspick = 433,
364	pub const SYS_clone3 = 435;	364	pidfd_open = 434,
		365	clone3 = 435,
		366	openat2 = 437,
		367	pidfd_getfd = 438,
		368
		369	_,
		370	};
365		371
366	pub const O_CREAT = 0o100;	372	pub const O_CREAT = 0o100;
367	pub const O_EXCL = 0o200;	373	pub const O_EXCL = 0o200;

lib/std/os/bits/netbsd.zig+114-26

...	@@ -1,12 +1,22 @@	...	@@ -1,12 +1,22 @@
1	const std = @import("../../std.zig");	1	const std = @import("../../std.zig");
		2	const builtin = std.builtin;
2	const maxInt = std.math.maxInt;	3	const maxInt = std.math.maxInt;
3		4
		5	pub const blkcnt_t = i64;
		6	pub const blksize_t = i32;
		7	pub const clock_t = u32;
		8	pub const dev_t = u64;
4	pub const fd_t = i32;	9	pub const fd_t = i32;
5	pub const pid_t = i32;	10	pub const gid_t = u32;
6	pub const mode_t = u32;
7	pub const ino_t = u64;	11	pub const ino_t = u64;
		12	pub const mode_t = u32;
		13	pub const nlink_t = u32;
8	pub const off_t = i64;	14	pub const off_t = i64;
		15	pub const pid_t = i32;
9	pub const socklen_t = u32;	16	pub const socklen_t = u32;
		17	pub const time_t = i64;
		18	pub const uid_t = u32;
		19	pub const lwpid_t = i32;
10		20
11	/// Renamed from `kevent` to `Kevent` to avoid conflict with function name.	21	/// Renamed from `kevent` to `Kevent` to avoid conflict with function name.
12	pub const Kevent = extern struct {	22	pub const Kevent = extern struct {
...	@@ -145,23 +155,20 @@ pub const msghdr_const = extern struct {	...	@@ -145,23 +155,20 @@ pub const msghdr_const = extern struct {
145	/// in C, macros are used to hide the differences. Here we use	155	/// in C, macros are used to hide the differences. Here we use
146	/// methods to accomplish this.	156	/// methods to accomplish this.
147	pub const Stat = extern struct {	157	pub const Stat = extern struct {
148	dev: u64,	158	dev: dev_t,
149	mode: u32,	159	mode: mode_t,
150	ino: ino_t,	160	ino: ino_t,
151	nlink: usize,	161	nlink: nlink_t,
152		162	uid: uid_t,
153	uid: u32,	163	gid: gid_t,
154	gid: u32,	164	rdev: dev_t,
155	rdev: u64,
156
157	atim: timespec,	165	atim: timespec,
158	mtim: timespec,	166	mtim: timespec,
159	ctim: timespec,	167	ctim: timespec,
160	birthtim: timespec,	168	birthtim: timespec,
161
162	size: off_t,	169	size: off_t,
163	blocks: i64,	170	blocks: blkcnt_t,
164	blksize: isize,	171	blksize: blksize_t,
165	flags: u32,	172	flags: u32,
166	gen: u32,	173	gen: u32,
167	__spare: [2]u32,	174	__spare: [2]u32,
...	@@ -184,12 +191,14 @@ pub const timespec = extern struct {	...	@@ -184,12 +191,14 @@ pub const timespec = extern struct {
184	tv_nsec: isize,	191	tv_nsec: isize,
185	};	192	};
186		193
		194	pub const MAXNAMLEN = 511;
		195
187	pub const dirent = extern struct {	196	pub const dirent = extern struct {
188	d_fileno: u64,	197	d_fileno: ino_t,
189	d_reclen: u16,	198	d_reclen: u16,
190	d_namlen: u16,	199	d_namlen: u16,
191	d_type: u8,	200	d_type: u8,
192	d_name: [512]u8,	201	d_name: [MAXNAMLEN:0]u8,
193		202
194	pub fn reclen(self: dirent) u16 {	203	pub fn reclen(self: dirent) u16 {
195	return self.d_reclen;	204	return self.d_reclen;
...	@@ -697,23 +706,74 @@ pub const winsize = extern struct {	...	@@ -697,23 +706,74 @@ pub const winsize = extern struct {
697		706
698	const NSIG = 32;	707	const NSIG = 32;
699		708
700	pub const SIG_ERR = @intToPtr(extern fn (i32) void, maxInt(usize));	709	pub const SIG_ERR = @intToPtr(?Sigaction.sigaction_fn, maxInt(usize));
701	pub const SIG_DFL = @intToPtr(extern fn (i32) void, 0);	710	pub const SIG_DFL = @intToPtr(?Sigaction.sigaction_fn, 0);
702	pub const SIG_IGN = @intToPtr(extern fn (i32) void, 1);	711	pub const SIG_IGN = @intToPtr(?Sigaction.sigaction_fn, 1);
703		712
704	/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.	713	/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
705	pub const Sigaction = extern struct {	714	pub const Sigaction = extern struct {
		715	pub const sigaction_fn = fn (i32, siginfo_t, ?c_void) callconv(.C) void;
706	/// signal handler	716	/// signal handler
707	__sigaction_u: extern union {	717	sigaction: ?sigaction_fn,
708	__sa_handler: extern fn (i32) void,	718	/// signal mask to apply
709	__sa_sigaction: extern fn (i32, *__siginfo, usize) void,	719	mask: sigset_t,
710	},	720	/// signal options
		721	flags: u32,
		722	};
711		723
712	/// see signal options	724	pub const sigval_t = extern union {
713	sa_flags: u32,	725	int: i32,
		726	ptr: ?*c_void,
		727	};
714		728
715	/// signal mask to apply	729	pub const siginfo_t = extern union {
716	sa_mask: sigset_t,	730	pad: [128]u8,
		731	info: _ksiginfo,
		732	};
		733
		734	pub const _ksiginfo = extern struct {
		735	signo: i32,
		736	code: i32,
		737	errno: i32,
		738	// 64bit architectures insert 4bytes of padding here, this is done by
		739	// correctly aligning the reason field
		740	reason: extern union {
		741	rt: extern struct {
		742	pid: pid_t,
		743	uid: uid_t,
		744	value: sigval_t,
		745	},
		746	child: extern struct {
		747	pid: pid_t,
		748	uid: uid_t,
		749	status: i32,
		750	utime: clock_t,
		751	stime: clock_t,
		752	},
		753	fault: extern struct {
		754	addr: ?*c_void,
		755	trap: i32,
		756	trap2: i32,
		757	trap3: i32,
		758	},
		759	poll: extern struct {
		760	band: i32,
		761	fd: i32,
		762	},
		763	syscall: extern struct {
		764	sysnum: i32,
		765	retval: [2]i32,
		766	@"error": i32,
		767	args: [8]u64,
		768	},
		769	ptrace_state: extern struct {
		770	pe_report_event: i32,
		771	option: extern union {
		772	pe_other_pid: pid_t,
		773	pe_lwp: lwpid_t,
		774	},
		775	},
		776	} align(@sizeOf(usize)),
717	};	777	};
718		778
719	pub const _SIG_WORDS = 4;	779	pub const _SIG_WORDS = 4;
...	@@ -736,6 +796,34 @@ pub const sigset_t = extern struct {	...	@@ -736,6 +796,34 @@ pub const sigset_t = extern struct {
736	__bits: [_SIG_WORDS]u32,	796	__bits: [_SIG_WORDS]u32,
737	};	797	};
738		798
		799	pub const empty_sigset = sigset_t{ .__bits = [_]u32{0} ** _SIG_WORDS };
		800
		801	// XXX x86_64 specific
		802	pub const mcontext_t = extern struct {
		803	gregs: [26]u64,
		804	mc_tlsbase: u64,
		805	fpregs: [512]u8 align(8),
		806	};
		807
		808	pub const REG_RBP = 12;
		809	pub const REG_RIP = 21;
		810	pub const REG_RSP = 24;
		811
		812	pub const ucontext_t = extern struct {
		813	flags: u32,
		814	link: ?*ucontext_t,
		815	sigmask: sigset_t,
		816	stack: stack_t,
		817	mcontext: mcontext_t,
		818	__pad: [switch (builtin.arch) {
		819	.i386 => 4,
		820	.mips, .mipsel, .mips64, .mips64el => 14,
		821	.arm, .armeb, .thumb, .thumbeb => 1,
		822	.sparc, .sparcel, .sparcv9 => if (@sizeOf(usize) == 4) 43 else 8,
		823	else => 0,
		824	}]u32,
		825	};
		826
739	pub const EPERM = 1; // Operation not permitted	827	pub const EPERM = 1; // Operation not permitted
740	pub const ENOENT = 2; // No such file or directory	828	pub const ENOENT = 2; // No such file or directory
741	pub const ESRCH = 3; // No such process	829	pub const ESRCH = 3; // No such process

lib/std/os/linux.zig+228-228

...	@@ -53,46 +53,46 @@ pub fn getErrno(r: usize) u12 {	...	@@ -53,46 +53,46 @@ pub fn getErrno(r: usize) u12 {
53	}	53	}
54		54
55	pub fn dup2(old: i32, new: i32) usize {	55	pub fn dup2(old: i32, new: i32) usize {
56	if (@hasDecl(@This(), "SYS_dup2")) {	56	if (@hasField(SYS, "dup2")) {
57	return syscall2(SYS_dup2, @bitCast(usize, @as(isize, old)), @bitCast(usize, @as(isize, new)));	57	return syscall2(.dup2, @bitCast(usize, @as(isize, old)), @bitCast(usize, @as(isize, new)));
58	} else {	58	} else {
59	if (old == new) {	59	if (old == new) {
60	if (std.debug.runtime_safety) {	60	if (std.debug.runtime_safety) {
61	const rc = syscall2(SYS_fcntl, @bitCast(usize, @as(isize, old)), F_GETFD);	61	const rc = syscall2(.fcntl, @bitCast(usize, @as(isize, old)), F_GETFD);
62	if (@bitCast(isize, rc) < 0) return rc;	62	if (@bitCast(isize, rc) < 0) return rc;
63	}	63	}
64	return @intCast(usize, old);	64	return @intCast(usize, old);
65	} else {	65	} else {
66	return syscall3(SYS_dup3, @bitCast(usize, @as(isize, old)), @bitCast(usize, @as(isize, new)), 0);	66	return syscall3(.dup3, @bitCast(usize, @as(isize, old)), @bitCast(usize, @as(isize, new)), 0);
67	}	67	}
68	}	68	}
69	}	69	}
70		70
71	pub fn dup3(old: i32, new: i32, flags: u32) usize {	71	pub fn dup3(old: i32, new: i32, flags: u32) usize {
72	return syscall3(SYS_dup3, @bitCast(usize, @as(isize, old)), @bitCast(usize, @as(isize, new)), flags);	72	return syscall3(.dup3, @bitCast(usize, @as(isize, old)), @bitCast(usize, @as(isize, new)), flags);
73	}	73	}
74		74
75	pub fn chdir(path: [*:0]const u8) usize {	75	pub fn chdir(path: [*:0]const u8) usize {
76	return syscall1(SYS_chdir, @ptrToInt(path));	76	return syscall1(.chdir, @ptrToInt(path));
77	}	77	}
78		78
79	pub fn fchdir(fd: fd_t) usize {	79	pub fn fchdir(fd: fd_t) usize {
80	return syscall1(SYS_fchdir, @bitCast(usize, @as(isize, fd)));	80	return syscall1(.fchdir, @bitCast(usize, @as(isize, fd)));
81	}	81	}
82		82
83	pub fn chroot(path: [*:0]const u8) usize {	83	pub fn chroot(path: [*:0]const u8) usize {
84	return syscall1(SYS_chroot, @ptrToInt(path));	84	return syscall1(.chroot, @ptrToInt(path));
85	}	85	}
86		86
87	pub fn execve(path: [:0]const u8, argv: [:null]const ?[:0]const u8, envp: [:null]const ?[*:0]const u8) usize {	87	pub fn execve(path: [:0]const u8, argv: [:null]const ?[:0]const u8, envp: [:null]const ?[*:0]const u8) usize {
88	return syscall3(SYS_execve, @ptrToInt(path), @ptrToInt(argv), @ptrToInt(envp));	88	return syscall3(.execve, @ptrToInt(path), @ptrToInt(argv), @ptrToInt(envp));
89	}	89	}
90		90
91	pub fn fork() usize {	91	pub fn fork() usize {
92	if (@hasDecl(@This(), "SYS_fork")) {	92	if (@hasField(SYS, "fork")) {
93	return syscall0(SYS_fork);	93	return syscall0(.fork);
94	} else {	94	} else {
95	return syscall2(SYS_clone, SIGCHLD, 0);	95	return syscall2(.clone, SIGCHLD, 0);
96	}	96	}
97	}	97	}
98		98
...	@@ -102,7 +102,7 @@ pub fn fork() usize {	...	@@ -102,7 +102,7 @@ pub fn fork() usize {
102	/// the compiler is not aware of how vfork affects control flow and you may	102	/// the compiler is not aware of how vfork affects control flow and you may
103	/// see different results in optimized builds.	103	/// see different results in optimized builds.
104	pub inline fn vfork() usize {	104	pub inline fn vfork() usize {
105	return @call(.{ .modifier = .always_inline }, syscall0, .{SYS_vfork});	105	return @call(.{ .modifier = .always_inline }, syscall0, .{.vfork});
106	}	106	}
107		107
108	pub fn futimens(fd: i32, times: *const [2]timespec) usize {	108	pub fn futimens(fd: i32, times: *const [2]timespec) usize {
...	@@ -110,24 +110,24 @@ pub fn futimens(fd: i32, times: *const [2]timespec) usize {	...	@@ -110,24 +110,24 @@ pub fn futimens(fd: i32, times: *const [2]timespec) usize {
110	}	110	}
111		111
112	pub fn utimensat(dirfd: i32, path: ?[:0]const u8, times: const [2]timespec, flags: u32) usize {	112	pub fn utimensat(dirfd: i32, path: ?[:0]const u8, times: const [2]timespec, flags: u32) usize {
113	return syscall4(SYS_utimensat, @bitCast(usize, @as(isize, dirfd)), @ptrToInt(path), @ptrToInt(times), flags);	113	return syscall4(.utimensat, @bitCast(usize, @as(isize, dirfd)), @ptrToInt(path), @ptrToInt(times), flags);
114	}	114	}
115		115
116	pub fn futex_wait(uaddr: const i32, futex_op: u32, val: i32, timeout: ?timespec) usize {	116	pub fn futex_wait(uaddr: const i32, futex_op: u32, val: i32, timeout: ?timespec) usize {
117	return syscall4(SYS_futex, @ptrToInt(uaddr), futex_op, @bitCast(u32, val), @ptrToInt(timeout));	117	return syscall4(.futex, @ptrToInt(uaddr), futex_op, @bitCast(u32, val), @ptrToInt(timeout));
118	}	118	}
119		119
120	pub fn futex_wake(uaddr: *const i32, futex_op: u32, val: i32) usize {	120	pub fn futex_wake(uaddr: *const i32, futex_op: u32, val: i32) usize {
121	return syscall3(SYS_futex, @ptrToInt(uaddr), futex_op, @bitCast(u32, val));	121	return syscall3(.futex, @ptrToInt(uaddr), futex_op, @bitCast(u32, val));
122	}	122	}
123		123
124	pub fn getcwd(buf: [*]u8, size: usize) usize {	124	pub fn getcwd(buf: [*]u8, size: usize) usize {
125	return syscall2(SYS_getcwd, @ptrToInt(buf), size);	125	return syscall2(.getcwd, @ptrToInt(buf), size);
126	}	126	}
127		127
128	pub fn getdents(fd: i32, dirp: [*]u8, len: usize) usize {	128	pub fn getdents(fd: i32, dirp: [*]u8, len: usize) usize {
129	return syscall3(	129	return syscall3(
130	SYS_getdents,	130	.getdents,
131	@bitCast(usize, @as(isize, fd)),	131	@bitCast(usize, @as(isize, fd)),
132	@ptrToInt(dirp),	132	@ptrToInt(dirp),
133	std.math.min(len, maxInt(c_int)),	133	std.math.min(len, maxInt(c_int)),
...	@@ -136,7 +136,7 @@ pub fn getdents(fd: i32, dirp: [*]u8, len: usize) usize {	...	@@ -136,7 +136,7 @@ pub fn getdents(fd: i32, dirp: [*]u8, len: usize) usize {
136		136
137	pub fn getdents64(fd: i32, dirp: [*]u8, len: usize) usize {	137	pub fn getdents64(fd: i32, dirp: [*]u8, len: usize) usize {
138	return syscall3(	138	return syscall3(
139	SYS_getdents64,	139	.getdents64,
140	@bitCast(usize, @as(isize, fd)),	140	@bitCast(usize, @as(isize, fd)),
141	@ptrToInt(dirp),	141	@ptrToInt(dirp),
142	std.math.min(len, maxInt(c_int)),	142	std.math.min(len, maxInt(c_int)),
...	@@ -144,61 +144,61 @@ pub fn getdents64(fd: i32, dirp: [*]u8, len: usize) usize {	...	@@ -144,61 +144,61 @@ pub fn getdents64(fd: i32, dirp: [*]u8, len: usize) usize {
144	}	144	}
145		145
146	pub fn inotify_init1(flags: u32) usize {	146	pub fn inotify_init1(flags: u32) usize {
147	return syscall1(SYS_inotify_init1, flags);	147	return syscall1(.inotify_init1, flags);
148	}	148	}
149		149
150	pub fn inotify_add_watch(fd: i32, pathname: [*:0]const u8, mask: u32) usize {	150	pub fn inotify_add_watch(fd: i32, pathname: [*:0]const u8, mask: u32) usize {
151	return syscall3(SYS_inotify_add_watch, @bitCast(usize, @as(isize, fd)), @ptrToInt(pathname), mask);	151	return syscall3(.inotify_add_watch, @bitCast(usize, @as(isize, fd)), @ptrToInt(pathname), mask);
152	}	152	}
153		153
154	pub fn inotify_rm_watch(fd: i32, wd: i32) usize {	154	pub fn inotify_rm_watch(fd: i32, wd: i32) usize {
155	return syscall2(SYS_inotify_rm_watch, @bitCast(usize, @as(isize, fd)), @bitCast(usize, @as(isize, wd)));	155	return syscall2(.inotify_rm_watch, @bitCast(usize, @as(isize, fd)), @bitCast(usize, @as(isize, wd)));
156	}	156	}
157		157
158	pub fn readlink(noalias path: [:0]const u8, noalias buf_ptr: []u8, buf_len: usize) usize {	158	pub fn readlink(noalias path: [:0]const u8, noalias buf_ptr: []u8, buf_len: usize) usize {
159	if (@hasDecl(@This(), "SYS_readlink")) {	159	if (@hasField(SYS, "readlink")) {
160	return syscall3(SYS_readlink, @ptrToInt(path), @ptrToInt(buf_ptr), buf_len);	160	return syscall3(.readlink, @ptrToInt(path), @ptrToInt(buf_ptr), buf_len);
161	} else {	161	} else {
162	return syscall4(SYS_readlinkat, @bitCast(usize, @as(isize, AT_FDCWD)), @ptrToInt(path), @ptrToInt(buf_ptr), buf_len);	162	return syscall4(.readlinkat, @bitCast(usize, @as(isize, AT_FDCWD)), @ptrToInt(path), @ptrToInt(buf_ptr), buf_len);
163	}	163	}
164	}	164	}
165		165
166	pub fn readlinkat(dirfd: i32, noalias path: [:0]const u8, noalias buf_ptr: []u8, buf_len: usize) usize {	166	pub fn readlinkat(dirfd: i32, noalias path: [:0]const u8, noalias buf_ptr: []u8, buf_len: usize) usize {
167	return syscall4(SYS_readlinkat, @bitCast(usize, @as(isize, dirfd)), @ptrToInt(path), @ptrToInt(buf_ptr), buf_len);	167	return syscall4(.readlinkat, @bitCast(usize, @as(isize, dirfd)), @ptrToInt(path), @ptrToInt(buf_ptr), buf_len);
168	}	168	}
169		169
170	pub fn mkdir(path: [*:0]const u8, mode: u32) usize {	170	pub fn mkdir(path: [*:0]const u8, mode: u32) usize {
171	if (@hasDecl(@This(), "SYS_mkdir")) {	171	if (@hasField(SYS, "mkdir")) {
172	return syscall2(SYS_mkdir, @ptrToInt(path), mode);	172	return syscall2(.mkdir, @ptrToInt(path), mode);
173	} else {	173	} else {
174	return syscall3(SYS_mkdirat, @bitCast(usize, @as(isize, AT_FDCWD)), @ptrToInt(path), mode);	174	return syscall3(.mkdirat, @bitCast(usize, @as(isize, AT_FDCWD)), @ptrToInt(path), mode);
175	}	175	}
176	}	176	}
177		177
178	pub fn mkdirat(dirfd: i32, path: [*:0]const u8, mode: u32) usize {	178	pub fn mkdirat(dirfd: i32, path: [*:0]const u8, mode: u32) usize {
179	return syscall3(SYS_mkdirat, @bitCast(usize, @as(isize, dirfd)), @ptrToInt(path), mode);	179	return syscall3(.mkdirat, @bitCast(usize, @as(isize, dirfd)), @ptrToInt(path), mode);
180	}	180	}
181		181
182	pub fn mount(special: [:0]const u8, dir: [:0]const u8, fstype: [*:0]const u8, flags: u32, data: usize) usize {	182	pub fn mount(special: [:0]const u8, dir: [:0]const u8, fstype: [*:0]const u8, flags: u32, data: usize) usize {
183	return syscall5(SYS_mount, @ptrToInt(special), @ptrToInt(dir), @ptrToInt(fstype), flags, data);	183	return syscall5(.mount, @ptrToInt(special), @ptrToInt(dir), @ptrToInt(fstype), flags, data);
184	}	184	}
185		185
186	pub fn umount(special: [*:0]const u8) usize {	186	pub fn umount(special: [*:0]const u8) usize {
187	return syscall2(SYS_umount2, @ptrToInt(special), 0);	187	return syscall2(.umount2, @ptrToInt(special), 0);
188	}	188	}
189		189
190	pub fn umount2(special: [*:0]const u8, flags: u32) usize {	190	pub fn umount2(special: [*:0]const u8, flags: u32) usize {
191	return syscall2(SYS_umount2, @ptrToInt(special), flags);	191	return syscall2(.umount2, @ptrToInt(special), flags);
192	}	192	}
193		193
194	pub fn mmap(address: ?[*]u8, length: usize, prot: usize, flags: u32, fd: i32, offset: u64) usize {	194	pub fn mmap(address: ?[*]u8, length: usize, prot: usize, flags: u32, fd: i32, offset: u64) usize {
195	if (@hasDecl(@This(), "SYS_mmap2")) {	195	if (@hasField(SYS, "mmap2")) {
196	// Make sure the offset is also specified in multiples of page size	196	// Make sure the offset is also specified in multiples of page size
197	if ((offset & (MMAP2_UNIT - 1)) != 0)	197	if ((offset & (MMAP2_UNIT - 1)) != 0)
198	return @bitCast(usize, @as(isize, -EINVAL));	198	return @bitCast(usize, @as(isize, -EINVAL));
199		199
200	return syscall6(	200	return syscall6(
201	SYS_mmap2,	201	.mmap2,
202	@ptrToInt(address),	202	@ptrToInt(address),
203	length,	203	length,
204	prot,	204	prot,
...	@@ -208,7 +208,7 @@ pub fn mmap(address: ?[*]u8, length: usize, prot: usize, flags: u32, fd: i32, of	...	@@ -208,7 +208,7 @@ pub fn mmap(address: ?[*]u8, length: usize, prot: usize, flags: u32, fd: i32, of
208	);	208	);
209	} else {	209	} else {
210	return syscall6(	210	return syscall6(
211	SYS_mmap,	211	.mmap,
212	@ptrToInt(address),	212	@ptrToInt(address),
213	length,	213	length,
214	prot,	214	prot,
...	@@ -220,19 +220,19 @@ pub fn mmap(address: ?[*]u8, length: usize, prot: usize, flags: u32, fd: i32, of	...	@@ -220,19 +220,19 @@ pub fn mmap(address: ?[*]u8, length: usize, prot: usize, flags: u32, fd: i32, of
220	}	220	}
221		221
222	pub fn mprotect(address: [*]const u8, length: usize, protection: usize) usize {	222	pub fn mprotect(address: [*]const u8, length: usize, protection: usize) usize {
223	return syscall3(SYS_mprotect, @ptrToInt(address), length, protection);	223	return syscall3(.mprotect, @ptrToInt(address), length, protection);
224	}	224	}
225		225
226	pub fn munmap(address: [*]const u8, length: usize) usize {	226	pub fn munmap(address: [*]const u8, length: usize) usize {
227	return syscall2(SYS_munmap, @ptrToInt(address), length);	227	return syscall2(.munmap, @ptrToInt(address), length);
228	}	228	}
229		229
230	pub fn poll(fds: [*]pollfd, n: nfds_t, timeout: i32) usize {	230	pub fn poll(fds: [*]pollfd, n: nfds_t, timeout: i32) usize {
231	if (@hasDecl(@This(), "SYS_poll")) {	231	if (@hasField(SYS, "poll")) {
232	return syscall3(SYS_poll, @ptrToInt(fds), n, @bitCast(u32, timeout));	232	return syscall3(.poll, @ptrToInt(fds), n, @bitCast(u32, timeout));
233	} else {	233	} else {
234	return syscall6(	234	return syscall6(
235	SYS_ppoll,	235	.ppoll,
236	@ptrToInt(fds),	236	@ptrToInt(fds),
237	n,	237	n,
238	@ptrToInt(if (timeout >= 0)	238	@ptrToInt(if (timeout >= 0)
...	@@ -250,12 +250,12 @@ pub fn poll(fds: [*]pollfd, n: nfds_t, timeout: i32) usize {	...	@@ -250,12 +250,12 @@ pub fn poll(fds: [*]pollfd, n: nfds_t, timeout: i32) usize {
250	}	250	}
251		251
252	pub fn read(fd: i32, buf: [*]u8, count: usize) usize {	252	pub fn read(fd: i32, buf: [*]u8, count: usize) usize {
253	return syscall3(SYS_read, @bitCast(usize, @as(isize, fd)), @ptrToInt(buf), count);	253	return syscall3(.read, @bitCast(usize, @as(isize, fd)), @ptrToInt(buf), count);
254	}	254	}
255		255
256	pub fn preadv(fd: i32, iov: [*]const iovec, count: usize, offset: u64) usize {	256	pub fn preadv(fd: i32, iov: [*]const iovec, count: usize, offset: u64) usize {
257	return syscall5(	257	return syscall5(
258	SYS_preadv,	258	.preadv,
259	@bitCast(usize, @as(isize, fd)),	259	@bitCast(usize, @as(isize, fd)),
260	@ptrToInt(iov),	260	@ptrToInt(iov),
261	count,	261	count,
...	@@ -266,7 +266,7 @@ pub fn preadv(fd: i32, iov: [*]const iovec, count: usize, offset: u64) usize {	...	@@ -266,7 +266,7 @@ pub fn preadv(fd: i32, iov: [*]const iovec, count: usize, offset: u64) usize {
266		266
267	pub fn preadv2(fd: i32, iov: [*]const iovec, count: usize, offset: u64, flags: kernel_rwf) usize {	267	pub fn preadv2(fd: i32, iov: [*]const iovec, count: usize, offset: u64, flags: kernel_rwf) usize {
268	return syscall6(	268	return syscall6(
269	SYS_preadv2,	269	.preadv2,
270	@bitCast(usize, @as(isize, fd)),	270	@bitCast(usize, @as(isize, fd)),
271	@ptrToInt(iov),	271	@ptrToInt(iov),
272	count,	272	count,
...	@@ -277,16 +277,16 @@ pub fn preadv2(fd: i32, iov: [*]const iovec, count: usize, offset: u64, flags: k	...	@@ -277,16 +277,16 @@ pub fn preadv2(fd: i32, iov: [*]const iovec, count: usize, offset: u64, flags: k
277	}	277	}
278		278
279	pub fn readv(fd: i32, iov: [*]const iovec, count: usize) usize {	279	pub fn readv(fd: i32, iov: [*]const iovec, count: usize) usize {
280	return syscall3(SYS_readv, @bitCast(usize, @as(isize, fd)), @ptrToInt(iov), count);	280	return syscall3(.readv, @bitCast(usize, @as(isize, fd)), @ptrToInt(iov), count);
281	}	281	}
282		282
283	pub fn writev(fd: i32, iov: [*]const iovec_const, count: usize) usize {	283	pub fn writev(fd: i32, iov: [*]const iovec_const, count: usize) usize {
284	return syscall3(SYS_writev, @bitCast(usize, @as(isize, fd)), @ptrToInt(iov), count);	284	return syscall3(.writev, @bitCast(usize, @as(isize, fd)), @ptrToInt(iov), count);
285	}	285	}
286		286
287	pub fn pwritev(fd: i32, iov: [*]const iovec_const, count: usize, offset: u64) usize {	287	pub fn pwritev(fd: i32, iov: [*]const iovec_const, count: usize, offset: u64) usize {
288	return syscall5(	288	return syscall5(
289	SYS_pwritev,	289	.pwritev,
290	@bitCast(usize, @as(isize, fd)),	290	@bitCast(usize, @as(isize, fd)),
291	@ptrToInt(iov),	291	@ptrToInt(iov),
292	count,	292	count,
...	@@ -297,7 +297,7 @@ pub fn pwritev(fd: i32, iov: [*]const iovec_const, count: usize, offset: u64) us	...	@@ -297,7 +297,7 @@ pub fn pwritev(fd: i32, iov: [*]const iovec_const, count: usize, offset: u64) us
297		297
298	pub fn pwritev2(fd: i32, iov: [*]const iovec_const, count: usize, offset: u64, flags: kernel_rwf) usize {	298	pub fn pwritev2(fd: i32, iov: [*]const iovec_const, count: usize, offset: u64, flags: kernel_rwf) usize {
299	return syscall6(	299	return syscall6(
300	SYS_pwritev2,	300	.pwritev2,
301	@bitCast(usize, @as(isize, fd)),	301	@bitCast(usize, @as(isize, fd)),
302	@ptrToInt(iov),	302	@ptrToInt(iov),
303	count,	303	count,
...	@@ -308,30 +308,30 @@ pub fn pwritev2(fd: i32, iov: [*]const iovec_const, count: usize, offset: u64, f	...	@@ -308,30 +308,30 @@ pub fn pwritev2(fd: i32, iov: [*]const iovec_const, count: usize, offset: u64, f
308	}	308	}
309		309
310	pub fn rmdir(path: [*:0]const u8) usize {	310	pub fn rmdir(path: [*:0]const u8) usize {
311	if (@hasDecl(@This(), "SYS_rmdir")) {	311	if (@hasField(SYS, "rmdir")) {
312	return syscall1(SYS_rmdir, @ptrToInt(path));	312	return syscall1(.rmdir, @ptrToInt(path));
313	} else {	313	} else {
314	return syscall3(SYS_unlinkat, @bitCast(usize, @as(isize, AT_FDCWD)), @ptrToInt(path), AT_REMOVEDIR);	314	return syscall3(.unlinkat, @bitCast(usize, @as(isize, AT_FDCWD)), @ptrToInt(path), AT_REMOVEDIR);
315	}	315	}
316	}	316	}
317		317
318	pub fn symlink(existing: [:0]const u8, new: [:0]const u8) usize {	318	pub fn symlink(existing: [:0]const u8, new: [:0]const u8) usize {
319	if (@hasDecl(@This(), "SYS_symlink")) {	319	if (@hasField(SYS, "symlink")) {
320	return syscall2(SYS_symlink, @ptrToInt(existing), @ptrToInt(new));	320	return syscall2(.symlink, @ptrToInt(existing), @ptrToInt(new));
321	} else {	321	} else {
322	return syscall3(SYS_symlinkat, @ptrToInt(existing), @bitCast(usize, @as(isize, AT_FDCWD)), @ptrToInt(new));	322	return syscall3(.symlinkat, @ptrToInt(existing), @bitCast(usize, @as(isize, AT_FDCWD)), @ptrToInt(new));
323	}	323	}
324	}	324	}
325		325
326	pub fn symlinkat(existing: [:0]const u8, newfd: i32, newpath: [:0]const u8) usize {	326	pub fn symlinkat(existing: [:0]const u8, newfd: i32, newpath: [:0]const u8) usize {
327	return syscall3(SYS_symlinkat, @ptrToInt(existing), @bitCast(usize, @as(isize, newfd)), @ptrToInt(newpath));	327	return syscall3(.symlinkat, @ptrToInt(existing), @bitCast(usize, @as(isize, newfd)), @ptrToInt(newpath));
328	}	328	}
329		329
330	pub fn pread(fd: i32, buf: [*]u8, count: usize, offset: u64) usize {	330	pub fn pread(fd: i32, buf: [*]u8, count: usize, offset: u64) usize {
331	if (@hasDecl(@This(), "SYS_pread64")) {	331	if (@hasField(SYS, "pread64")) {
332	if (require_aligned_register_pair) {	332	if (require_aligned_register_pair) {
333	return syscall6(	333	return syscall6(
334	SYS_pread64,	334	.pread64,
335	@bitCast(usize, @as(isize, fd)),	335	@bitCast(usize, @as(isize, fd)),
336	@ptrToInt(buf),	336	@ptrToInt(buf),
337	count,	337	count,
...	@@ -341,7 +341,7 @@ pub fn pread(fd: i32, buf: [*]u8, count: usize, offset: u64) usize {	...	@@ -341,7 +341,7 @@ pub fn pread(fd: i32, buf: [*]u8, count: usize, offset: u64) usize {
341	);	341	);
342	} else {	342	} else {
343	return syscall5(	343	return syscall5(
344	SYS_pread64,	344	.pread64,
345	@bitCast(usize, @as(isize, fd)),	345	@bitCast(usize, @as(isize, fd)),
346	@ptrToInt(buf),	346	@ptrToInt(buf),
347	count,	347	count,
...	@@ -351,7 +351,7 @@ pub fn pread(fd: i32, buf: [*]u8, count: usize, offset: u64) usize {	...	@@ -351,7 +351,7 @@ pub fn pread(fd: i32, buf: [*]u8, count: usize, offset: u64) usize {
351	}	351	}
352	} else {	352	} else {
353	return syscall4(	353	return syscall4(
354	SYS_pread,	354	.pread,
355	@bitCast(usize, @as(isize, fd)),	355	@bitCast(usize, @as(isize, fd)),
356	@ptrToInt(buf),	356	@ptrToInt(buf),
357	count,	357	count,
...	@@ -361,40 +361,40 @@ pub fn pread(fd: i32, buf: [*]u8, count: usize, offset: u64) usize {	...	@@ -361,40 +361,40 @@ pub fn pread(fd: i32, buf: [*]u8, count: usize, offset: u64) usize {
361	}	361	}
362		362
363	pub fn access(path: [*:0]const u8, mode: u32) usize {	363	pub fn access(path: [*:0]const u8, mode: u32) usize {
364	if (@hasDecl(@This(), "SYS_access")) {	364	if (@hasField(SYS, "access")) {
365	return syscall2(SYS_access, @ptrToInt(path), mode);	365	return syscall2(.access, @ptrToInt(path), mode);
366	} else {	366	} else {
367	return syscall4(SYS_faccessat, @bitCast(usize, @as(isize, AT_FDCWD)), @ptrToInt(path), mode, 0);	367	return syscall4(.faccessat, @bitCast(usize, @as(isize, AT_FDCWD)), @ptrToInt(path), mode, 0);
368	}	368	}
369	}	369	}
370		370
371	pub fn faccessat(dirfd: i32, path: [*:0]const u8, mode: u32, flags: u32) usize {	371	pub fn faccessat(dirfd: i32, path: [*:0]const u8, mode: u32, flags: u32) usize {
372	return syscall4(SYS_faccessat, @bitCast(usize, @as(isize, dirfd)), @ptrToInt(path), mode, flags);	372	return syscall4(.faccessat, @bitCast(usize, @as(isize, dirfd)), @ptrToInt(path), mode, flags);
373	}	373	}
374		374
375	pub fn pipe(fd: *[2]i32) usize {	375	pub fn pipe(fd: *[2]i32) usize {
376	if (comptime builtin.arch.isMIPS()) {	376	if (comptime builtin.arch.isMIPS()) {
377	return syscall_pipe(fd);	377	return syscall_pipe(fd);
378	} else if (@hasDecl(@This(), "SYS_pipe")) {	378	} else if (@hasField(SYS, "pipe")) {
379	return syscall1(SYS_pipe, @ptrToInt(fd));	379	return syscall1(.pipe, @ptrToInt(fd));
380	} else {	380	} else {
381	return syscall2(SYS_pipe2, @ptrToInt(fd), 0);	381	return syscall2(.pipe2, @ptrToInt(fd), 0);
382	}	382	}
383	}	383	}
384		384
385	pub fn pipe2(fd: *[2]i32, flags: u32) usize {	385	pub fn pipe2(fd: *[2]i32, flags: u32) usize {
386	return syscall2(SYS_pipe2, @ptrToInt(fd), flags);	386	return syscall2(.pipe2, @ptrToInt(fd), flags);
387	}	387	}
388		388
389	pub fn write(fd: i32, buf: [*]const u8, count: usize) usize {	389	pub fn write(fd: i32, buf: [*]const u8, count: usize) usize {
390	return syscall3(SYS_write, @bitCast(usize, @as(isize, fd)), @ptrToInt(buf), count);	390	return syscall3(.write, @bitCast(usize, @as(isize, fd)), @ptrToInt(buf), count);
391	}	391	}
392		392
393	pub fn ftruncate(fd: i32, length: u64) usize {	393	pub fn ftruncate(fd: i32, length: u64) usize {
394	if (@hasDecl(@This(), "SYS_ftruncate64")) {	394	if (@hasField(SYS, "ftruncate64")) {
395	if (require_aligned_register_pair) {	395	if (require_aligned_register_pair) {
396	return syscall4(	396	return syscall4(
397	SYS_ftruncate64,	397	.ftruncate64,
398	@bitCast(usize, @as(isize, fd)),	398	@bitCast(usize, @as(isize, fd)),
399	0,	399	0,
400	@truncate(usize, length),	400	@truncate(usize, length),
...	@@ -402,7 +402,7 @@ pub fn ftruncate(fd: i32, length: u64) usize {	...	@@ -402,7 +402,7 @@ pub fn ftruncate(fd: i32, length: u64) usize {
402	);	402	);
403	} else {	403	} else {
404	return syscall3(	404	return syscall3(
405	SYS_ftruncate64,	405	.ftruncate64,
406	@bitCast(usize, @as(isize, fd)),	406	@bitCast(usize, @as(isize, fd)),
407	@truncate(usize, length),	407	@truncate(usize, length),
408	@truncate(usize, length >> 32),	408	@truncate(usize, length >> 32),
...	@@ -410,7 +410,7 @@ pub fn ftruncate(fd: i32, length: u64) usize {	...	@@ -410,7 +410,7 @@ pub fn ftruncate(fd: i32, length: u64) usize {
410	}	410	}
411	} else {	411	} else {
412	return syscall2(	412	return syscall2(
413	SYS_ftruncate,	413	.ftruncate,
414	@bitCast(usize, @as(isize, fd)),	414	@bitCast(usize, @as(isize, fd)),
415	@truncate(usize, length),	415	@truncate(usize, length),
416	);	416	);
...	@@ -418,10 +418,10 @@ pub fn ftruncate(fd: i32, length: u64) usize {	...	@@ -418,10 +418,10 @@ pub fn ftruncate(fd: i32, length: u64) usize {
418	}	418	}
419		419
420	pub fn pwrite(fd: i32, buf: [*]const u8, count: usize, offset: usize) usize {	420	pub fn pwrite(fd: i32, buf: [*]const u8, count: usize, offset: usize) usize {
421	if (@hasDecl(@This(), "SYS_pwrite64")) {	421	if (@hasField(SYS, "pwrite64")) {
422	if (require_aligned_register_pair) {	422	if (require_aligned_register_pair) {
423	return syscall6(	423	return syscall6(
424	SYS_pwrite64,	424	.pwrite64,
425	@bitCast(usize, @as(isize, fd)),	425	@bitCast(usize, @as(isize, fd)),
426	@ptrToInt(buf),	426	@ptrToInt(buf),
427	count,	427	count,
...	@@ -431,7 +431,7 @@ pub fn pwrite(fd: i32, buf: [*]const u8, count: usize, offset: usize) usize {	...	@@ -431,7 +431,7 @@ pub fn pwrite(fd: i32, buf: [*]const u8, count: usize, offset: usize) usize {
431	);	431	);
432	} else {	432	} else {
433	return syscall5(	433	return syscall5(
434	SYS_pwrite64,	434	.pwrite64,
435	@bitCast(usize, @as(isize, fd)),	435	@bitCast(usize, @as(isize, fd)),
436	@ptrToInt(buf),	436	@ptrToInt(buf),
437	count,	437	count,
...	@@ -441,7 +441,7 @@ pub fn pwrite(fd: i32, buf: [*]const u8, count: usize, offset: usize) usize {	...	@@ -441,7 +441,7 @@ pub fn pwrite(fd: i32, buf: [*]const u8, count: usize, offset: usize) usize {
441	}	441	}
442	} else {	442	} else {
443	return syscall4(	443	return syscall4(
444	SYS_pwrite,	444	.pwrite,
445	@bitCast(usize, @as(isize, fd)),	445	@bitCast(usize, @as(isize, fd)),
446	@ptrToInt(buf),	446	@ptrToInt(buf),
447	count,	447	count,
...	@@ -451,19 +451,19 @@ pub fn pwrite(fd: i32, buf: [*]const u8, count: usize, offset: usize) usize {	...	@@ -451,19 +451,19 @@ pub fn pwrite(fd: i32, buf: [*]const u8, count: usize, offset: usize) usize {
451	}	451	}
452		452
453	pub fn rename(old: [:0]const u8, new: [:0]const u8) usize {	453	pub fn rename(old: [:0]const u8, new: [:0]const u8) usize {
454	if (@hasDecl(@This(), "SYS_rename")) {	454	if (@hasField(SYS, "rename")) {
455	return syscall2(SYS_rename, @ptrToInt(old), @ptrToInt(new));	455	return syscall2(.rename, @ptrToInt(old), @ptrToInt(new));
456	} else if (@hasDecl(@This(), "SYS_renameat")) {	456	} else if (@hasField(SYS, "renameat")) {
457	return syscall4(SYS_renameat, @bitCast(usize, @as(isize, AT_FDCWD)), @ptrToInt(old), @bitCast(usize, @as(isize, AT_FDCWD)), @ptrToInt(new));	457	return syscall4(.renameat, @bitCast(usize, @as(isize, AT_FDCWD)), @ptrToInt(old), @bitCast(usize, @as(isize, AT_FDCWD)), @ptrToInt(new));
458	} else {	458	} else {
459	return syscall5(SYS_renameat2, @bitCast(usize, @as(isize, AT_FDCWD)), @ptrToInt(old), @bitCast(usize, @as(isize, AT_FDCWD)), @ptrToInt(new), 0);	459	return syscall5(.renameat2, @bitCast(usize, @as(isize, AT_FDCWD)), @ptrToInt(old), @bitCast(usize, @as(isize, AT_FDCWD)), @ptrToInt(new), 0);
460	}	460	}
461	}	461	}
462		462
463	pub fn renameat(oldfd: i32, oldpath: []const u8, newfd: i32, newpath: []const u8) usize {	463	pub fn renameat(oldfd: i32, oldpath: []const u8, newfd: i32, newpath: []const u8) usize {
464	if (@hasDecl(@This(), "SYS_renameat")) {	464	if (@hasField(SYS, "renameat")) {
465	return syscall4(	465	return syscall4(
466	SYS_renameat,	466	.renameat,
467	@bitCast(usize, @as(isize, oldfd)),	467	@bitCast(usize, @as(isize, oldfd)),
468	@ptrToInt(oldpath),	468	@ptrToInt(oldpath),
469	@bitCast(usize, @as(isize, newfd)),	469	@bitCast(usize, @as(isize, newfd)),
...	@@ -471,7 +471,7 @@ pub fn renameat(oldfd: i32, oldpath: []const u8, newfd: i32, newpath: []const	...	@@ -471,7 +471,7 @@ pub fn renameat(oldfd: i32, oldpath: []const u8, newfd: i32, newpath: []const
471	);	471	);
472	} else {	472	} else {
473	return syscall5(	473	return syscall5(
474	SYS_renameat2,	474	.renameat2,
475	@bitCast(usize, @as(isize, oldfd)),	475	@bitCast(usize, @as(isize, oldfd)),
476	@ptrToInt(oldpath),	476	@ptrToInt(oldpath),
477	@bitCast(usize, @as(isize, newfd)),	477	@bitCast(usize, @as(isize, newfd)),
...	@@ -483,7 +483,7 @@ pub fn renameat(oldfd: i32, oldpath: []const u8, newfd: i32, newpath: []const	...	@@ -483,7 +483,7 @@ pub fn renameat(oldfd: i32, oldpath: []const u8, newfd: i32, newpath: []const
483		483
484	pub fn renameat2(oldfd: i32, oldpath: [:0]const u8, newfd: i32, newpath: [:0]const u8, flags: u32) usize {	484	pub fn renameat2(oldfd: i32, oldpath: [:0]const u8, newfd: i32, newpath: [:0]const u8, flags: u32) usize {
485	return syscall5(	485	return syscall5(
486	SYS_renameat2,	486	.renameat2,
487	@bitCast(usize, @as(isize, oldfd)),	487	@bitCast(usize, @as(isize, oldfd)),
488	@ptrToInt(oldpath),	488	@ptrToInt(oldpath),
489	@bitCast(usize, @as(isize, newfd)),	489	@bitCast(usize, @as(isize, newfd)),
...	@@ -493,11 +493,11 @@ pub fn renameat2(oldfd: i32, oldpath: [:0]const u8, newfd: i32, newpath: [:0]c	...	@@ -493,11 +493,11 @@ pub fn renameat2(oldfd: i32, oldpath: [:0]const u8, newfd: i32, newpath: [:0]c
493	}	493	}
494		494
495	pub fn open(path: [*:0]const u8, flags: u32, perm: usize) usize {	495	pub fn open(path: [*:0]const u8, flags: u32, perm: usize) usize {
496	if (@hasDecl(@This(), "SYS_open")) {	496	if (@hasField(SYS, "open")) {
497	return syscall3(SYS_open, @ptrToInt(path), flags, perm);	497	return syscall3(.open, @ptrToInt(path), flags, perm);
498	} else {	498	} else {
499	return syscall4(	499	return syscall4(
500	SYS_openat,	500	.openat,
501	@bitCast(usize, @as(isize, AT_FDCWD)),	501	@bitCast(usize, @as(isize, AT_FDCWD)),
502	@ptrToInt(path),	502	@ptrToInt(path),
503	flags,	503	flags,
...	@@ -507,32 +507,32 @@ pub fn open(path: [*:0]const u8, flags: u32, perm: usize) usize {	...	@@ -507,32 +507,32 @@ pub fn open(path: [*:0]const u8, flags: u32, perm: usize) usize {
507	}	507	}
508		508
509	pub fn create(path: [*:0]const u8, perm: usize) usize {	509	pub fn create(path: [*:0]const u8, perm: usize) usize {
510	return syscall2(SYS_creat, @ptrToInt(path), perm);	510	return syscall2(.creat, @ptrToInt(path), perm);
511	}	511	}
512		512
513	pub fn openat(dirfd: i32, path: [*:0]const u8, flags: u32, mode: usize) usize {	513	pub fn openat(dirfd: i32, path: [*:0]const u8, flags: u32, mode: usize) usize {
514	// dirfd could be negative, for example AT_FDCWD is -100	514	// dirfd could be negative, for example AT_FDCWD is -100
515	return syscall4(SYS_openat, @bitCast(usize, @as(isize, dirfd)), @ptrToInt(path), flags, mode);	515	return syscall4(.openat, @bitCast(usize, @as(isize, dirfd)), @ptrToInt(path), flags, mode);
516	}	516	}
517		517
518	/// See also `clone` (from the arch-specific include)	518	/// See also `clone` (from the arch-specific include)
519	pub fn clone5(flags: usize, child_stack_ptr: usize, parent_tid: i32, child_tid: i32, newtls: usize) usize {	519	pub fn clone5(flags: usize, child_stack_ptr: usize, parent_tid: i32, child_tid: i32, newtls: usize) usize {
520	return syscall5(SYS_clone, flags, child_stack_ptr, @ptrToInt(parent_tid), @ptrToInt(child_tid), newtls);	520	return syscall5(.clone, flags, child_stack_ptr, @ptrToInt(parent_tid), @ptrToInt(child_tid), newtls);
521	}	521	}
522		522
523	/// See also `clone` (from the arch-specific include)	523	/// See also `clone` (from the arch-specific include)
524	pub fn clone2(flags: u32, child_stack_ptr: usize) usize {	524	pub fn clone2(flags: u32, child_stack_ptr: usize) usize {
525	return syscall2(SYS_clone, flags, child_stack_ptr);	525	return syscall2(.clone, flags, child_stack_ptr);
526	}	526	}
527		527
528	pub fn close(fd: i32) usize {	528	pub fn close(fd: i32) usize {
529	return syscall1(SYS_close, @bitCast(usize, @as(isize, fd)));	529	return syscall1(.close, @bitCast(usize, @as(isize, fd)));
530	}	530	}
531		531
532	/// Can only be called on 32 bit systems. For 64 bit see `lseek`.	532	/// Can only be called on 32 bit systems. For 64 bit see `lseek`.
533	pub fn llseek(fd: i32, offset: u64, result: ?*u64, whence: usize) usize {	533	pub fn llseek(fd: i32, offset: u64, result: ?*u64, whence: usize) usize {
534	return syscall5(	534	return syscall5(
535	SYS__llseek,	535	._llseek,
536	@bitCast(usize, @as(isize, fd)),	536	@bitCast(usize, @as(isize, fd)),
537	@truncate(usize, offset >> 32),	537	@truncate(usize, offset >> 32),
538	@truncate(usize, offset),	538	@truncate(usize, offset),
...	@@ -543,53 +543,53 @@ pub fn llseek(fd: i32, offset: u64, result: ?*u64, whence: usize) usize {	...	@@ -543,53 +543,53 @@ pub fn llseek(fd: i32, offset: u64, result: ?*u64, whence: usize) usize {
543		543
544	/// Can only be called on 64 bit systems. For 32 bit see `llseek`.	544	/// Can only be called on 64 bit systems. For 32 bit see `llseek`.
545	pub fn lseek(fd: i32, offset: i64, whence: usize) usize {	545	pub fn lseek(fd: i32, offset: i64, whence: usize) usize {
546	return syscall3(SYS_lseek, @bitCast(usize, @as(isize, fd)), @bitCast(usize, offset), whence);	546	return syscall3(.lseek, @bitCast(usize, @as(isize, fd)), @bitCast(usize, offset), whence);
547	}	547	}
548		548
549	pub fn exit(status: i32) noreturn {	549	pub fn exit(status: i32) noreturn {
550	_ = syscall1(SYS_exit, @bitCast(usize, @as(isize, status)));	550	_ = syscall1(.exit, @bitCast(usize, @as(isize, status)));
551	unreachable;	551	unreachable;
552	}	552	}
553		553
554	pub fn exit_group(status: i32) noreturn {	554	pub fn exit_group(status: i32) noreturn {
555	_ = syscall1(SYS_exit_group, @bitCast(usize, @as(isize, status)));	555	_ = syscall1(.exit_group, @bitCast(usize, @as(isize, status)));
556	unreachable;	556	unreachable;
557	}	557	}
558		558
559	pub fn getrandom(buf: [*]u8, count: usize, flags: u32) usize {	559	pub fn getrandom(buf: [*]u8, count: usize, flags: u32) usize {
560	return syscall3(SYS_getrandom, @ptrToInt(buf), count, flags);	560	return syscall3(.getrandom, @ptrToInt(buf), count, flags);
561	}	561	}
562		562
563	pub fn kill(pid: pid_t, sig: i32) usize {	563	pub fn kill(pid: pid_t, sig: i32) usize {
564	return syscall2(SYS_kill, @bitCast(usize, @as(isize, pid)), @bitCast(usize, @as(isize, sig)));	564	return syscall2(.kill, @bitCast(usize, @as(isize, pid)), @bitCast(usize, @as(isize, sig)));
565	}	565	}
566		566
567	pub fn tkill(tid: pid_t, sig: i32) usize {	567	pub fn tkill(tid: pid_t, sig: i32) usize {
568	return syscall2(SYS_tkill, @bitCast(usize, @as(isize, tid)), @bitCast(usize, @as(isize, sig)));	568	return syscall2(.tkill, @bitCast(usize, @as(isize, tid)), @bitCast(usize, @as(isize, sig)));
569	}	569	}
570		570
571	pub fn tgkill(tgid: pid_t, tid: pid_t, sig: i32) usize {	571	pub fn tgkill(tgid: pid_t, tid: pid_t, sig: i32) usize {
572	return syscall2(SYS_tgkill, @bitCast(usize, @as(isize, tgid)), @bitCast(usize, @as(isize, tid)), @bitCast(usize, @as(isize, sig)));	572	return syscall2(.tgkill, @bitCast(usize, @as(isize, tgid)), @bitCast(usize, @as(isize, tid)), @bitCast(usize, @as(isize, sig)));
573	}	573	}
574		574
575	pub fn unlink(path: [*:0]const u8) usize {	575	pub fn unlink(path: [*:0]const u8) usize {
576	if (@hasDecl(@This(), "SYS_unlink")) {	576	if (@hasField(SYS, "unlink")) {
577	return syscall1(SYS_unlink, @ptrToInt(path));	577	return syscall1(.unlink, @ptrToInt(path));
578	} else {	578	} else {
579	return syscall3(SYS_unlinkat, @bitCast(usize, @as(isize, AT_FDCWD)), @ptrToInt(path), 0);	579	return syscall3(.unlinkat, @bitCast(usize, @as(isize, AT_FDCWD)), @ptrToInt(path), 0);
580	}	580	}
581	}	581	}
582		582
583	pub fn unlinkat(dirfd: i32, path: [*:0]const u8, flags: u32) usize {	583	pub fn unlinkat(dirfd: i32, path: [*:0]const u8, flags: u32) usize {
584	return syscall3(SYS_unlinkat, @bitCast(usize, @as(isize, dirfd)), @ptrToInt(path), flags);	584	return syscall3(.unlinkat, @bitCast(usize, @as(isize, dirfd)), @ptrToInt(path), flags);
585	}	585	}
586		586
587	pub fn waitpid(pid: pid_t, status: *u32, flags: u32) usize {	587	pub fn waitpid(pid: pid_t, status: *u32, flags: u32) usize {
588	return syscall4(SYS_wait4, @bitCast(usize, @as(isize, pid)), @ptrToInt(status), flags, 0);	588	return syscall4(.wait4, @bitCast(usize, @as(isize, pid)), @ptrToInt(status), flags, 0);
589	}	589	}
590		590
591	pub fn fcntl(fd: fd_t, cmd: i32, arg: usize) usize {	591	pub fn fcntl(fd: fd_t, cmd: i32, arg: usize) usize {
592	return syscall3(SYS_fcntl, @bitCast(usize, @as(isize, fd)), @bitCast(usize, @as(isize, cmd)), arg);	592	return syscall3(.fcntl, @bitCast(usize, @as(isize, fd)), @bitCast(usize, @as(isize, cmd)), arg);
593	}	593	}
594		594
595	var vdso_clock_gettime = @ptrCast(?*const c_void, init_vdso_clock_gettime);	595	var vdso_clock_gettime = @ptrCast(?*const c_void, init_vdso_clock_gettime);
...	@@ -609,7 +609,7 @@ pub fn clock_gettime(clk_id: i32, tp: *timespec) usize {	...	@@ -609,7 +609,7 @@ pub fn clock_gettime(clk_id: i32, tp: *timespec) usize {
609	}	609	}
610	}	610	}
611	}	611	}
612	return syscall2(SYS_clock_gettime, @bitCast(usize, @as(isize, clk_id)), @ptrToInt(tp));	612	return syscall2(.clock_gettime, @bitCast(usize, @as(isize, clk_id)), @ptrToInt(tp));
613	}	613	}
614		614
615	fn init_vdso_clock_gettime(clk: i32, ts: *timespec) callconv(.C) usize {	615	fn init_vdso_clock_gettime(clk: i32, ts: *timespec) callconv(.C) usize {
...	@@ -626,86 +626,86 @@ fn init_vdso_clock_gettime(clk: i32, ts: *timespec) callconv(.C) usize {	...	@@ -626,86 +626,86 @@ fn init_vdso_clock_gettime(clk: i32, ts: *timespec) callconv(.C) usize {
626	}	626	}
627		627
628	pub fn clock_getres(clk_id: i32, tp: *timespec) usize {	628	pub fn clock_getres(clk_id: i32, tp: *timespec) usize {
629	return syscall2(SYS_clock_getres, @bitCast(usize, @as(isize, clk_id)), @ptrToInt(tp));	629	return syscall2(.clock_getres, @bitCast(usize, @as(isize, clk_id)), @ptrToInt(tp));
630	}	630	}
631		631
632	pub fn clock_settime(clk_id: i32, tp: *const timespec) usize {	632	pub fn clock_settime(clk_id: i32, tp: *const timespec) usize {
633	return syscall2(SYS_clock_settime, @bitCast(usize, @as(isize, clk_id)), @ptrToInt(tp));	633	return syscall2(.clock_settime, @bitCast(usize, @as(isize, clk_id)), @ptrToInt(tp));
634	}	634	}
635		635
636	pub fn gettimeofday(tv: timeval, tz: timezone) usize {	636	pub fn gettimeofday(tv: timeval, tz: timezone) usize {
637	return syscall2(SYS_gettimeofday, @ptrToInt(tv), @ptrToInt(tz));	637	return syscall2(.gettimeofday, @ptrToInt(tv), @ptrToInt(tz));
638	}	638	}
639		639
640	pub fn settimeofday(tv: const timeval, tz: const timezone) usize {	640	pub fn settimeofday(tv: const timeval, tz: const timezone) usize {
641	return syscall2(SYS_settimeofday, @ptrToInt(tv), @ptrToInt(tz));	641	return syscall2(.settimeofday, @ptrToInt(tv), @ptrToInt(tz));
642	}	642	}
643		643
644	pub fn nanosleep(req: const timespec, rem: ?timespec) usize {	644	pub fn nanosleep(req: const timespec, rem: ?timespec) usize {
645	return syscall2(SYS_nanosleep, @ptrToInt(req), @ptrToInt(rem));	645	return syscall2(.nanosleep, @ptrToInt(req), @ptrToInt(rem));
646	}	646	}
647		647
648	pub fn setuid(uid: u32) usize {	648	pub fn setuid(uid: u32) usize {
649	if (@hasDecl(@This(), "SYS_setuid32")) {	649	if (@hasField(SYS, "setuid32")) {
650	return syscall1(SYS_setuid32, uid);	650	return syscall1(.setuid32, uid);
651	} else {	651	} else {
652	return syscall1(SYS_setuid, uid);	652	return syscall1(.setuid, uid);
653	}	653	}
654	}	654	}
655		655
656	pub fn setgid(gid: u32) usize {	656	pub fn setgid(gid: u32) usize {
657	if (@hasDecl(@This(), "SYS_setgid32")) {	657	if (@hasField(SYS, "setgid32")) {
658	return syscall1(SYS_setgid32, gid);	658	return syscall1(.setgid32, gid);
659	} else {	659	} else {
660	return syscall1(SYS_setgid, gid);	660	return syscall1(.setgid, gid);
661	}	661	}
662	}	662	}
663		663
664	pub fn setreuid(ruid: u32, euid: u32) usize {	664	pub fn setreuid(ruid: u32, euid: u32) usize {
665	if (@hasDecl(@This(), "SYS_setreuid32")) {	665	if (@hasField(SYS, "setreuid32")) {
666	return syscall2(SYS_setreuid32, ruid, euid);	666	return syscall2(.setreuid32, ruid, euid);
667	} else {	667	} else {
668	return syscall2(SYS_setreuid, ruid, euid);	668	return syscall2(.setreuid, ruid, euid);
669	}	669	}
670	}	670	}
671		671
672	pub fn setregid(rgid: u32, egid: u32) usize {	672	pub fn setregid(rgid: u32, egid: u32) usize {
673	if (@hasDecl(@This(), "SYS_setregid32")) {	673	if (@hasField(SYS, "setregid32")) {
674	return syscall2(SYS_setregid32, rgid, egid);	674	return syscall2(.setregid32, rgid, egid);
675	} else {	675	} else {
676	return syscall2(SYS_setregid, rgid, egid);	676	return syscall2(.setregid, rgid, egid);
677	}	677	}
678	}	678	}
679		679
680	pub fn getuid() u32 {	680	pub fn getuid() u32 {
681	if (@hasDecl(@This(), "SYS_getuid32")) {	681	if (@hasField(SYS, "getuid32")) {
682	return @as(u32, syscall0(SYS_getuid32));	682	return @as(u32, syscall0(.getuid32));
683	} else {	683	} else {
684	return @as(u32, syscall0(SYS_getuid));	684	return @as(u32, syscall0(.getuid));
685	}	685	}
686	}	686	}
687		687
688	pub fn getgid() u32 {	688	pub fn getgid() u32 {
689	if (@hasDecl(@This(), "SYS_getgid32")) {	689	if (@hasField(SYS, "getgid32")) {
690	return @as(u32, syscall0(SYS_getgid32));	690	return @as(u32, syscall0(.getgid32));
691	} else {	691	} else {
692	return @as(u32, syscall0(SYS_getgid));	692	return @as(u32, syscall0(.getgid));
693	}	693	}
694	}	694	}
695		695
696	pub fn geteuid() u32 {	696	pub fn geteuid() u32 {
697	if (@hasDecl(@This(), "SYS_geteuid32")) {	697	if (@hasField(SYS, "geteuid32")) {
698	return @as(u32, syscall0(SYS_geteuid32));	698	return @as(u32, syscall0(.geteuid32));
699	} else {	699	} else {
700	return @as(u32, syscall0(SYS_geteuid));	700	return @as(u32, syscall0(.geteuid));
701	}	701	}
702	}	702	}
703		703
704	pub fn getegid() u32 {	704	pub fn getegid() u32 {
705	if (@hasDecl(@This(), "SYS_getegid32")) {	705	if (@hasField(SYS, "getegid32")) {
706	return @as(u32, syscall0(SYS_getegid32));	706	return @as(u32, syscall0(.getegid32));
707	} else {	707	} else {
708	return @as(u32, syscall0(SYS_getegid));	708	return @as(u32, syscall0(.getegid));
709	}	709	}
710	}	710	}
711		711
...	@@ -718,63 +718,63 @@ pub fn setegid(egid: u32) usize {	...	@@ -718,63 +718,63 @@ pub fn setegid(egid: u32) usize {
718	}	718	}
719		719
720	pub fn getresuid(ruid: u32, euid: u32, suid: *u32) usize {	720	pub fn getresuid(ruid: u32, euid: u32, suid: *u32) usize {
721	if (@hasDecl(@This(), "SYS_getresuid32")) {	721	if (@hasField(SYS, "getresuid32")) {
722	return syscall3(SYS_getresuid32, @ptrToInt(ruid), @ptrToInt(euid), @ptrToInt(suid));	722	return syscall3(.getresuid32, @ptrToInt(ruid), @ptrToInt(euid), @ptrToInt(suid));
723	} else {	723	} else {
724	return syscall3(SYS_getresuid, @ptrToInt(ruid), @ptrToInt(euid), @ptrToInt(suid));	724	return syscall3(.getresuid, @ptrToInt(ruid), @ptrToInt(euid), @ptrToInt(suid));
725	}	725	}
726	}	726	}
727		727
728	pub fn getresgid(rgid: u32, egid: u32, sgid: *u32) usize {	728	pub fn getresgid(rgid: u32, egid: u32, sgid: *u32) usize {
729	if (@hasDecl(@This(), "SYS_getresgid32")) {	729	if (@hasField(SYS, "getresgid32")) {
730	return syscall3(SYS_getresgid32, @ptrToInt(rgid), @ptrToInt(egid), @ptrToInt(sgid));	730	return syscall3(.getresgid32, @ptrToInt(rgid), @ptrToInt(egid), @ptrToInt(sgid));
731	} else {	731	} else {
732	return syscall3(SYS_getresgid, @ptrToInt(rgid), @ptrToInt(egid), @ptrToInt(sgid));	732	return syscall3(.getresgid, @ptrToInt(rgid), @ptrToInt(egid), @ptrToInt(sgid));
733	}	733	}
734	}	734	}
735		735
736	pub fn setresuid(ruid: u32, euid: u32, suid: u32) usize {	736	pub fn setresuid(ruid: u32, euid: u32, suid: u32) usize {
737	if (@hasDecl(@This(), "SYS_setresuid32")) {	737	if (@hasField(SYS, "setresuid32")) {
738	return syscall3(SYS_setresuid32, ruid, euid, suid);	738	return syscall3(.setresuid32, ruid, euid, suid);
739	} else {	739	} else {
740	return syscall3(SYS_setresuid, ruid, euid, suid);	740	return syscall3(.setresuid, ruid, euid, suid);
741	}	741	}
742	}	742	}
743		743
744	pub fn setresgid(rgid: u32, egid: u32, sgid: u32) usize {	744	pub fn setresgid(rgid: u32, egid: u32, sgid: u32) usize {
745	if (@hasDecl(@This(), "SYS_setresgid32")) {	745	if (@hasField(SYS, "setresgid32")) {
746	return syscall3(SYS_setresgid32, rgid, egid, sgid);	746	return syscall3(.setresgid32, rgid, egid, sgid);
747	} else {	747	} else {
748	return syscall3(SYS_setresgid, rgid, egid, sgid);	748	return syscall3(.setresgid, rgid, egid, sgid);
749	}	749	}
750	}	750	}
751		751
752	pub fn getgroups(size: usize, list: *u32) usize {	752	pub fn getgroups(size: usize, list: *u32) usize {
753	if (@hasDecl(@This(), "SYS_getgroups32")) {	753	if (@hasField(SYS, "getgroups32")) {
754	return syscall2(SYS_getgroups32, size, @ptrToInt(list));	754	return syscall2(.getgroups32, size, @ptrToInt(list));
755	} else {	755	} else {
756	return syscall2(SYS_getgroups, size, @ptrToInt(list));	756	return syscall2(.getgroups, size, @ptrToInt(list));
757	}	757	}
758	}	758	}
759		759
760	pub fn setgroups(size: usize, list: *const u32) usize {	760	pub fn setgroups(size: usize, list: *const u32) usize {
761	if (@hasDecl(@This(), "SYS_setgroups32")) {	761	if (@hasField(SYS, "setgroups32")) {
762	return syscall2(SYS_setgroups32, size, @ptrToInt(list));	762	return syscall2(.setgroups32, size, @ptrToInt(list));
763	} else {	763	} else {
764	return syscall2(SYS_setgroups, size, @ptrToInt(list));	764	return syscall2(.setgroups, size, @ptrToInt(list));
765	}	765	}
766	}	766	}
767		767
768	pub fn getpid() pid_t {	768	pub fn getpid() pid_t {
769	return @bitCast(pid_t, @truncate(u32, syscall0(SYS_getpid)));	769	return @bitCast(pid_t, @truncate(u32, syscall0(.getpid)));
770	}	770	}
771		771
772	pub fn gettid() pid_t {	772	pub fn gettid() pid_t {
773	return @bitCast(pid_t, @truncate(u32, syscall0(SYS_gettid)));	773	return @bitCast(pid_t, @truncate(u32, syscall0(.gettid)));
774	}	774	}
775		775
776	pub fn sigprocmask(flags: u32, noalias set: ?const sigset_t, noalias oldset: ?sigset_t) usize {	776	pub fn sigprocmask(flags: u32, noalias set: ?const sigset_t, noalias oldset: ?sigset_t) usize {
777	return syscall4(SYS_rt_sigprocmask, flags, @ptrToInt(set), @ptrToInt(oldset), NSIG / 8);	777	return syscall4(.rt_sigprocmask, flags, @ptrToInt(set), @ptrToInt(oldset), NSIG / 8);
778	}	778	}
779		779
780	pub fn sigaction(sig: u6, noalias act: const Sigaction, noalias oact: ?Sigaction) usize {	780	pub fn sigaction(sig: u6, noalias act: const Sigaction, noalias oact: ?Sigaction) usize {
...	@@ -792,7 +792,7 @@ pub fn sigaction(sig: u6, noalias act: const Sigaction, noalias oact: ?Sigacti	...	@@ -792,7 +792,7 @@ pub fn sigaction(sig: u6, noalias act: const Sigaction, noalias oact: ?Sigacti
792	var ksa_old: k_sigaction = undefined;	792	var ksa_old: k_sigaction = undefined;
793	const ksa_mask_size = @sizeOf(@TypeOf(ksa_old.mask));	793	const ksa_mask_size = @sizeOf(@TypeOf(ksa_old.mask));
794	@memcpy(@ptrCast([]u8, &ksa.mask), @ptrCast([]const u8, &act.mask), ksa_mask_size);	794	@memcpy(@ptrCast([]u8, &ksa.mask), @ptrCast([]const u8, &act.mask), ksa_mask_size);
795	const result = syscall4(SYS_rt_sigaction, sig, @ptrToInt(&ksa), @ptrToInt(&ksa_old), ksa_mask_size);	795	const result = syscall4(.rt_sigaction, sig, @ptrToInt(&ksa), @ptrToInt(&ksa_old), ksa_mask_size);
796	const err = getErrno(result);	796	const err = getErrno(result);
797	if (err != 0) {	797	if (err != 0) {
798	return result;	798	return result;
...	@@ -819,42 +819,42 @@ pub fn getsockname(fd: i32, noalias addr: sockaddr, noalias len: socklen_t) us	...	@@ -819,42 +819,42 @@ pub fn getsockname(fd: i32, noalias addr: sockaddr, noalias len: socklen_t) us
819	if (builtin.arch == .i386) {	819	if (builtin.arch == .i386) {
820	return socketcall(SC_getsockname, &[3]usize{ @bitCast(usize, @as(isize, fd)), @ptrToInt(addr), @ptrToInt(len) });	820	return socketcall(SC_getsockname, &[3]usize{ @bitCast(usize, @as(isize, fd)), @ptrToInt(addr), @ptrToInt(len) });
821	}	821	}
822	return syscall3(SYS_getsockname, @bitCast(usize, @as(isize, fd)), @ptrToInt(addr), @ptrToInt(len));	822	return syscall3(.getsockname, @bitCast(usize, @as(isize, fd)), @ptrToInt(addr), @ptrToInt(len));
823	}	823	}
824		824
825	pub fn getpeername(fd: i32, noalias addr: sockaddr, noalias len: socklen_t) usize {	825	pub fn getpeername(fd: i32, noalias addr: sockaddr, noalias len: socklen_t) usize {
826	if (builtin.arch == .i386) {	826	if (builtin.arch == .i386) {
827	return socketcall(SC_getpeername, &[3]usize{ @bitCast(usize, @as(isize, fd)), @ptrToInt(addr), @ptrToInt(len) });	827	return socketcall(SC_getpeername, &[3]usize{ @bitCast(usize, @as(isize, fd)), @ptrToInt(addr), @ptrToInt(len) });
828	}	828	}
829	return syscall3(SYS_getpeername, @bitCast(usize, @as(isize, fd)), @ptrToInt(addr), @ptrToInt(len));	829	return syscall3(.getpeername, @bitCast(usize, @as(isize, fd)), @ptrToInt(addr), @ptrToInt(len));
830	}	830	}
831		831
832	pub fn socket(domain: u32, socket_type: u32, protocol: u32) usize {	832	pub fn socket(domain: u32, socket_type: u32, protocol: u32) usize {
833	if (builtin.arch == .i386) {	833	if (builtin.arch == .i386) {
834	return socketcall(SC_socket, &[3]usize{ domain, socket_type, protocol });	834	return socketcall(SC_socket, &[3]usize{ domain, socket_type, protocol });
835	}	835	}
836	return syscall3(SYS_socket, domain, socket_type, protocol);	836	return syscall3(.socket, domain, socket_type, protocol);
837	}	837	}
838		838
839	pub fn setsockopt(fd: i32, level: u32, optname: u32, optval: [*]const u8, optlen: socklen_t) usize {	839	pub fn setsockopt(fd: i32, level: u32, optname: u32, optval: [*]const u8, optlen: socklen_t) usize {
840	if (builtin.arch == .i386) {	840	if (builtin.arch == .i386) {
841	return socketcall(SC_setsockopt, &[5]usize{ @bitCast(usize, @as(isize, fd)), level, optname, @ptrToInt(optval), @intCast(usize, optlen) });	841	return socketcall(SC_setsockopt, &[5]usize{ @bitCast(usize, @as(isize, fd)), level, optname, @ptrToInt(optval), @intCast(usize, optlen) });
842	}	842	}
843	return syscall5(SYS_setsockopt, @bitCast(usize, @as(isize, fd)), level, optname, @ptrToInt(optval), @intCast(usize, optlen));	843	return syscall5(.setsockopt, @bitCast(usize, @as(isize, fd)), level, optname, @ptrToInt(optval), @intCast(usize, optlen));
844	}	844	}
845		845
846	pub fn getsockopt(fd: i32, level: u32, optname: u32, noalias optval: []u8, noalias optlen: socklen_t) usize {	846	pub fn getsockopt(fd: i32, level: u32, optname: u32, noalias optval: []u8, noalias optlen: socklen_t) usize {
847	if (builtin.arch == .i386) {	847	if (builtin.arch == .i386) {
848	return socketcall(SC_getsockopt, &[5]usize{ @bitCast(usize, @as(isize, fd)), level, optname, @ptrToInt(optval), @ptrToInt(optlen) });	848	return socketcall(SC_getsockopt, &[5]usize{ @bitCast(usize, @as(isize, fd)), level, optname, @ptrToInt(optval), @ptrToInt(optlen) });
849	}	849	}
850	return syscall5(SYS_getsockopt, @bitCast(usize, @as(isize, fd)), level, optname, @ptrToInt(optval), @ptrToInt(optlen));	850	return syscall5(.getsockopt, @bitCast(usize, @as(isize, fd)), level, optname, @ptrToInt(optval), @ptrToInt(optlen));
851	}	851	}
852		852
853	pub fn sendmsg(fd: i32, msg: *msghdr_const, flags: u32) usize {	853	pub fn sendmsg(fd: i32, msg: *msghdr_const, flags: u32) usize {
854	if (builtin.arch == .i386) {	854	if (builtin.arch == .i386) {
855	return socketcall(SC_sendmsg, &[3]usize{ @bitCast(usize, @as(isize, fd)), @ptrToInt(msg), flags });	855	return socketcall(SC_sendmsg, &[3]usize{ @bitCast(usize, @as(isize, fd)), @ptrToInt(msg), flags });
856	}	856	}
857	return syscall3(SYS_sendmsg, @bitCast(usize, @as(isize, fd)), @ptrToInt(msg), flags);	857	return syscall3(.sendmsg, @bitCast(usize, @as(isize, fd)), @ptrToInt(msg), flags);
858	}	858	}
859		859
860	pub fn sendmmsg(fd: i32, msgvec: [*]mmsghdr_const, vlen: u32, flags: u32) usize {	860	pub fn sendmmsg(fd: i32, msgvec: [*]mmsghdr_const, vlen: u32, flags: u32) usize {
...	@@ -872,7 +872,7 @@ pub fn sendmmsg(fd: i32, msgvec: [*]mmsghdr_const, vlen: u32, flags: u32) usize	...	@@ -872,7 +872,7 @@ pub fn sendmmsg(fd: i32, msgvec: [*]mmsghdr_const, vlen: u32, flags: u32) usize
872	// batch-send all messages up to the current message	872	// batch-send all messages up to the current message
873	if (next_unsent < i) {	873	if (next_unsent < i) {
874	const batch_size = i - next_unsent;	874	const batch_size = i - next_unsent;
875	const r = syscall4(SYS_sendmmsg, @bitCast(usize, @as(isize, fd)), @ptrToInt(&msgvec[next_unsent]), batch_size, flags);	875	const r = syscall4(.sendmmsg, @bitCast(usize, @as(isize, fd)), @ptrToInt(&msgvec[next_unsent]), batch_size, flags);
876	if (getErrno(r) != 0) return next_unsent;	876	if (getErrno(r) != 0) return next_unsent;
877	if (r < batch_size) return next_unsent + r;	877	if (r < batch_size) return next_unsent + r;
878	}	878	}
...	@@ -888,68 +888,68 @@ pub fn sendmmsg(fd: i32, msgvec: [*]mmsghdr_const, vlen: u32, flags: u32) usize	...	@@ -888,68 +888,68 @@ pub fn sendmmsg(fd: i32, msgvec: [*]mmsghdr_const, vlen: u32, flags: u32) usize
888	}	888	}
889	if (next_unsent < kvlen or next_unsent == 0) { // want to make sure at least one syscall occurs (e.g. to trigger MSG_EOR)	889	if (next_unsent < kvlen or next_unsent == 0) { // want to make sure at least one syscall occurs (e.g. to trigger MSG_EOR)
890	const batch_size = kvlen - next_unsent;	890	const batch_size = kvlen - next_unsent;
891	const r = syscall4(SYS_sendmmsg, @bitCast(usize, @as(isize, fd)), @ptrToInt(&msgvec[next_unsent]), batch_size, flags);	891	const r = syscall4(.sendmmsg, @bitCast(usize, @as(isize, fd)), @ptrToInt(&msgvec[next_unsent]), batch_size, flags);
892	if (getErrno(r) != 0) return r;	892	if (getErrno(r) != 0) return r;
893	return next_unsent + r;	893	return next_unsent + r;
894	}	894	}
895	return kvlen;	895	return kvlen;
896	}	896	}
897	return syscall4(SYS_sendmmsg, @bitCast(usize, @as(isize, fd)), @ptrToInt(msgvec), vlen, flags);	897	return syscall4(.sendmmsg, @bitCast(usize, @as(isize, fd)), @ptrToInt(msgvec), vlen, flags);
898	}	898	}
899		899
900	pub fn connect(fd: i32, addr: *const c_void, len: socklen_t) usize {	900	pub fn connect(fd: i32, addr: *const c_void, len: socklen_t) usize {
901	if (builtin.arch == .i386) {	901	if (builtin.arch == .i386) {
902	return socketcall(SC_connect, &[3]usize{ @bitCast(usize, @as(isize, fd)), @ptrToInt(addr), len });	902	return socketcall(SC_connect, &[3]usize{ @bitCast(usize, @as(isize, fd)), @ptrToInt(addr), len });
903	}	903	}
904	return syscall3(SYS_connect, @bitCast(usize, @as(isize, fd)), @ptrToInt(addr), len);	904	return syscall3(.connect, @bitCast(usize, @as(isize, fd)), @ptrToInt(addr), len);
905	}	905	}
906		906
907	pub fn recvmsg(fd: i32, msg: *msghdr, flags: u32) usize {	907	pub fn recvmsg(fd: i32, msg: *msghdr, flags: u32) usize {
908	if (builtin.arch == .i386) {	908	if (builtin.arch == .i386) {
909	return socketcall(SC_recvmsg, &[3]usize{ @bitCast(usize, @as(isize, fd)), @ptrToInt(msg), flags });	909	return socketcall(SC_recvmsg, &[3]usize{ @bitCast(usize, @as(isize, fd)), @ptrToInt(msg), flags });
910	}	910	}
911	return syscall3(SYS_recvmsg, @bitCast(usize, @as(isize, fd)), @ptrToInt(msg), flags);	911	return syscall3(.recvmsg, @bitCast(usize, @as(isize, fd)), @ptrToInt(msg), flags);
912	}	912	}
913		913
914	pub fn recvfrom(fd: i32, noalias buf: []u8, len: usize, flags: u32, noalias addr: ?sockaddr, noalias alen: ?*socklen_t) usize {	914	pub fn recvfrom(fd: i32, noalias buf: []u8, len: usize, flags: u32, noalias addr: ?sockaddr, noalias alen: ?*socklen_t) usize {
915	if (builtin.arch == .i386) {	915	if (builtin.arch == .i386) {
916	return socketcall(SC_recvfrom, &[6]usize{ @bitCast(usize, @as(isize, fd)), @ptrToInt(buf), len, flags, @ptrToInt(addr), @ptrToInt(alen) });	916	return socketcall(SC_recvfrom, &[6]usize{ @bitCast(usize, @as(isize, fd)), @ptrToInt(buf), len, flags, @ptrToInt(addr), @ptrToInt(alen) });
917	}	917	}
918	return syscall6(SYS_recvfrom, @bitCast(usize, @as(isize, fd)), @ptrToInt(buf), len, flags, @ptrToInt(addr), @ptrToInt(alen));	918	return syscall6(.recvfrom, @bitCast(usize, @as(isize, fd)), @ptrToInt(buf), len, flags, @ptrToInt(addr), @ptrToInt(alen));
919	}	919	}
920		920
921	pub fn shutdown(fd: i32, how: i32) usize {	921	pub fn shutdown(fd: i32, how: i32) usize {
922	if (builtin.arch == .i386) {	922	if (builtin.arch == .i386) {
923	return socketcall(SC_shutdown, &[2]usize{ @bitCast(usize, @as(isize, fd)), @bitCast(usize, @as(isize, how)) });	923	return socketcall(SC_shutdown, &[2]usize{ @bitCast(usize, @as(isize, fd)), @bitCast(usize, @as(isize, how)) });
924	}	924	}
925	return syscall2(SYS_shutdown, @bitCast(usize, @as(isize, fd)), @bitCast(usize, @as(isize, how)));	925	return syscall2(.shutdown, @bitCast(usize, @as(isize, fd)), @bitCast(usize, @as(isize, how)));
926	}	926	}
927		927
928	pub fn bind(fd: i32, addr: *const sockaddr, len: socklen_t) usize {	928	pub fn bind(fd: i32, addr: *const sockaddr, len: socklen_t) usize {
929	if (builtin.arch == .i386) {	929	if (builtin.arch == .i386) {
930	return socketcall(SC_bind, &[3]usize{ @bitCast(usize, @as(isize, fd)), @ptrToInt(addr), @intCast(usize, len) });	930	return socketcall(SC_bind, &[3]usize{ @bitCast(usize, @as(isize, fd)), @ptrToInt(addr), @intCast(usize, len) });
931	}	931	}
932	return syscall3(SYS_bind, @bitCast(usize, @as(isize, fd)), @ptrToInt(addr), @intCast(usize, len));	932	return syscall3(.bind, @bitCast(usize, @as(isize, fd)), @ptrToInt(addr), @intCast(usize, len));
933	}	933	}
934		934
935	pub fn listen(fd: i32, backlog: u32) usize {	935	pub fn listen(fd: i32, backlog: u32) usize {
936	if (builtin.arch == .i386) {	936	if (builtin.arch == .i386) {
937	return socketcall(SC_listen, &[2]usize{ @bitCast(usize, @as(isize, fd)), backlog });	937	return socketcall(SC_listen, &[2]usize{ @bitCast(usize, @as(isize, fd)), backlog });
938	}	938	}
939	return syscall2(SYS_listen, @bitCast(usize, @as(isize, fd)), backlog);	939	return syscall2(.listen, @bitCast(usize, @as(isize, fd)), backlog);
940	}	940	}
941		941
942	pub fn sendto(fd: i32, buf: []const u8, len: usize, flags: u32, addr: ?const sockaddr, alen: socklen_t) usize {	942	pub fn sendto(fd: i32, buf: []const u8, len: usize, flags: u32, addr: ?const sockaddr, alen: socklen_t) usize {
943	if (builtin.arch == .i386) {	943	if (builtin.arch == .i386) {
944	return socketcall(SC_sendto, &[6]usize{ @bitCast(usize, @as(isize, fd)), @ptrToInt(buf), len, flags, @ptrToInt(addr), @intCast(usize, alen) });	944	return socketcall(SC_sendto, &[6]usize{ @bitCast(usize, @as(isize, fd)), @ptrToInt(buf), len, flags, @ptrToInt(addr), @intCast(usize, alen) });
945	}	945	}
946	return syscall6(SYS_sendto, @bitCast(usize, @as(isize, fd)), @ptrToInt(buf), len, flags, @ptrToInt(addr), @intCast(usize, alen));	946	return syscall6(.sendto, @bitCast(usize, @as(isize, fd)), @ptrToInt(buf), len, flags, @ptrToInt(addr), @intCast(usize, alen));
947	}	947	}
948		948
949	pub fn sendfile(outfd: i32, infd: i32, offset: ?*i64, count: usize) usize {	949	pub fn sendfile(outfd: i32, infd: i32, offset: ?*i64, count: usize) usize {
950	if (@hasDecl(@This(), "SYS_sendfile64")) {	950	if (@hasField(SYS, "sendfile64")) {
951	return syscall4(	951	return syscall4(
952	SYS_sendfile64,	952	.sendfile64,
953	@bitCast(usize, @as(isize, outfd)),	953	@bitCast(usize, @as(isize, outfd)),
954	@bitCast(usize, @as(isize, infd)),	954	@bitCast(usize, @as(isize, infd)),
955	@ptrToInt(offset),	955	@ptrToInt(offset),
...	@@ -957,7 +957,7 @@ pub fn sendfile(outfd: i32, infd: i32, offset: ?*i64, count: usize) usize {	...	@@ -957,7 +957,7 @@ pub fn sendfile(outfd: i32, infd: i32, offset: ?*i64, count: usize) usize {
957	);	957	);
958	} else {	958	} else {
959	return syscall4(	959	return syscall4(
960	SYS_sendfile,	960	.sendfile,
961	@bitCast(usize, @as(isize, outfd)),	961	@bitCast(usize, @as(isize, outfd)),
962	@bitCast(usize, @as(isize, infd)),	962	@bitCast(usize, @as(isize, infd)),
963	@ptrToInt(offset),	963	@ptrToInt(offset),
...	@@ -970,7 +970,7 @@ pub fn socketpair(domain: i32, socket_type: i32, protocol: i32, fd: [2]i32) usiz	...	@@ -970,7 +970,7 @@ pub fn socketpair(domain: i32, socket_type: i32, protocol: i32, fd: [2]i32) usiz
970	if (builtin.arch == .i386) {	970	if (builtin.arch == .i386) {
971	return socketcall(SC_socketpair, &[4]usize{ @intCast(usize, domain), @intCast(usize, socket_type), @intCast(usize, protocol), @ptrToInt(&fd[0]) });	971	return socketcall(SC_socketpair, &[4]usize{ @intCast(usize, domain), @intCast(usize, socket_type), @intCast(usize, protocol), @ptrToInt(&fd[0]) });
972	}	972	}
973	return syscall4(SYS_socketpair, @intCast(usize, domain), @intCast(usize, socket_type), @intCast(usize, protocol), @ptrToInt(&fd[0]));	973	return syscall4(.socketpair, @intCast(usize, domain), @intCast(usize, socket_type), @intCast(usize, protocol), @ptrToInt(&fd[0]));
974	}	974	}
975		975
976	pub fn accept(fd: i32, noalias addr: sockaddr, noalias len: socklen_t) usize {	976	pub fn accept(fd: i32, noalias addr: sockaddr, noalias len: socklen_t) usize {
...	@@ -984,45 +984,45 @@ pub fn accept4(fd: i32, noalias addr: sockaddr, noalias len: socklen_t, flags:	...	@@ -984,45 +984,45 @@ pub fn accept4(fd: i32, noalias addr: sockaddr, noalias len: socklen_t, flags:
984	if (builtin.arch == .i386) {	984	if (builtin.arch == .i386) {
985	return socketcall(SC_accept4, &[4]usize{ @bitCast(usize, @as(isize, fd)), @ptrToInt(addr), @ptrToInt(len), flags });	985	return socketcall(SC_accept4, &[4]usize{ @bitCast(usize, @as(isize, fd)), @ptrToInt(addr), @ptrToInt(len), flags });
986	}	986	}
987	return syscall4(SYS_accept4, @bitCast(usize, @as(isize, fd)), @ptrToInt(addr), @ptrToInt(len), flags);	987	return syscall4(.accept4, @bitCast(usize, @as(isize, fd)), @ptrToInt(addr), @ptrToInt(len), flags);
988	}	988	}
989		989
990	pub fn fstat(fd: i32, stat_buf: *Stat) usize {	990	pub fn fstat(fd: i32, stat_buf: *Stat) usize {
991	if (@hasDecl(@This(), "SYS_fstat64")) {	991	if (@hasField(SYS, "fstat64")) {
992	return syscall2(SYS_fstat64, @bitCast(usize, @as(isize, fd)), @ptrToInt(stat_buf));	992	return syscall2(.fstat64, @bitCast(usize, @as(isize, fd)), @ptrToInt(stat_buf));
993	} else {	993	} else {
994	return syscall2(SYS_fstat, @bitCast(usize, @as(isize, fd)), @ptrToInt(stat_buf));	994	return syscall2(.fstat, @bitCast(usize, @as(isize, fd)), @ptrToInt(stat_buf));
995	}	995	}
996	}	996	}
997		997
998	pub fn stat(pathname: [:0]const u8, statbuf: Stat) usize {	998	pub fn stat(pathname: [:0]const u8, statbuf: Stat) usize {
999	if (@hasDecl(@This(), "SYS_stat64")) {	999	if (@hasField(SYS, "stat64")) {
1000	return syscall2(SYS_stat64, @ptrToInt(pathname), @ptrToInt(statbuf));	1000	return syscall2(.stat64, @ptrToInt(pathname), @ptrToInt(statbuf));
1001	} else {	1001	} else {
1002	return syscall2(SYS_stat, @ptrToInt(pathname), @ptrToInt(statbuf));	1002	return syscall2(.stat, @ptrToInt(pathname), @ptrToInt(statbuf));
1003	}	1003	}
1004	}	1004	}
1005		1005
1006	pub fn lstat(pathname: [:0]const u8, statbuf: Stat) usize {	1006	pub fn lstat(pathname: [:0]const u8, statbuf: Stat) usize {
1007	if (@hasDecl(@This(), "SYS_lstat64")) {	1007	if (@hasField(SYS, "lstat64")) {
1008	return syscall2(SYS_lstat64, @ptrToInt(pathname), @ptrToInt(statbuf));	1008	return syscall2(.lstat64, @ptrToInt(pathname), @ptrToInt(statbuf));
1009	} else {	1009	} else {
1010	return syscall2(SYS_lstat, @ptrToInt(pathname), @ptrToInt(statbuf));	1010	return syscall2(.lstat, @ptrToInt(pathname), @ptrToInt(statbuf));
1011	}	1011	}
1012	}	1012	}
1013		1013
1014	pub fn fstatat(dirfd: i32, path: [:0]const u8, stat_buf: Stat, flags: u32) usize {	1014	pub fn fstatat(dirfd: i32, path: [:0]const u8, stat_buf: Stat, flags: u32) usize {
1015	if (@hasDecl(@This(), "SYS_fstatat64")) {	1015	if (@hasField(SYS, "fstatat64")) {
1016	return syscall4(SYS_fstatat64, @bitCast(usize, @as(isize, dirfd)), @ptrToInt(path), @ptrToInt(stat_buf), flags);	1016	return syscall4(.fstatat64, @bitCast(usize, @as(isize, dirfd)), @ptrToInt(path), @ptrToInt(stat_buf), flags);
1017	} else {	1017	} else {
1018	return syscall4(SYS_fstatat, @bitCast(usize, @as(isize, dirfd)), @ptrToInt(path), @ptrToInt(stat_buf), flags);	1018	return syscall4(.fstatat, @bitCast(usize, @as(isize, dirfd)), @ptrToInt(path), @ptrToInt(stat_buf), flags);
1019	}	1019	}
1020	}	1020	}
1021		1021
1022	pub fn statx(dirfd: i32, path: []const u8, flags: u32, mask: u32, statx_buf: Statx) usize {	1022	pub fn statx(dirfd: i32, path: []const u8, flags: u32, mask: u32, statx_buf: Statx) usize {
1023	if (@hasDecl(@This(), "SYS_statx")) {	1023	if (@hasField(SYS, "statx")) {
1024	return syscall5(	1024	return syscall5(
1025	SYS_statx,	1025	.statx,
1026	@bitCast(usize, @as(isize, dirfd)),	1026	@bitCast(usize, @as(isize, dirfd)),
1027	@ptrToInt(path),	1027	@ptrToInt(path),
1028	flags,	1028	flags,
...	@@ -1034,59 +1034,59 @@ pub fn statx(dirfd: i32, path: []const u8, flags: u32, mask: u32, statx_buf: S	...	@@ -1034,59 +1034,59 @@ pub fn statx(dirfd: i32, path: []const u8, flags: u32, mask: u32, statx_buf: S
1034	}	1034	}
1035		1035
1036	pub fn listxattr(path: [:0]const u8, list: []u8, size: usize) usize {	1036	pub fn listxattr(path: [:0]const u8, list: []u8, size: usize) usize {
1037	return syscall3(SYS_listxattr, @ptrToInt(path), @ptrToInt(list), size);	1037	return syscall3(.listxattr, @ptrToInt(path), @ptrToInt(list), size);
1038	}	1038	}
1039		1039
1040	pub fn llistxattr(path: [:0]const u8, list: []u8, size: usize) usize {	1040	pub fn llistxattr(path: [:0]const u8, list: []u8, size: usize) usize {
1041	return syscall3(SYS_llistxattr, @ptrToInt(path), @ptrToInt(list), size);	1041	return syscall3(.llistxattr, @ptrToInt(path), @ptrToInt(list), size);
1042	}	1042	}
1043		1043
1044	pub fn flistxattr(fd: usize, list: [*]u8, size: usize) usize {	1044	pub fn flistxattr(fd: usize, list: [*]u8, size: usize) usize {
1045	return syscall3(SYS_flistxattr, fd, @ptrToInt(list), size);	1045	return syscall3(.flistxattr, fd, @ptrToInt(list), size);
1046	}	1046	}
1047		1047
1048	pub fn getxattr(path: [:0]const u8, name: [:0]const u8, value: [*]u8, size: usize) usize {	1048	pub fn getxattr(path: [:0]const u8, name: [:0]const u8, value: [*]u8, size: usize) usize {
1049	return syscall4(SYS_getxattr, @ptrToInt(path), @ptrToInt(name), @ptrToInt(value), size);	1049	return syscall4(.getxattr, @ptrToInt(path), @ptrToInt(name), @ptrToInt(value), size);
1050	}	1050	}
1051		1051
1052	pub fn lgetxattr(path: [:0]const u8, name: [:0]const u8, value: [*]u8, size: usize) usize {	1052	pub fn lgetxattr(path: [:0]const u8, name: [:0]const u8, value: [*]u8, size: usize) usize {
1053	return syscall4(SYS_lgetxattr, @ptrToInt(path), @ptrToInt(name), @ptrToInt(value), size);	1053	return syscall4(.lgetxattr, @ptrToInt(path), @ptrToInt(name), @ptrToInt(value), size);
1054	}	1054	}
1055		1055
1056	pub fn fgetxattr(fd: usize, name: [:0]const u8, value: []u8, size: usize) usize {	1056	pub fn fgetxattr(fd: usize, name: [:0]const u8, value: []u8, size: usize) usize {
1057	return syscall4(SYS_lgetxattr, fd, @ptrToInt(name), @ptrToInt(value), size);	1057	return syscall4(.lgetxattr, fd, @ptrToInt(name), @ptrToInt(value), size);
1058	}	1058	}
1059		1059
1060	pub fn setxattr(path: [:0]const u8, name: [:0]const u8, value: *const void, size: usize, flags: usize) usize {	1060	pub fn setxattr(path: [:0]const u8, name: [:0]const u8, value: *const void, size: usize, flags: usize) usize {
1061	return syscall5(SYS_setxattr, @ptrToInt(path), @ptrToInt(name), @ptrToInt(value), size, flags);	1061	return syscall5(.setxattr, @ptrToInt(path), @ptrToInt(name), @ptrToInt(value), size, flags);
1062	}	1062	}
1063		1063
1064	pub fn lsetxattr(path: [:0]const u8, name: [:0]const u8, value: *const void, size: usize, flags: usize) usize {	1064	pub fn lsetxattr(path: [:0]const u8, name: [:0]const u8, value: *const void, size: usize, flags: usize) usize {
1065	return syscall5(SYS_lsetxattr, @ptrToInt(path), @ptrToInt(name), @ptrToInt(value), size, flags);	1065	return syscall5(.lsetxattr, @ptrToInt(path), @ptrToInt(name), @ptrToInt(value), size, flags);
1066	}	1066	}
1067		1067
1068	pub fn fsetxattr(fd: usize, name: [:0]const u8, value: const void, size: usize, flags: usize) usize {	1068	pub fn fsetxattr(fd: usize, name: [:0]const u8, value: const void, size: usize, flags: usize) usize {
1069	return syscall5(SYS_fsetxattr, fd, @ptrToInt(name), @ptrToInt(value), size, flags);	1069	return syscall5(.fsetxattr, fd, @ptrToInt(name), @ptrToInt(value), size, flags);
1070	}	1070	}
1071		1071
1072	pub fn removexattr(path: [:0]const u8, name: [:0]const u8) usize {	1072	pub fn removexattr(path: [:0]const u8, name: [:0]const u8) usize {
1073	return syscall2(SYS_removexattr, @ptrToInt(path), @ptrToInt(name));	1073	return syscall2(.removexattr, @ptrToInt(path), @ptrToInt(name));
1074	}	1074	}
1075		1075
1076	pub fn lremovexattr(path: [:0]const u8, name: [:0]const u8) usize {	1076	pub fn lremovexattr(path: [:0]const u8, name: [:0]const u8) usize {
1077	return syscall2(SYS_lremovexattr, @ptrToInt(path), @ptrToInt(name));	1077	return syscall2(.lremovexattr, @ptrToInt(path), @ptrToInt(name));
1078	}	1078	}
1079		1079
1080	pub fn fremovexattr(fd: usize, name: [*:0]const u8) usize {	1080	pub fn fremovexattr(fd: usize, name: [*:0]const u8) usize {
1081	return syscall2(SYS_fremovexattr, fd, @ptrToInt(name));	1081	return syscall2(.fremovexattr, fd, @ptrToInt(name));
1082	}	1082	}
1083		1083
1084	pub fn sched_yield() usize {	1084	pub fn sched_yield() usize {
1085	return syscall0(SYS_sched_yield);	1085	return syscall0(.sched_yield);
1086	}	1086	}
1087		1087
1088	pub fn sched_getaffinity(pid: pid_t, size: usize, set: *cpu_set_t) usize {	1088	pub fn sched_getaffinity(pid: pid_t, size: usize, set: *cpu_set_t) usize {
1089	const rc = syscall3(SYS_sched_getaffinity, @bitCast(usize, @as(isize, pid)), size, @ptrToInt(set));	1089	const rc = syscall3(.sched_getaffinity, @bitCast(usize, @as(isize, pid)), size, @ptrToInt(set));
1090	if (@bitCast(isize, rc) < 0) return rc;	1090	if (@bitCast(isize, rc) < 0) return rc;
1091	if (rc < size) @memset(@ptrCast([*]u8, set) + rc, 0, size - rc);	1091	if (rc < size) @memset(@ptrCast([*]u8, set) + rc, 0, size - rc);
1092	return 0;	1092	return 0;
...	@@ -1097,11 +1097,11 @@ pub fn epoll_create() usize {	...	@@ -1097,11 +1097,11 @@ pub fn epoll_create() usize {
1097	}	1097	}
1098		1098
1099	pub fn epoll_create1(flags: usize) usize {	1099	pub fn epoll_create1(flags: usize) usize {
1100	return syscall1(SYS_epoll_create1, flags);	1100	return syscall1(.epoll_create1, flags);
1101	}	1101	}
1102		1102
1103	pub fn epoll_ctl(epoll_fd: i32, op: u32, fd: i32, ev: ?*epoll_event) usize {	1103	pub fn epoll_ctl(epoll_fd: i32, op: u32, fd: i32, ev: ?*epoll_event) usize {
1104	return syscall4(SYS_epoll_ctl, @bitCast(usize, @as(isize, epoll_fd)), @intCast(usize, op), @bitCast(usize, @as(isize, fd)), @ptrToInt(ev));	1104	return syscall4(.epoll_ctl, @bitCast(usize, @as(isize, epoll_fd)), @intCast(usize, op), @bitCast(usize, @as(isize, fd)), @ptrToInt(ev));
1105	}	1105	}
1106		1106
1107	pub fn epoll_wait(epoll_fd: i32, events: [*]epoll_event, maxevents: u32, timeout: i32) usize {	1107	pub fn epoll_wait(epoll_fd: i32, events: [*]epoll_event, maxevents: u32, timeout: i32) usize {
...	@@ -1110,7 +1110,7 @@ pub fn epoll_wait(epoll_fd: i32, events: [*]epoll_event, maxevents: u32, timeout	...	@@ -1110,7 +1110,7 @@ pub fn epoll_wait(epoll_fd: i32, events: [*]epoll_event, maxevents: u32, timeout
1110		1110
1111	pub fn epoll_pwait(epoll_fd: i32, events: []epoll_event, maxevents: u32, timeout: i32, sigmask: ?sigset_t) usize {	1111	pub fn epoll_pwait(epoll_fd: i32, events: []epoll_event, maxevents: u32, timeout: i32, sigmask: ?sigset_t) usize {
1112	return syscall6(	1112	return syscall6(
1113	SYS_epoll_pwait,	1113	.epoll_pwait,
1114	@bitCast(usize, @as(isize, epoll_fd)),	1114	@bitCast(usize, @as(isize, epoll_fd)),
1115	@ptrToInt(events),	1115	@ptrToInt(events),
1116	@intCast(usize, maxevents),	1116	@intCast(usize, maxevents),
...	@@ -1121,11 +1121,11 @@ pub fn epoll_pwait(epoll_fd: i32, events: [*]epoll_event, maxevents: u32, timeou	...	@@ -1121,11 +1121,11 @@ pub fn epoll_pwait(epoll_fd: i32, events: [*]epoll_event, maxevents: u32, timeou
1121	}	1121	}
1122		1122
1123	pub fn eventfd(count: u32, flags: u32) usize {	1123	pub fn eventfd(count: u32, flags: u32) usize {
1124	return syscall2(SYS_eventfd2, count, flags);	1124	return syscall2(.eventfd2, count, flags);
1125	}	1125	}
1126		1126
1127	pub fn timerfd_create(clockid: i32, flags: u32) usize {	1127	pub fn timerfd_create(clockid: i32, flags: u32) usize {
1128	return syscall2(SYS_timerfd_create, @bitCast(usize, @as(isize, clockid)), flags);	1128	return syscall2(.timerfd_create, @bitCast(usize, @as(isize, clockid)), flags);
1129	}	1129	}
1130		1130
1131	pub const itimerspec = extern struct {	1131	pub const itimerspec = extern struct {
...	@@ -1134,59 +1134,59 @@ pub const itimerspec = extern struct {	...	@@ -1134,59 +1134,59 @@ pub const itimerspec = extern struct {
1134	};	1134	};
1135		1135
1136	pub fn timerfd_gettime(fd: i32, curr_value: *itimerspec) usize {	1136	pub fn timerfd_gettime(fd: i32, curr_value: *itimerspec) usize {
1137	return syscall2(SYS_timerfd_gettime, @bitCast(usize, @as(isize, fd)), @ptrToInt(curr_value));	1137	return syscall2(.timerfd_gettime, @bitCast(usize, @as(isize, fd)), @ptrToInt(curr_value));
1138	}	1138	}
1139		1139
1140	pub fn timerfd_settime(fd: i32, flags: u32, new_value: const itimerspec, old_value: ?itimerspec) usize {	1140	pub fn timerfd_settime(fd: i32, flags: u32, new_value: const itimerspec, old_value: ?itimerspec) usize {
1141	return syscall4(SYS_timerfd_settime, @bitCast(usize, @as(isize, fd)), flags, @ptrToInt(new_value), @ptrToInt(old_value));	1141	return syscall4(.timerfd_settime, @bitCast(usize, @as(isize, fd)), flags, @ptrToInt(new_value), @ptrToInt(old_value));
1142	}	1142	}
1143		1143
1144	pub fn unshare(flags: usize) usize {	1144	pub fn unshare(flags: usize) usize {
1145	return syscall1(SYS_unshare, flags);	1145	return syscall1(.unshare, flags);
1146	}	1146	}
1147		1147
1148	pub fn capget(hdrp: cap_user_header_t, datap: cap_user_data_t) usize {	1148	pub fn capget(hdrp: cap_user_header_t, datap: cap_user_data_t) usize {
1149	return syscall2(SYS_capget, @ptrToInt(hdrp), @ptrToInt(datap));	1149	return syscall2(.capget, @ptrToInt(hdrp), @ptrToInt(datap));
1150	}	1150	}
1151		1151
1152	pub fn capset(hdrp: cap_user_header_t, datap: const cap_user_data_t) usize {	1152	pub fn capset(hdrp: cap_user_header_t, datap: const cap_user_data_t) usize {
1153	return syscall2(SYS_capset, @ptrToInt(hdrp), @ptrToInt(datap));	1153	return syscall2(.capset, @ptrToInt(hdrp), @ptrToInt(datap));
1154	}	1154	}
1155		1155
1156	pub fn sigaltstack(ss: ?stack_t, old_ss: ?stack_t) usize {	1156	pub fn sigaltstack(ss: ?stack_t, old_ss: ?stack_t) usize {
1157	return syscall2(SYS_sigaltstack, @ptrToInt(ss), @ptrToInt(old_ss));	1157	return syscall2(.sigaltstack, @ptrToInt(ss), @ptrToInt(old_ss));
1158	}	1158	}
1159		1159
1160	pub fn uname(uts: *utsname) usize {	1160	pub fn uname(uts: *utsname) usize {
1161	return syscall1(SYS_uname, @ptrToInt(uts));	1161	return syscall1(.uname, @ptrToInt(uts));
1162	}	1162	}
1163		1163
1164	pub fn io_uring_setup(entries: u32, p: *io_uring_params) usize {	1164	pub fn io_uring_setup(entries: u32, p: *io_uring_params) usize {
1165	return syscall2(SYS_io_uring_setup, entries, @ptrToInt(p));	1165	return syscall2(.io_uring_setup, entries, @ptrToInt(p));
1166	}	1166	}
1167		1167
1168	pub fn io_uring_enter(fd: i32, to_submit: u32, min_complete: u32, flags: u32, sig: ?*sigset_t) usize {	1168	pub fn io_uring_enter(fd: i32, to_submit: u32, min_complete: u32, flags: u32, sig: ?*sigset_t) usize {
1169	return syscall6(SYS_io_uring_enter, @bitCast(usize, @as(isize, fd)), to_submit, min_complete, flags, @ptrToInt(sig), NSIG / 8);	1169	return syscall6(.io_uring_enter, @bitCast(usize, @as(isize, fd)), to_submit, min_complete, flags, @ptrToInt(sig), NSIG / 8);
1170	}	1170	}
1171		1171
1172	pub fn io_uring_register(fd: i32, opcode: u32, arg: ?*const c_void, nr_args: u32) usize {	1172	pub fn io_uring_register(fd: i32, opcode: IORING_REGISTER, arg: ?*const c_void, nr_args: u32) usize {
1173	return syscall4(SYS_io_uring_register, @bitCast(usize, @as(isize, fd)), opcode, @ptrToInt(arg), nr_args);	1173	return syscall4(.io_uring_register, @bitCast(usize, @as(isize, fd)), @enumToInt(opcode), @ptrToInt(arg), nr_args);
1174	}	1174	}
1175		1175
1176	pub fn memfd_create(name: [*:0]const u8, flags: u32) usize {	1176	pub fn memfd_create(name: [*:0]const u8, flags: u32) usize {
1177	return syscall2(SYS_memfd_create, @ptrToInt(name), flags);	1177	return syscall2(.memfd_create, @ptrToInt(name), flags);
1178	}	1178	}
1179		1179
1180	pub fn getrusage(who: i32, usage: *rusage) usize {	1180	pub fn getrusage(who: i32, usage: *rusage) usize {
1181	return syscall2(SYS_getrusage, @bitCast(usize, @as(isize, who)), @ptrToInt(usage));	1181	return syscall2(.getrusage, @bitCast(usize, @as(isize, who)), @ptrToInt(usage));
1182	}	1182	}
1183		1183
1184	pub fn tcgetattr(fd: fd_t, termios_p: *termios) usize {	1184	pub fn tcgetattr(fd: fd_t, termios_p: *termios) usize {
1185	return syscall3(SYS_ioctl, @bitCast(usize, @as(isize, fd)), TCGETS, @ptrToInt(termios_p));	1185	return syscall3(.ioctl, @bitCast(usize, @as(isize, fd)), TCGETS, @ptrToInt(termios_p));
1186	}	1186	}
1187		1187
1188	pub fn tcsetattr(fd: fd_t, optional_action: TCSA, termios_p: *const termios) usize {	1188	pub fn tcsetattr(fd: fd_t, optional_action: TCSA, termios_p: *const termios) usize {
1189	return syscall3(SYS_ioctl, @bitCast(usize, @as(isize, fd)), TCSETS + @enumToInt(optional_action), @ptrToInt(termios_p));	1189	return syscall3(.ioctl, @bitCast(usize, @as(isize, fd)), TCSETS + @enumToInt(optional_action), @ptrToInt(termios_p));
1190	}	1190	}
1191		1191
1192	test "" {	1192	test "" {

lib/std/os/linux/arm-eabi.zig+16-16

...	@@ -1,36 +1,36 @@	...	@@ -1,36 +1,36 @@
1	usingnamespace @import("../bits.zig");	1	usingnamespace @import("../bits.zig");
2		2
3	pub fn syscall0(number: usize) usize {	3	pub fn syscall0(number: SYS) usize {
4	return asm volatile ("svc #0"	4	return asm volatile ("svc #0"
5	: [ret] "={r0}" (-> usize)	5	: [ret] "={r0}" (-> usize)
6	: [number] "{r7}" (number)	6	: [number] "{r7}" (@enumToInt(number))
7	: "memory"	7	: "memory"
8	);	8	);
9	}	9	}
10		10
11	pub fn syscall1(number: usize, arg1: usize) usize {	11	pub fn syscall1(number: SYS, arg1: usize) usize {
12	return asm volatile ("svc #0"	12	return asm volatile ("svc #0"
13	: [ret] "={r0}" (-> usize)	13	: [ret] "={r0}" (-> usize)
14	: [number] "{r7}" (number),	14	: [number] "{r7}" (@enumToInt(number)),
15	[arg1] "{r0}" (arg1)	15	[arg1] "{r0}" (arg1)
16	: "memory"	16	: "memory"
17	);	17	);
18	}	18	}
19		19
20	pub fn syscall2(number: usize, arg1: usize, arg2: usize) usize {	20	pub fn syscall2(number: SYS, arg1: usize, arg2: usize) usize {
21	return asm volatile ("svc #0"	21	return asm volatile ("svc #0"
22	: [ret] "={r0}" (-> usize)	22	: [ret] "={r0}" (-> usize)
23	: [number] "{r7}" (number),	23	: [number] "{r7}" (@enumToInt(number)),
24	[arg1] "{r0}" (arg1),	24	[arg1] "{r0}" (arg1),
25	[arg2] "{r1}" (arg2)	25	[arg2] "{r1}" (arg2)
26	: "memory"	26	: "memory"
27	);	27	);
28	}	28	}
29		29
30	pub fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) usize {	30	pub fn syscall3(number: SYS, arg1: usize, arg2: usize, arg3: usize) usize {
31	return asm volatile ("svc #0"	31	return asm volatile ("svc #0"
32	: [ret] "={r0}" (-> usize)	32	: [ret] "={r0}" (-> usize)
33	: [number] "{r7}" (number),	33	: [number] "{r7}" (@enumToInt(number)),
34	[arg1] "{r0}" (arg1),	34	[arg1] "{r0}" (arg1),
35	[arg2] "{r1}" (arg2),	35	[arg2] "{r1}" (arg2),
36	[arg3] "{r2}" (arg3)	36	[arg3] "{r2}" (arg3)
...	@@ -38,10 +38,10 @@ pub fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) usize {	...	@@ -38,10 +38,10 @@ pub fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) usize {
38	);	38	);
39	}	39	}
40		40
41	pub fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usize) usize {	41	pub fn syscall4(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize) usize {
42	return asm volatile ("svc #0"	42	return asm volatile ("svc #0"
43	: [ret] "={r0}" (-> usize)	43	: [ret] "={r0}" (-> usize)
44	: [number] "{r7}" (number),	44	: [number] "{r7}" (@enumToInt(number)),
45	[arg1] "{r0}" (arg1),	45	[arg1] "{r0}" (arg1),
46	[arg2] "{r1}" (arg2),	46	[arg2] "{r1}" (arg2),
47	[arg3] "{r2}" (arg3),	47	[arg3] "{r2}" (arg3),
...	@@ -50,10 +50,10 @@ pub fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz	...	@@ -50,10 +50,10 @@ pub fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz
50	);	50	);
51	}	51	}
52		52
53	pub fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usize, arg5: usize) usize {	53	pub fn syscall5(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize, arg5: usize) usize {
54	return asm volatile ("svc #0"	54	return asm volatile ("svc #0"
55	: [ret] "={r0}" (-> usize)	55	: [ret] "={r0}" (-> usize)
56	: [number] "{r7}" (number),	56	: [number] "{r7}" (@enumToInt(number)),
57	[arg1] "{r0}" (arg1),	57	[arg1] "{r0}" (arg1),
58	[arg2] "{r1}" (arg2),	58	[arg2] "{r1}" (arg2),
59	[arg3] "{r2}" (arg3),	59	[arg3] "{r2}" (arg3),
...	@@ -64,7 +64,7 @@ pub fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz	...	@@ -64,7 +64,7 @@ pub fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz
64	}	64	}
65		65
66	pub fn syscall6(	66	pub fn syscall6(
67	number: usize,	67	number: SYS,
68	arg1: usize,	68	arg1: usize,
69	arg2: usize,	69	arg2: usize,
70	arg3: usize,	70	arg3: usize,
...	@@ -74,7 +74,7 @@ pub fn syscall6(	...	@@ -74,7 +74,7 @@ pub fn syscall6(
74	) usize {	74	) usize {
75	return asm volatile ("svc #0"	75	return asm volatile ("svc #0"
76	: [ret] "={r0}" (-> usize)	76	: [ret] "={r0}" (-> usize)
77	: [number] "{r7}" (number),	77	: [number] "{r7}" (@enumToInt(number)),
78	[arg1] "{r0}" (arg1),	78	[arg1] "{r0}" (arg1),
79	[arg2] "{r1}" (arg2),	79	[arg2] "{r1}" (arg2),
80	[arg3] "{r2}" (arg3),	80	[arg3] "{r2}" (arg3),
...	@@ -91,7 +91,7 @@ pub extern fn clone(func: extern fn (arg: usize) u8, stack: usize, flags: u32, a	...	@@ -91,7 +91,7 @@ pub extern fn clone(func: extern fn (arg: usize) u8, stack: usize, flags: u32, a
91	pub fn restore() callconv(.Naked) void {	91	pub fn restore() callconv(.Naked) void {
92	return asm volatile ("svc #0"	92	return asm volatile ("svc #0"
93	:	93	:
94	: [number] "{r7}" (@as(usize, SYS_sigreturn))	94	: [number] "{r7}" (@enumToInt(SYS.sigreturn))
95	: "memory"	95	: "memory"
96	);	96	);
97	}	97	}
...	@@ -99,7 +99,7 @@ pub fn restore() callconv(.Naked) void {	...	@@ -99,7 +99,7 @@ pub fn restore() callconv(.Naked) void {
99	pub fn restore_rt() callconv(.Naked) void {	99	pub fn restore_rt() callconv(.Naked) void {
100	return asm volatile ("svc #0"	100	return asm volatile ("svc #0"
101	:	101	:
102	: [number] "{r7}" (@as(usize, SYS_rt_sigreturn))	102	: [number] "{r7}" (@enumToInt(SYS.rt_sigreturn))
103	: "memory"	103	: "memory"
104	);	104	);
105	}	105	}

lib/std/os/linux/arm64.zig+15-15

...	@@ -1,36 +1,36 @@	...	@@ -1,36 +1,36 @@
1	usingnamespace @import("../bits.zig");	1	usingnamespace @import("../bits.zig");
2		2
3	pub fn syscall0(number: usize) usize {	3	pub fn syscall0(number: SYS) usize {
4	return asm volatile ("svc #0"	4	return asm volatile ("svc #0"
5	: [ret] "={x0}" (-> usize)	5	: [ret] "={x0}" (-> usize)
6	: [number] "{x8}" (number)	6	: [number] "{x8}" (@enumToInt(number))
7	: "memory", "cc"	7	: "memory", "cc"
8	);	8	);
9	}	9	}
10		10
11	pub fn syscall1(number: usize, arg1: usize) usize {	11	pub fn syscall1(number: SYS, arg1: usize) usize {
12	return asm volatile ("svc #0"	12	return asm volatile ("svc #0"
13	: [ret] "={x0}" (-> usize)	13	: [ret] "={x0}" (-> usize)
14	: [number] "{x8}" (number),	14	: [number] "{x8}" (@enumToInt(number)),
15	[arg1] "{x0}" (arg1)	15	[arg1] "{x0}" (arg1)
16	: "memory", "cc"	16	: "memory", "cc"
17	);	17	);
18	}	18	}
19		19
20	pub fn syscall2(number: usize, arg1: usize, arg2: usize) usize {	20	pub fn syscall2(number: SYS, arg1: usize, arg2: usize) usize {
21	return asm volatile ("svc #0"	21	return asm volatile ("svc #0"
22	: [ret] "={x0}" (-> usize)	22	: [ret] "={x0}" (-> usize)
23	: [number] "{x8}" (number),	23	: [number] "{x8}" (@enumToInt(number)),
24	[arg1] "{x0}" (arg1),	24	[arg1] "{x0}" (arg1),
25	[arg2] "{x1}" (arg2)	25	[arg2] "{x1}" (arg2)
26	: "memory", "cc"	26	: "memory", "cc"
27	);	27	);
28	}	28	}
29		29
30	pub fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) usize {	30	pub fn syscall3(number: SYS, arg1: usize, arg2: usize, arg3: usize) usize {
31	return asm volatile ("svc #0"	31	return asm volatile ("svc #0"
32	: [ret] "={x0}" (-> usize)	32	: [ret] "={x0}" (-> usize)
33	: [number] "{x8}" (number),	33	: [number] "{x8}" (@enumToInt(number)),
34	[arg1] "{x0}" (arg1),	34	[arg1] "{x0}" (arg1),
35	[arg2] "{x1}" (arg2),	35	[arg2] "{x1}" (arg2),
36	[arg3] "{x2}" (arg3)	36	[arg3] "{x2}" (arg3)
...	@@ -38,10 +38,10 @@ pub fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) usize {	...	@@ -38,10 +38,10 @@ pub fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) usize {
38	);	38	);
39	}	39	}
40		40
41	pub fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usize) usize {	41	pub fn syscall4(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize) usize {
42	return asm volatile ("svc #0"	42	return asm volatile ("svc #0"
43	: [ret] "={x0}" (-> usize)	43	: [ret] "={x0}" (-> usize)
44	: [number] "{x8}" (number),	44	: [number] "{x8}" (@enumToInt(number)),
45	[arg1] "{x0}" (arg1),	45	[arg1] "{x0}" (arg1),
46	[arg2] "{x1}" (arg2),	46	[arg2] "{x1}" (arg2),
47	[arg3] "{x2}" (arg3),	47	[arg3] "{x2}" (arg3),
...	@@ -50,10 +50,10 @@ pub fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz	...	@@ -50,10 +50,10 @@ pub fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz
50	);	50	);
51	}	51	}
52		52
53	pub fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usize, arg5: usize) usize {	53	pub fn syscall5(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize, arg5: usize) usize {
54	return asm volatile ("svc #0"	54	return asm volatile ("svc #0"
55	: [ret] "={x0}" (-> usize)	55	: [ret] "={x0}" (-> usize)
56	: [number] "{x8}" (number),	56	: [number] "{x8}" (@enumToInt(number)),
57	[arg1] "{x0}" (arg1),	57	[arg1] "{x0}" (arg1),
58	[arg2] "{x1}" (arg2),	58	[arg2] "{x1}" (arg2),
59	[arg3] "{x2}" (arg3),	59	[arg3] "{x2}" (arg3),
...	@@ -64,7 +64,7 @@ pub fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz	...	@@ -64,7 +64,7 @@ pub fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz
64	}	64	}
65		65
66	pub fn syscall6(	66	pub fn syscall6(
67	number: usize,	67	number: SYS,
68	arg1: usize,	68	arg1: usize,
69	arg2: usize,	69	arg2: usize,
70	arg3: usize,	70	arg3: usize,
...	@@ -74,7 +74,7 @@ pub fn syscall6(	...	@@ -74,7 +74,7 @@ pub fn syscall6(
74	) usize {	74	) usize {
75	return asm volatile ("svc #0"	75	return asm volatile ("svc #0"
76	: [ret] "={x0}" (-> usize)	76	: [ret] "={x0}" (-> usize)
77	: [number] "{x8}" (number),	77	: [number] "{x8}" (@enumToInt(number)),
78	[arg1] "{x0}" (arg1),	78	[arg1] "{x0}" (arg1),
79	[arg2] "{x1}" (arg2),	79	[arg2] "{x1}" (arg2),
80	[arg3] "{x2}" (arg3),	80	[arg3] "{x2}" (arg3),
...	@@ -93,7 +93,7 @@ pub const restore = restore_rt;	...	@@ -93,7 +93,7 @@ pub const restore = restore_rt;
93	pub fn restore_rt() callconv(.Naked) void {	93	pub fn restore_rt() callconv(.Naked) void {
94	return asm volatile ("svc #0"	94	return asm volatile ("svc #0"
95	:	95	:
96	: [number] "{x8}" (@as(usize, SYS_rt_sigreturn))	96	: [number] "{x8}" (@enumToInt(SYS.rt_sigreturn))
97	: "memory", "cc"	97	: "memory", "cc"
98	);	98	);
99	}	99	}

lib/std/os/linux/i386.zig+17-17

...	@@ -1,36 +1,36 @@	...	@@ -1,36 +1,36 @@
1	usingnamespace @import("../bits.zig");	1	usingnamespace @import("../bits.zig");
2		2
3	pub fn syscall0(number: usize) usize {	3	pub fn syscall0(number: SYS) usize {
4	return asm volatile ("int $0x80"	4	return asm volatile ("int $0x80"
5	: [ret] "={eax}" (-> usize)	5	: [ret] "={eax}" (-> usize)
6	: [number] "{eax}" (number)	6	: [number] "{eax}" (@enumToInt(number))
7	: "memory"	7	: "memory"
8	);	8	);
9	}	9	}
10		10
11	pub fn syscall1(number: usize, arg1: usize) usize {	11	pub fn syscall1(number: SYS, arg1: usize) usize {
12	return asm volatile ("int $0x80"	12	return asm volatile ("int $0x80"
13	: [ret] "={eax}" (-> usize)	13	: [ret] "={eax}" (-> usize)
14	: [number] "{eax}" (number),	14	: [number] "{eax}" (@enumToInt(number)),
15	[arg1] "{ebx}" (arg1)	15	[arg1] "{ebx}" (arg1)
16	: "memory"	16	: "memory"
17	);	17	);
18	}	18	}
19		19
20	pub fn syscall2(number: usize, arg1: usize, arg2: usize) usize {	20	pub fn syscall2(number: SYS, arg1: usize, arg2: usize) usize {
21	return asm volatile ("int $0x80"	21	return asm volatile ("int $0x80"
22	: [ret] "={eax}" (-> usize)	22	: [ret] "={eax}" (-> usize)
23	: [number] "{eax}" (number),	23	: [number] "{eax}" (@enumToInt(number)),
24	[arg1] "{ebx}" (arg1),	24	[arg1] "{ebx}" (arg1),
25	[arg2] "{ecx}" (arg2)	25	[arg2] "{ecx}" (arg2)
26	: "memory"	26	: "memory"
27	);	27	);
28	}	28	}
29		29
30	pub fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) usize {	30	pub fn syscall3(number: SYS, arg1: usize, arg2: usize, arg3: usize) usize {
31	return asm volatile ("int $0x80"	31	return asm volatile ("int $0x80"
32	: [ret] "={eax}" (-> usize)	32	: [ret] "={eax}" (-> usize)
33	: [number] "{eax}" (number),	33	: [number] "{eax}" (@enumToInt(number)),
34	[arg1] "{ebx}" (arg1),	34	[arg1] "{ebx}" (arg1),
35	[arg2] "{ecx}" (arg2),	35	[arg2] "{ecx}" (arg2),
36	[arg3] "{edx}" (arg3)	36	[arg3] "{edx}" (arg3)
...	@@ -38,10 +38,10 @@ pub fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) usize {	...	@@ -38,10 +38,10 @@ pub fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) usize {
38	);	38	);
39	}	39	}
40		40
41	pub fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usize) usize {	41	pub fn syscall4(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize) usize {
42	return asm volatile ("int $0x80"	42	return asm volatile ("int $0x80"
43	: [ret] "={eax}" (-> usize)	43	: [ret] "={eax}" (-> usize)
44	: [number] "{eax}" (number),	44	: [number] "{eax}" (@enumToInt(number)),
45	[arg1] "{ebx}" (arg1),	45	[arg1] "{ebx}" (arg1),
46	[arg2] "{ecx}" (arg2),	46	[arg2] "{ecx}" (arg2),
47	[arg3] "{edx}" (arg3),	47	[arg3] "{edx}" (arg3),
...	@@ -50,10 +50,10 @@ pub fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz	...	@@ -50,10 +50,10 @@ pub fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz
50	);	50	);
51	}	51	}
52		52
53	pub fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usize, arg5: usize) usize {	53	pub fn syscall5(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize, arg5: usize) usize {
54	return asm volatile ("int $0x80"	54	return asm volatile ("int $0x80"
55	: [ret] "={eax}" (-> usize)	55	: [ret] "={eax}" (-> usize)
56	: [number] "{eax}" (number),	56	: [number] "{eax}" (@enumToInt(number)),
57	[arg1] "{ebx}" (arg1),	57	[arg1] "{ebx}" (arg1),
58	[arg2] "{ecx}" (arg2),	58	[arg2] "{ecx}" (arg2),
59	[arg3] "{edx}" (arg3),	59	[arg3] "{edx}" (arg3),
...	@@ -64,7 +64,7 @@ pub fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz	...	@@ -64,7 +64,7 @@ pub fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz
64	}	64	}
65		65
66	pub fn syscall6(	66	pub fn syscall6(
67	number: usize,	67	number: SYS,
68	arg1: usize,	68	arg1: usize,
69	arg2: usize,	69	arg2: usize,
70	arg3: usize,	70	arg3: usize,
...	@@ -84,7 +84,7 @@ pub fn syscall6(	...	@@ -84,7 +84,7 @@ pub fn syscall6(
84	\\ pop %%ebp	84	\\ pop %%ebp
85	\\ add $4, %%esp	85	\\ add $4, %%esp
86	: [ret] "={eax}" (-> usize)	86	: [ret] "={eax}" (-> usize)
87	: [number] "{eax}" (number),	87	: [number] "{eax}" (@enumToInt(number)),
88	[arg1] "{ebx}" (arg1),	88	[arg1] "{ebx}" (arg1),
89	[arg2] "{ecx}" (arg2),	89	[arg2] "{ecx}" (arg2),
90	[arg3] "{edx}" (arg3),	90	[arg3] "{edx}" (arg3),
...	@@ -98,7 +98,7 @@ pub fn syscall6(	...	@@ -98,7 +98,7 @@ pub fn syscall6(
98	pub fn socketcall(call: usize, args: [*]usize) usize {	98	pub fn socketcall(call: usize, args: [*]usize) usize {
99	return asm volatile ("int $0x80"	99	return asm volatile ("int $0x80"
100	: [ret] "={eax}" (-> usize)	100	: [ret] "={eax}" (-> usize)
101	: [number] "{eax}" (@as(usize, SYS_socketcall)),	101	: [number] "{eax}" (@enumToInt(SYS.socketcall)),
102	[arg1] "{ebx}" (call),	102	[arg1] "{ebx}" (call),
103	[arg2] "{ecx}" (@ptrToInt(args))	103	[arg2] "{ecx}" (@ptrToInt(args))
104	: "memory"	104	: "memory"
...	@@ -111,7 +111,7 @@ pub extern fn clone(func: extern fn (arg: usize) u8, stack: usize, flags: u32, a	...	@@ -111,7 +111,7 @@ pub extern fn clone(func: extern fn (arg: usize) u8, stack: usize, flags: u32, a
111	pub fn restore() callconv(.Naked) void {	111	pub fn restore() callconv(.Naked) void {
112	return asm volatile ("int $0x80"	112	return asm volatile ("int $0x80"
113	:	113	:
114	: [number] "{eax}" (@as(usize, SYS_sigreturn))	114	: [number] "{eax}" (@enumToInt(SYS.sigreturn))
115	: "memory"	115	: "memory"
116	);	116	);
117	}	117	}
...	@@ -119,7 +119,7 @@ pub fn restore() callconv(.Naked) void {	...	@@ -119,7 +119,7 @@ pub fn restore() callconv(.Naked) void {
119	pub fn restore_rt() callconv(.Naked) void {	119	pub fn restore_rt() callconv(.Naked) void {
120	return asm volatile ("int $0x80"	120	return asm volatile ("int $0x80"
121	:	121	:
122	: [number] "{eax}" (@as(usize, SYS_rt_sigreturn))	122	: [number] "{eax}" (@enumToInt(SYS.rt_sigreturn))
123	: "memory"	123	: "memory"
124	);	124	);
125	}	125	}

lib/std/os/linux/mipsel.zig+17-17

...	@@ -1,13 +1,13 @@	...	@@ -1,13 +1,13 @@
1	usingnamespace @import("../bits.zig");	1	usingnamespace @import("../bits.zig");
2		2
3	pub fn syscall0(number: usize) usize {	3	pub fn syscall0(number: SYS) usize {
4	return asm volatile (	4	return asm volatile (
5	\\ syscall	5	\\ syscall
6	\\ blez $7, 1f	6	\\ blez $7, 1f
7	\\ subu $2, $0, $2	7	\\ subu $2, $0, $2
8	\\ 1:	8	\\ 1:
9	: [ret] "={$2}" (-> usize)	9	: [ret] "={$2}" (-> usize)
10	: [number] "{$2}" (number)	10	: [number] "{$2}" (@enumToInt(number))
11	: "memory", "cc", "$7"	11	: "memory", "cc", "$7"
12	);	12	);
13	}	13	}
...	@@ -26,46 +26,46 @@ pub fn syscall_pipe(fd: *[2]i32) usize {	...	@@ -26,46 +26,46 @@ pub fn syscall_pipe(fd: *[2]i32) usize {
26	\\ sw $3, 4($4)	26	\\ sw $3, 4($4)
27	\\ 2:	27	\\ 2:
28	: [ret] "={$2}" (-> usize)	28	: [ret] "={$2}" (-> usize)
29	: [number] "{$2}" (@as(usize, SYS_pipe))	29	: [number] "{$2}" (@enumToInt(SYS.pipe))
30	: "memory", "cc", "$7"	30	: "memory", "cc", "$7"
31	);	31	);
32	}	32	}
33		33
34	pub fn syscall1(number: usize, arg1: usize) usize {	34	pub fn syscall1(number: SYS, arg1: usize) usize {
35	return asm volatile (	35	return asm volatile (
36	\\ syscall	36	\\ syscall
37	\\ blez $7, 1f	37	\\ blez $7, 1f
38	\\ subu $2, $0, $2	38	\\ subu $2, $0, $2
39	\\ 1:	39	\\ 1:
40	: [ret] "={$2}" (-> usize)	40	: [ret] "={$2}" (-> usize)
41	: [number] "{$2}" (number),	41	: [number] "{$2}" (@enumToInt(number)),
42	[arg1] "{$4}" (arg1)	42	[arg1] "{$4}" (arg1)
43	: "memory", "cc", "$7"	43	: "memory", "cc", "$7"
44	);	44	);
45	}	45	}
46		46
47	pub fn syscall2(number: usize, arg1: usize, arg2: usize) usize {	47	pub fn syscall2(number: SYS, arg1: usize, arg2: usize) usize {
48	return asm volatile (	48	return asm volatile (
49	\\ syscall	49	\\ syscall
50	\\ blez $7, 1f	50	\\ blez $7, 1f
51	\\ subu $2, $0, $2	51	\\ subu $2, $0, $2
52	\\ 1:	52	\\ 1:
53	: [ret] "={$2}" (-> usize)	53	: [ret] "={$2}" (-> usize)
54	: [number] "{$2}" (number),	54	: [number] "{$2}" (@enumToInt(number)),
55	[arg1] "{$4}" (arg1),	55	[arg1] "{$4}" (arg1),
56	[arg2] "{$5}" (arg2)	56	[arg2] "{$5}" (arg2)
57	: "memory", "cc", "$7"	57	: "memory", "cc", "$7"
58	);	58	);
59	}	59	}
60		60
61	pub fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) usize {	61	pub fn syscall3(number: SYS, arg1: usize, arg2: usize, arg3: usize) usize {
62	return asm volatile (	62	return asm volatile (
63	\\ syscall	63	\\ syscall
64	\\ blez $7, 1f	64	\\ blez $7, 1f
65	\\ subu $2, $0, $2	65	\\ subu $2, $0, $2
66	\\ 1:	66	\\ 1:
67	: [ret] "={$2}" (-> usize)	67	: [ret] "={$2}" (-> usize)
68	: [number] "{$2}" (number),	68	: [number] "{$2}" (@enumToInt(number)),
69	[arg1] "{$4}" (arg1),	69	[arg1] "{$4}" (arg1),
70	[arg2] "{$5}" (arg2),	70	[arg2] "{$5}" (arg2),
71	[arg3] "{$6}" (arg3)	71	[arg3] "{$6}" (arg3)
...	@@ -73,14 +73,14 @@ pub fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) usize {	...	@@ -73,14 +73,14 @@ pub fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) usize {
73	);	73	);
74	}	74	}
75		75
76	pub fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usize) usize {	76	pub fn syscall4(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize) usize {
77	return asm volatile (	77	return asm volatile (
78	\\ syscall	78	\\ syscall
79	\\ blez $7, 1f	79	\\ blez $7, 1f
80	\\ subu $2, $0, $2	80	\\ subu $2, $0, $2
81	\\ 1:	81	\\ 1:
82	: [ret] "={$2}" (-> usize)	82	: [ret] "={$2}" (-> usize)
83	: [number] "{$2}" (number),	83	: [number] "{$2}" (@enumToInt(number)),
84	[arg1] "{$4}" (arg1),	84	[arg1] "{$4}" (arg1),
85	[arg2] "{$5}" (arg2),	85	[arg2] "{$5}" (arg2),
86	[arg3] "{$6}" (arg3),	86	[arg3] "{$6}" (arg3),
...	@@ -89,7 +89,7 @@ pub fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz	...	@@ -89,7 +89,7 @@ pub fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz
89	);	89	);
90	}	90	}
91		91
92	pub fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usize, arg5: usize) usize {	92	pub fn syscall5(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize, arg5: usize) usize {
93	return asm volatile (	93	return asm volatile (
94	\\ .set noat	94	\\ .set noat
95	\\ subu $sp, $sp, 24	95	\\ subu $sp, $sp, 24
...	@@ -100,7 +100,7 @@ pub fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz	...	@@ -100,7 +100,7 @@ pub fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz
100	\\ subu $2, $0, $2	100	\\ subu $2, $0, $2
101	\\ 1:	101	\\ 1:
102	: [ret] "={$2}" (-> usize)	102	: [ret] "={$2}" (-> usize)
103	: [number] "{$2}" (number),	103	: [number] "{$2}" (@enumToInt(number)),
104	[arg1] "{$4}" (arg1),	104	[arg1] "{$4}" (arg1),
105	[arg2] "{$5}" (arg2),	105	[arg2] "{$5}" (arg2),
106	[arg3] "{$6}" (arg3),	106	[arg3] "{$6}" (arg3),
...	@@ -111,7 +111,7 @@ pub fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz	...	@@ -111,7 +111,7 @@ pub fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz
111	}	111	}
112		112
113	pub fn syscall6(	113	pub fn syscall6(
114	number: usize,	114	number: SYS,
115	arg1: usize,	115	arg1: usize,
116	arg2: usize,	116	arg2: usize,
117	arg3: usize,	117	arg3: usize,
...	@@ -130,7 +130,7 @@ pub fn syscall6(	...	@@ -130,7 +130,7 @@ pub fn syscall6(
130	\\ subu $2, $0, $2	130	\\ subu $2, $0, $2
131	\\ 1:	131	\\ 1:
132	: [ret] "={$2}" (-> usize)	132	: [ret] "={$2}" (-> usize)
133	: [number] "{$2}" (number),	133	: [number] "{$2}" (@enumToInt(number)),
134	[arg1] "{$4}" (arg1),	134	[arg1] "{$4}" (arg1),
135	[arg2] "{$5}" (arg2),	135	[arg2] "{$5}" (arg2),
136	[arg3] "{$6}" (arg3),	136	[arg3] "{$6}" (arg3),
...	@@ -147,7 +147,7 @@ pub extern fn clone(func: extern fn (arg: usize) u8, stack: usize, flags: u32, a	...	@@ -147,7 +147,7 @@ pub extern fn clone(func: extern fn (arg: usize) u8, stack: usize, flags: u32, a
147	pub fn restore() callconv(.Naked) void {	147	pub fn restore() callconv(.Naked) void {
148	return asm volatile ("syscall"	148	return asm volatile ("syscall"
149	:	149	:
150	: [number] "{$2}" (@as(usize, SYS_sigreturn))	150	: [number] "{$2}" (@enumToInt(SYS.sigreturn))
151	: "memory", "cc", "$7"	151	: "memory", "cc", "$7"
152	);	152	);
153	}	153	}
...	@@ -155,7 +155,7 @@ pub fn restore() callconv(.Naked) void {	...	@@ -155,7 +155,7 @@ pub fn restore() callconv(.Naked) void {
155	pub fn restore_rt() callconv(.Naked) void {	155	pub fn restore_rt() callconv(.Naked) void {
156	return asm volatile ("syscall"	156	return asm volatile ("syscall"
157	:	157	:
158	: [number] "{$2}" (@as(usize, SYS_rt_sigreturn))	158	: [number] "{$2}" (@enumToInt(SYS.rt_sigreturn))
159	: "memory", "cc", "$7"	159	: "memory", "cc", "$7"
160	);	160	);
161	}	161	}

lib/std/os/linux/riscv64.zig+15-15

...	@@ -1,36 +1,36 @@	...	@@ -1,36 +1,36 @@
1	usingnamespace @import("../bits.zig");	1	usingnamespace @import("../bits.zig");
2		2
3	pub fn syscall0(number: usize) usize {	3	pub fn syscall0(number: SYS) usize {
4	return asm volatile ("ecall"	4	return asm volatile ("ecall"
5	: [ret] "={x10}" (-> usize)	5	: [ret] "={x10}" (-> usize)
6	: [number] "{x17}" (number)	6	: [number] "{x17}" (@enumToInt(number))
7	: "memory"	7	: "memory"
8	);	8	);
9	}	9	}
10		10
11	pub fn syscall1(number: usize, arg1: usize) usize {	11	pub fn syscall1(number: SYS, arg1: usize) usize {
12	return asm volatile ("ecall"	12	return asm volatile ("ecall"
13	: [ret] "={x10}" (-> usize)	13	: [ret] "={x10}" (-> usize)
14	: [number] "{x17}" (number),	14	: [number] "{x17}" (@enumToInt(number)),
15	[arg1] "{x10}" (arg1)	15	[arg1] "{x10}" (arg1)
16	: "memory"	16	: "memory"
17	);	17	);
18	}	18	}
19		19
20	pub fn syscall2(number: usize, arg1: usize, arg2: usize) usize {	20	pub fn syscall2(number: SYS, arg1: usize, arg2: usize) usize {
21	return asm volatile ("ecall"	21	return asm volatile ("ecall"
22	: [ret] "={x10}" (-> usize)	22	: [ret] "={x10}" (-> usize)
23	: [number] "{x17}" (number),	23	: [number] "{x17}" (@enumToInt(number)),
24	[arg1] "{x10}" (arg1),	24	[arg1] "{x10}" (arg1),
25	[arg2] "{x11}" (arg2)	25	[arg2] "{x11}" (arg2)
26	: "memory"	26	: "memory"
27	);	27	);
28	}	28	}
29		29
30	pub fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) usize {	30	pub fn syscall3(number: SYS, arg1: usize, arg2: usize, arg3: usize) usize {
31	return asm volatile ("ecall"	31	return asm volatile ("ecall"
32	: [ret] "={x10}" (-> usize)	32	: [ret] "={x10}" (-> usize)
33	: [number] "{x17}" (number),	33	: [number] "{x17}" (@enumToInt(number)),
34	[arg1] "{x10}" (arg1),	34	[arg1] "{x10}" (arg1),
35	[arg2] "{x11}" (arg2),	35	[arg2] "{x11}" (arg2),
36	[arg3] "{x12}" (arg3)	36	[arg3] "{x12}" (arg3)
...	@@ -38,10 +38,10 @@ pub fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) usize {	...	@@ -38,10 +38,10 @@ pub fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) usize {
38	);	38	);
39	}	39	}
40		40
41	pub fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usize) usize {	41	pub fn syscall4(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize) usize {
42	return asm volatile ("ecall"	42	return asm volatile ("ecall"
43	: [ret] "={x10}" (-> usize)	43	: [ret] "={x10}" (-> usize)
44	: [number] "{x17}" (number),	44	: [number] "{x17}" (@enumToInt(number)),
45	[arg1] "{x10}" (arg1),	45	[arg1] "{x10}" (arg1),
46	[arg2] "{x11}" (arg2),	46	[arg2] "{x11}" (arg2),
47	[arg3] "{x12}" (arg3),	47	[arg3] "{x12}" (arg3),
...	@@ -50,10 +50,10 @@ pub fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz	...	@@ -50,10 +50,10 @@ pub fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz
50	);	50	);
51	}	51	}
52		52
53	pub fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usize, arg5: usize) usize {	53	pub fn syscall5(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize, arg5: usize) usize {
54	return asm volatile ("ecall"	54	return asm volatile ("ecall"
55	: [ret] "={x10}" (-> usize)	55	: [ret] "={x10}" (-> usize)
56	: [number] "{x17}" (number),	56	: [number] "{x17}" (@enumToInt(number)),
57	[arg1] "{x10}" (arg1),	57	[arg1] "{x10}" (arg1),
58	[arg2] "{x11}" (arg2),	58	[arg2] "{x11}" (arg2),
59	[arg3] "{x12}" (arg3),	59	[arg3] "{x12}" (arg3),
...	@@ -64,7 +64,7 @@ pub fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz	...	@@ -64,7 +64,7 @@ pub fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz
64	}	64	}
65		65
66	pub fn syscall6(	66	pub fn syscall6(
67	number: usize,	67	number: SYS,
68	arg1: usize,	68	arg1: usize,
69	arg2: usize,	69	arg2: usize,
70	arg3: usize,	70	arg3: usize,
...	@@ -74,7 +74,7 @@ pub fn syscall6(	...	@@ -74,7 +74,7 @@ pub fn syscall6(
74	) usize {	74	) usize {
75	return asm volatile ("ecall"	75	return asm volatile ("ecall"
76	: [ret] "={x10}" (-> usize)	76	: [ret] "={x10}" (-> usize)
77	: [number] "{x17}" (number),	77	: [number] "{x17}" (@enumToInt(number)),
78	[arg1] "{x10}" (arg1),	78	[arg1] "{x10}" (arg1),
79	[arg2] "{x11}" (arg2),	79	[arg2] "{x11}" (arg2),
80	[arg3] "{x12}" (arg3),	80	[arg3] "{x12}" (arg3),
...	@@ -92,7 +92,7 @@ pub const restore = restore_rt;	...	@@ -92,7 +92,7 @@ pub const restore = restore_rt;
92	pub fn restore_rt() callconv(.Naked) void {	92	pub fn restore_rt() callconv(.Naked) void {
93	return asm volatile ("ecall"	93	return asm volatile ("ecall"
94	:	94	:
95	: [number] "{x17}" (@as(usize, SYS_rt_sigreturn))	95	: [number] "{x17}" (@enumToInt(SYS.rt_sigreturn))
96	: "memory"	96	: "memory"
97	);	97	);
98	}	98	}

lib/std/os/linux/tls.zig+4-4

...	@@ -122,7 +122,7 @@ pub fn setThreadPointer(addr: usize) void {	...	@@ -122,7 +122,7 @@ pub fn setThreadPointer(addr: usize) void {
122	.seg_not_present = 0,	122	.seg_not_present = 0,
123	.useable = 1,	123	.useable = 1,
124	};	124	};
125	const rc = std.os.linux.syscall1(std.os.linux.SYS_set_thread_area, @ptrToInt(&user_desc));	125	const rc = std.os.linux.syscall1(.set_thread_area, @ptrToInt(&user_desc));
126	assert(rc == 0);	126	assert(rc == 0);
127		127
128	const gdt_entry_number = user_desc.entry_number;	128	const gdt_entry_number = user_desc.entry_number;
...	@@ -135,7 +135,7 @@ pub fn setThreadPointer(addr: usize) void {	...	@@ -135,7 +135,7 @@ pub fn setThreadPointer(addr: usize) void {
135	);	135	);
136	},	136	},
137	.x86_64 => {	137	.x86_64 => {
138	const rc = std.os.linux.syscall2(std.os.linux.SYS_arch_prctl, std.os.linux.ARCH_SET_FS, addr);	138	const rc = std.os.linux.syscall2(.arch_prctl, std.os.linux.ARCH_SET_FS, addr);
139	assert(rc == 0);	139	assert(rc == 0);
140	},	140	},
141	.aarch64 => {	141	.aarch64 => {
...	@@ -146,7 +146,7 @@ pub fn setThreadPointer(addr: usize) void {	...	@@ -146,7 +146,7 @@ pub fn setThreadPointer(addr: usize) void {
146	);	146	);
147	},	147	},
148	.arm => {	148	.arm => {
149	const rc = std.os.linux.syscall1(std.os.linux.SYS_set_tls, addr);	149	const rc = std.os.linux.syscall1(.set_tls, addr);
150	assert(rc == 0);	150	assert(rc == 0);
151	},	151	},
152	.riscv64 => {	152	.riscv64 => {
...	@@ -157,7 +157,7 @@ pub fn setThreadPointer(addr: usize) void {	...	@@ -157,7 +157,7 @@ pub fn setThreadPointer(addr: usize) void {
157	);	157	);
158	},	158	},
159	.mipsel => {	159	.mipsel => {
160	const rc = std.os.linux.syscall1(std.os.linux.SYS_set_thread_area, addr);	160	const rc = std.os.linux.syscall1(.set_thread_area, addr);
161	assert(rc == 0);	161	assert(rc == 0);
162	},	162	},
163	else => @compileError("Unsupported architecture"),	163	else => @compileError("Unsupported architecture"),

lib/std/os/linux/vdso.zig+3-3

lib/std/os/linux/x86_64.zig+15-15

...	@@ -1,36 +1,36 @@	...	@@ -1,36 +1,36 @@
1	usingnamespace @import("../bits.zig");	1	usingnamespace @import("../bits.zig");
2		2
3	pub fn syscall0(number: usize) usize {	3	pub fn syscall0(number: SYS) usize {
4	return asm volatile ("syscall"	4	return asm volatile ("syscall"
5	: [ret] "={rax}" (-> usize)	5	: [ret] "={rax}" (-> usize)
6	: [number] "{rax}" (number)	6	: [number] "{rax}" (@enumToInt(number))
7	: "rcx", "r11", "memory"	7	: "rcx", "r11", "memory"
8	);	8	);
9	}	9	}
10		10
11	pub fn syscall1(number: usize, arg1: usize) usize {	11	pub fn syscall1(number: SYS, arg1: usize) usize {
12	return asm volatile ("syscall"	12	return asm volatile ("syscall"
13	: [ret] "={rax}" (-> usize)	13	: [ret] "={rax}" (-> usize)
14	: [number] "{rax}" (number),	14	: [number] "{rax}" (@enumToInt(number)),
15	[arg1] "{rdi}" (arg1)	15	[arg1] "{rdi}" (arg1)
16	: "rcx", "r11", "memory"	16	: "rcx", "r11", "memory"
17	);	17	);
18	}	18	}
19		19
20	pub fn syscall2(number: usize, arg1: usize, arg2: usize) usize {	20	pub fn syscall2(number: SYS, arg1: usize, arg2: usize) usize {
21	return asm volatile ("syscall"	21	return asm volatile ("syscall"
22	: [ret] "={rax}" (-> usize)	22	: [ret] "={rax}" (-> usize)
23	: [number] "{rax}" (number),	23	: [number] "{rax}" (@enumToInt(number)),
24	[arg1] "{rdi}" (arg1),	24	[arg1] "{rdi}" (arg1),
25	[arg2] "{rsi}" (arg2)	25	[arg2] "{rsi}" (arg2)
26	: "rcx", "r11", "memory"	26	: "rcx", "r11", "memory"
27	);	27	);
28	}	28	}
29		29
30	pub fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) usize {	30	pub fn syscall3(number: SYS, arg1: usize, arg2: usize, arg3: usize) usize {
31	return asm volatile ("syscall"	31	return asm volatile ("syscall"
32	: [ret] "={rax}" (-> usize)	32	: [ret] "={rax}" (-> usize)
33	: [number] "{rax}" (number),	33	: [number] "{rax}" (@enumToInt(number)),
34	[arg1] "{rdi}" (arg1),	34	[arg1] "{rdi}" (arg1),
35	[arg2] "{rsi}" (arg2),	35	[arg2] "{rsi}" (arg2),
36	[arg3] "{rdx}" (arg3)	36	[arg3] "{rdx}" (arg3)
...	@@ -38,10 +38,10 @@ pub fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) usize {	...	@@ -38,10 +38,10 @@ pub fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) usize {
38	);	38	);
39	}	39	}
40		40
41	pub fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usize) usize {	41	pub fn syscall4(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize) usize {
42	return asm volatile ("syscall"	42	return asm volatile ("syscall"
43	: [ret] "={rax}" (-> usize)	43	: [ret] "={rax}" (-> usize)
44	: [number] "{rax}" (number),	44	: [number] "{rax}" (@enumToInt(number)),
45	[arg1] "{rdi}" (arg1),	45	[arg1] "{rdi}" (arg1),
46	[arg2] "{rsi}" (arg2),	46	[arg2] "{rsi}" (arg2),
47	[arg3] "{rdx}" (arg3),	47	[arg3] "{rdx}" (arg3),
...	@@ -50,10 +50,10 @@ pub fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz	...	@@ -50,10 +50,10 @@ pub fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz
50	);	50	);
51	}	51	}
52		52
53	pub fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usize, arg5: usize) usize {	53	pub fn syscall5(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize, arg5: usize) usize {
54	return asm volatile ("syscall"	54	return asm volatile ("syscall"
55	: [ret] "={rax}" (-> usize)	55	: [ret] "={rax}" (-> usize)
56	: [number] "{rax}" (number),	56	: [number] "{rax}" (@enumToInt(number)),
57	[arg1] "{rdi}" (arg1),	57	[arg1] "{rdi}" (arg1),
58	[arg2] "{rsi}" (arg2),	58	[arg2] "{rsi}" (arg2),
59	[arg3] "{rdx}" (arg3),	59	[arg3] "{rdx}" (arg3),
...	@@ -64,7 +64,7 @@ pub fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz	...	@@ -64,7 +64,7 @@ pub fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usiz
64	}	64	}
65		65
66	pub fn syscall6(	66	pub fn syscall6(
67	number: usize,	67	number: SYS,
68	arg1: usize,	68	arg1: usize,
69	arg2: usize,	69	arg2: usize,
70	arg3: usize,	70	arg3: usize,
...	@@ -74,7 +74,7 @@ pub fn syscall6(	...	@@ -74,7 +74,7 @@ pub fn syscall6(
74	) usize {	74	) usize {
75	return asm volatile ("syscall"	75	return asm volatile ("syscall"
76	: [ret] "={rax}" (-> usize)	76	: [ret] "={rax}" (-> usize)
77	: [number] "{rax}" (number),	77	: [number] "{rax}" (@enumToInt(number)),
78	[arg1] "{rdi}" (arg1),	78	[arg1] "{rdi}" (arg1),
79	[arg2] "{rsi}" (arg2),	79	[arg2] "{rsi}" (arg2),
80	[arg3] "{rdx}" (arg3),	80	[arg3] "{rdx}" (arg3),
...	@@ -93,7 +93,7 @@ pub const restore = restore_rt;	...	@@ -93,7 +93,7 @@ pub const restore = restore_rt;
93	pub fn restore_rt() callconv(.Naked) void {	93	pub fn restore_rt() callconv(.Naked) void {
94	return asm volatile ("syscall"	94	return asm volatile ("syscall"
95	:	95	:
96	: [number] "{rax}" (@as(usize, SYS_rt_sigreturn))	96	: [number] "{rax}" (@enumToInt(SYS.rt_sigreturn))
97	: "rcx", "r11", "memory"	97	: "rcx", "r11", "memory"
98	);	98	);
99	}	99	}

lib/std/os/test.zig+8-8

lib/std/os/windows.zig+5-5

lib/std/pdb.zig+1-1

...	@@ -649,7 +649,7 @@ const MsfStream = struct {	...	@@ -649,7 +649,7 @@ const MsfStream = struct {
649	while (true) {	649	while (true) {
650	const byte = try self.inStream().readByte();	650	const byte = try self.inStream().readByte();
651	if (byte == 0) {	651	if (byte == 0) {
652	return list.toSlice();	652	return list.span();
653	}	653	}
654	try list.append(byte);	654	try list.append(byte);
655	}	655	}

lib/std/process.zig+7-7

...	@@ -83,7 +83,7 @@ pub fn getEnvMap(allocator: *Allocator) !BufMap {	...	@@ -83,7 +83,7 @@ pub fn getEnvMap(allocator: *Allocator) !BufMap {
83		83
84	for (environ) \|env\| {	84	for (environ) \|env\| {
85	if (env) \|ptr\| {	85	if (env) \|ptr\| {
86	const pair = mem.toSlice(u8, ptr);	86	const pair = mem.spanZ(ptr);
87	var parts = mem.separate(pair, "=");	87	var parts = mem.separate(pair, "=");
88	const key = parts.next().?;	88	const key = parts.next().?;
89	const value = parts.next().?;	89	const value = parts.next().?;
...	@@ -176,7 +176,7 @@ pub const ArgIteratorPosix = struct {	...	@@ -176,7 +176,7 @@ pub const ArgIteratorPosix = struct {
176		176
177	const s = os.argv[self.index];	177	const s = os.argv[self.index];
178	self.index += 1;	178	self.index += 1;
179	return mem.toSlice(u8, s);	179	return mem.spanZ(s);
180	}	180	}
181		181
182	pub fn skip(self: *ArgIteratorPosix) bool {	182	pub fn skip(self: *ArgIteratorPosix) bool {
...	@@ -401,7 +401,7 @@ pub fn argsAlloc(allocator: *mem.Allocator) ![][]u8 {	...	@@ -401,7 +401,7 @@ pub fn argsAlloc(allocator: *mem.Allocator) ![][]u8 {
401		401
402	var i: usize = 0;	402	var i: usize = 0;
403	while (i < count) : (i += 1) {	403	while (i < count) : (i += 1) {
404	result_slice[i] = mem.toSlice(u8, argv[i]);	404	result_slice[i] = mem.spanZ(argv[i]);
405	}	405	}
406		406
407	return result_slice;	407	return result_slice;
...	@@ -422,8 +422,8 @@ pub fn argsAlloc(allocator: *mem.Allocator) ![][]u8 {	...	@@ -422,8 +422,8 @@ pub fn argsAlloc(allocator: *mem.Allocator) ![][]u8 {
422	try slice_list.append(arg.len);	422	try slice_list.append(arg.len);
423	}	423	}
424		424
425	const contents_slice = contents.toSliceConst();	425	const contents_slice = contents.span();
426	const slice_sizes = slice_list.toSliceConst();	426	const slice_sizes = slice_list.span();
427	const slice_list_bytes = try math.mul(usize, @sizeOf([]u8), slice_sizes.len);	427	const slice_list_bytes = try math.mul(usize, @sizeOf([]u8), slice_sizes.len);
428	const total_bytes = try math.add(usize, slice_list_bytes, contents_slice.len);	428	const total_bytes = try math.add(usize, slice_list_bytes, contents_slice.len);
429	const buf = try allocator.alignedAlloc(u8, @alignOf([]u8), total_bytes);	429	const buf = try allocator.alignedAlloc(u8, @alignOf([]u8), total_bytes);
...	@@ -636,7 +636,7 @@ pub fn getSelfExeSharedLibPaths(allocator: *Allocator) error{OutOfMemory}![][:0]	...	@@ -636,7 +636,7 @@ pub fn getSelfExeSharedLibPaths(allocator: *Allocator) error{OutOfMemory}![][:0]
636	fn callback(info: os.dl_phdr_info, size: usize, list: List) !void {	636	fn callback(info: os.dl_phdr_info, size: usize, list: List) !void {
637	const name = info.dlpi_name orelse return;	637	const name = info.dlpi_name orelse return;
638	if (name[0] == '/') {	638	if (name[0] == '/') {
639	const item = try mem.dupeZ(list.allocator, u8, mem.toSliceConst(u8, name));	639	const item = try mem.dupeZ(list.allocator, u8, mem.spanZ(name));
640	errdefer list.allocator.free(item);	640	errdefer list.allocator.free(item);
641	try list.append(item);	641	try list.append(item);
642	}	642	}
...	@@ -657,7 +657,7 @@ pub fn getSelfExeSharedLibPaths(allocator: *Allocator) error{OutOfMemory}![][:0]	...	@@ -657,7 +657,7 @@ pub fn getSelfExeSharedLibPaths(allocator: *Allocator) error{OutOfMemory}![][:0]
657	var i: u32 = 0;	657	var i: u32 = 0;
658	while (i < img_count) : (i += 1) {	658	while (i < img_count) : (i += 1) {
659	const name = std.c._dyld_get_image_name(i);	659	const name = std.c._dyld_get_image_name(i);
660	const item = try mem.dupeZ(allocator, u8, mem.toSliceConst(u8, name));	660	const item = try mem.dupeZ(allocator, u8, mem.spanZ(name));
661	errdefer allocator.free(item);	661	errdefer allocator.free(item);
662	try paths.append(item);	662	try paths.append(item);
663	}	663	}

lib/std/rand.zig+13-19

lib/std/sort.zig+2-2

...	@@ -1227,13 +1227,13 @@ test "sort fuzz testing" {	...	@@ -1227,13 +1227,13 @@ test "sort fuzz testing" {
1227	var fixed_buffer_mem: [100 * 1024]u8 = undefined;	1227	var fixed_buffer_mem: [100 * 1024]u8 = undefined;
1228		1228
1229	fn fuzzTest(rng: *std.rand.Random) !void {	1229	fn fuzzTest(rng: *std.rand.Random) !void {
1230	const array_size = rng.range(usize, 0, 1000);	1230	const array_size = rng.intRangeLessThan(usize, 0, 1000);
1231	var array = try testing.allocator.alloc(IdAndValue, array_size);	1231	var array = try testing.allocator.alloc(IdAndValue, array_size);
1232	defer testing.allocator.free(array);	1232	defer testing.allocator.free(array);
1233	// populate with random data	1233	// populate with random data
1234	for (array) \|*item, index\| {	1234	for (array) \|*item, index\| {
1235	item.id = index;	1235	item.id = index;
1236	item.value = rng.range(i32, 0, 100);	1236	item.value = rng.intRangeLessThan(i32, 0, 100);
1237	}	1237	}
1238	sort(IdAndValue, array, cmpByValue);	1238	sort(IdAndValue, array, cmpByValue);
1239		1239

lib/std/special/build_runner.zig+3-3

lib/std/special/compiler_rt.zig+20-7

 @@ -10,13 +10,19 @@ comptime {
     const strong_linkage = if (is_test) builtin.GlobalLinkage.Internal else builtin.GlobalLinkage.Strong;
     switch (builtin.arch) {
-        .i386, .x86_64 => @export(@import("compiler_rt/stack_probe.zig").zig_probe_stack, .{ .name = "__zig_probe_stack", .linkage = linkage }),
+        .i386,
-        .aarch64, .aarch64_be, .aarch64_32 => {
+        .x86_64,
-            @export(@import("compiler_rt/clear_cache.zig").clear_cache, .{ .name = "__clear_cache", .linkage = linkage });
+        => @export(@import("compiler_rt/stack_probe.zig").zig_probe_stack, .{
-        },
+            .name = "__zig_probe_stack",
+            .linkage = linkage,
+        }),
         else => {},
     }
+    // __clear_cache manages its own logic about whether to be exported or not.
+    _ = @import("compiler_rt/clear_cache.zig").clear_cache;
     @export(@import("compiler_rt/compareXf2.zig").__lesf2, .{ .name = "__lesf2", .linkage = linkage });
     @export(@import("compiler_rt/compareXf2.zig").__ledf2, .{ .name = "__ledf2", .linkage = linkage });
     @export(@import("compiler_rt/compareXf2.zig").__letf2, .{ .name = "__letf2", .linkage = linkage });
 @@ -69,9 +75,12 @@ comptime {
     @export(@import("compiler_rt/divdf3.zig").__divdf3, .{ .name = "__divdf3", .linkage = linkage });
     @export(@import("compiler_rt/divtf3.zig").__divtf3, .{ .name = "__divtf3", .linkage = linkage });
-    @export(@import("compiler_rt/ashlti3.zig").__ashlti3, .{ .name = "__ashlti3", .linkage = linkage });
+    @export(@import("compiler_rt/shift.zig").__ashldi3, .{ .name = "__ashldi3", .linkage = linkage });
-    @export(@import("compiler_rt/lshrti3.zig").__lshrti3, .{ .name = "__lshrti3", .linkage = linkage });
+    @export(@import("compiler_rt/shift.zig").__ashlti3, .{ .name = "__ashlti3", .linkage = linkage });
-    @export(@import("compiler_rt/ashrti3.zig").__ashrti3, .{ .name = "__ashrti3", .linkage = linkage });
+    @export(@import("compiler_rt/shift.zig").__ashrdi3, .{ .name = "__ashrdi3", .linkage = linkage });
+    @export(@import("compiler_rt/shift.zig").__ashrti3, .{ .name = "__ashrti3", .linkage = linkage });
+    @export(@import("compiler_rt/shift.zig").__lshrdi3, .{ .name = "__lshrdi3", .linkage = linkage });
+    @export(@import("compiler_rt/shift.zig").__lshrti3, .{ .name = "__lshrti3", .linkage = linkage });
     @export(@import("compiler_rt/floatsiXf.zig").__floatsidf, .{ .name = "__floatsidf", .linkage = linkage });
     @export(@import("compiler_rt/floatsiXf.zig").__floatsisf, .{ .name = "__floatsisf", .linkage = linkage });
 @@ -229,6 +238,10 @@ comptime {
         @export(@import("compiler_rt/divsf3.zig").__aeabi_fdiv, .{ .name = "__aeabi_fdiv", .linkage = linkage });
         @export(@import("compiler_rt/divdf3.zig").__aeabi_ddiv, .{ .name = "__aeabi_ddiv", .linkage = linkage });
+        @export(@import("compiler_rt/shift.zig").__aeabi_llsl, .{ .name = "__aeabi_llsl", .linkage = linkage });
+        @export(@import("compiler_rt/shift.zig").__aeabi_lasr, .{ .name = "__aeabi_lasr", .linkage = linkage });
+        @export(@import("compiler_rt/shift.zig").__aeabi_llsr, .{ .name = "__aeabi_llsr", .linkage = linkage });
         @export(@import("compiler_rt/compareXf2.zig").__aeabi_fcmpeq, .{ .name = "__aeabi_fcmpeq", .linkage = linkage });
         @export(@import("compiler_rt/compareXf2.zig").__aeabi_fcmplt, .{ .name = "__aeabi_fcmplt", .linkage = linkage });
         @export(@import("compiler_rt/compareXf2.zig").__aeabi_fcmple, .{ .name = "__aeabi_fcmple", .linkage = linkage });

lib/std/special/compiler_rt/ashldi3_test.zig created+32

...	@@ -0,0 +1,32 @@
1	const __ashldi3 = @import("shift.zig").__ashldi3;
2	const testing = @import("std").testing;
3
4	fn test__ashldi3(a: i64, b: i32, expected: u64) void {
5	const x = __ashldi3(a, b);
6	testing.expectEqual(@bitCast(i64, expected), x);
7	}
8
9	test "ashldi3" {
10	test__ashldi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 0, 0x123456789ABCDEF);
11	test__ashldi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 1, 0x2468ACF13579BDE);
12	test__ashldi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 2, 0x48D159E26AF37BC);
13	test__ashldi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 3, 0x91A2B3C4D5E6F78);
14	test__ashldi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 4, 0x123456789ABCDEF0);
15
16	test__ashldi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 28, 0x789ABCDEF0000000);
17	test__ashldi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 29, 0xF13579BDE0000000);
18	test__ashldi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 30, 0xE26AF37BC0000000);
19	test__ashldi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 31, 0xC4D5E6F780000000);
20
21	test__ashldi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 32, 0x89ABCDEF00000000);
22
23	test__ashldi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 33, 0x13579BDE00000000);
24	test__ashldi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 34, 0x26AF37BC00000000);
25	test__ashldi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 35, 0x4D5E6F7800000000);
26	test__ashldi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 36, 0x9ABCDEF000000000);
27
28	test__ashldi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 60, 0xF000000000000000);
29	test__ashldi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 61, 0xE000000000000000);
30	test__ashldi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 62, 0xC000000000000000);
31	test__ashldi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 63, 0x8000000000000000);
32	}

lib/std/special/compiler_rt/ashlti3.zig deleted-41

...	@@ -1,41 +0,0 @@
1	const builtin = @import("builtin");
2	const compiler_rt = @import("../compiler_rt.zig");
3
4	pub fn __ashlti3(a: i128, b: i32) callconv(.C) i128 {
5	var input = twords{ .all = a };
6	var result: twords = undefined;
7
8	if (b > 63) {
9	// 64 <= b < 128
10	result.s.low = 0;
11	result.s.high = input.s.low << @intCast(u6, b - 64);
12	} else {
13	// 0 <= b < 64
14	if (b == 0) return a;
15	result.s.low = input.s.low << @intCast(u6, b);
16	result.s.high = input.s.low >> @intCast(u6, 64 - b);
17	result.s.high \|= input.s.high << @intCast(u6, b);
18	}
19
20	return result.all;
21	}
22
23	const twords = extern union {
24	all: i128,
25	s: S,
26
27	const S = if (builtin.endian == .Little)
28	struct {
29	low: u64,
30	high: u64,
31	}
32	else
33	struct {
34	high: u64,
35	low: u64,
36	};
37	};
38
39	test "import ashlti3" {
40	_ = @import("ashlti3_test.zig");
41	}

lib/std/special/compiler_rt/ashlti3_test.zig+2-2

...	@@ -1,9 +1,9 @@	...	@@ -1,9 +1,9 @@
1	const __ashlti3 = @import("ashlti3.zig").__ashlti3;	1	const __ashlti3 = @import("shift.zig").__ashlti3;
2	const testing = @import("std").testing;	2	const testing = @import("std").testing;
3		3
4	fn test__ashlti3(a: i128, b: i32, expected: i128) void {	4	fn test__ashlti3(a: i128, b: i32, expected: i128) void {
5	const x = __ashlti3(a, b);	5	const x = __ashlti3(a, b);
6	testing.expect(x == expected);	6	testing.expectEqual(expected, x);
7	}	7	}
8		8
9	test "ashlti3" {	9	test "ashlti3" {

lib/std/special/compiler_rt/ashrdi3_test.zig created+55

...	@@ -0,0 +1,55 @@
1	const __ashrdi3 = @import("shift.zig").__ashrdi3;
2	const testing = @import("std").testing;
3
4	fn test__ashrdi3(a: i64, b: i32, expected: u64) void {
5	const x = __ashrdi3(a, b);
6	testing.expectEqual(@bitCast(i64, expected), x);
7	}
8
9	test "ashrdi3" {
10	test__ashrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 0, 0x123456789ABCDEF);
11	test__ashrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 1, 0x91A2B3C4D5E6F7);
12	test__ashrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 2, 0x48D159E26AF37B);
13	test__ashrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 3, 0x2468ACF13579BD);
14	test__ashrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 4, 0x123456789ABCDE);
15
16	test__ashrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 28, 0x12345678);
17	test__ashrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 29, 0x91A2B3C);
18	test__ashrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 30, 0x48D159E);
19	test__ashrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 31, 0x2468ACF);
20
21	test__ashrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 32, 0x1234567);
22
23	test__ashrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 33, 0x91A2B3);
24	test__ashrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 34, 0x48D159);
25	test__ashrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 35, 0x2468AC);
26	test__ashrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 36, 0x123456);
27
28	test__ashrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 60, 0);
29	test__ashrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 61, 0);
30	test__ashrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 62, 0);
31	test__ashrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 63, 0);
32
33	test__ashrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 0, 0xFEDCBA9876543210);
34	test__ashrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 1, 0xFF6E5D4C3B2A1908);
35	test__ashrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 2, 0xFFB72EA61D950C84);
36	test__ashrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 3, 0xFFDB97530ECA8642);
37	test__ashrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 4, 0xFFEDCBA987654321);
38
39	test__ashrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 28, 0xFFFFFFFFEDCBA987);
40	test__ashrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 29, 0xFFFFFFFFF6E5D4C3);
41	test__ashrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 30, 0xFFFFFFFFFB72EA61);
42	test__ashrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 31, 0xFFFFFFFFFDB97530);
43
44	test__ashrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 32, 0xFFFFFFFFFEDCBA98);
45
46	test__ashrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 33, 0xFFFFFFFFFF6E5D4C);
47	test__ashrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 34, 0xFFFFFFFFFFB72EA6);
48	test__ashrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 35, 0xFFFFFFFFFFDB9753);
49	test__ashrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 36, 0xFFFFFFFFFFEDCBA9);
50
51	test__ashrdi3(@bitCast(i64, @as(u64, 0xAEDCBA9876543210)), 60, 0xFFFFFFFFFFFFFFFA);
52	test__ashrdi3(@bitCast(i64, @as(u64, 0xAEDCBA9876543210)), 61, 0xFFFFFFFFFFFFFFFD);
53	test__ashrdi3(@bitCast(i64, @as(u64, 0xAEDCBA9876543210)), 62, 0xFFFFFFFFFFFFFFFE);
54	test__ashrdi3(@bitCast(i64, @as(u64, 0xAEDCBA9876543210)), 63, 0xFFFFFFFFFFFFFFFF);
55	}

lib/std/special/compiler_rt/ashrti3.zig deleted-42

...	@@ -1,42 +0,0 @@
1	const builtin = @import("builtin");
2	const compiler_rt = @import("../compiler_rt.zig");
3
4	pub fn __ashrti3(a: i128, b: i32) callconv(.C) i128 {
5	var input = twords{ .all = a };
6	var result: twords = undefined;
7
8	if (b > 63) {
9	// 64 <= b < 128
10	result.s.low = input.s.high >> @intCast(u6, b - 64);
11	result.s.high = input.s.high >> 63;
12	} else {
13	// 0 <= b < 64
14	if (b == 0) return a;
15	result.s.low = input.s.high << @intCast(u6, 64 - b);
16	// Avoid sign-extension here
17	result.s.low \|= @bitCast(i64, @bitCast(u64, input.s.low) >> @intCast(u6, b));
18	result.s.high = input.s.high >> @intCast(u6, b);
19	}
20
21	return result.all;
22	}
23
24	const twords = extern union {
25	all: i128,
26	s: S,
27
28	const S = if (builtin.endian == .Little)
29	struct {
30	low: i64,
31	high: i64,
32	}
33	else
34	struct {
35	high: i64,
36	low: i64,
37	};
38	};
39
40	test "import ashrti3" {
41	_ = @import("ashrti3_test.zig");
42	}

lib/std/special/compiler_rt/ashrti3_test.zig+2-4

 @@ -1,11 +1,9 @@
-const __ashrti3 = @import("ashrti3.zig").__ashrti3;
+const __ashrti3 = @import("shift.zig").__ashrti3;
 const testing = @import("std").testing;
 fn test__ashrti3(a: i128, b: i32, expected: i128) void {
     const x = __ashrti3(a, b);
-    // @import("std").debug.warn("got 0x{x}\nexp 0x{x}\n", .{@truncate(u64,
+    testing.expectEqual(expected, x);
-    // @bitCast(u128, x) >> 64), @truncate(u64, @bitCast(u128, expected)) >> 64});
-    testing.expect(x == expected);
 }
 test "ashrti3" {

lib/std/special/compiler_rt/clear_cache.zig+53-37

 @@ -26,6 +26,10 @@ pub fn clear_cache(start: usize, end: usize) callconv(.C) void {
         .mips, .mipsel, .mips64, .mips64el => true,
         else => false,
     };
+    const riscv = switch (arch) {
+        .riscv32, .riscv64 => true,
+        else => false,
+    };
     const powerpc64 = switch (arch) {
         .powerpc64, .powerpc64le => true,
         else => false,
 @@ -41,45 +45,42 @@ pub fn clear_cache(start: usize, end: usize) callconv(.C) void {
     if (x86) {
         // Intel processors have a unified instruction and data cache
         // so there is nothing to do
+        exportIt();
     } else if (os == .windows and (arm32 or arm64)) {
-        @compileError("TODO");
+        // TODO
         // FlushInstructionCache(GetCurrentProcess(), start, end - start);
+        // exportIt();
     } else if (arm32 and !apple) {
-        @compileError("TODO");
+        switch (os) {
-        //#if defined(__FreeBSD__) || defined(__NetBSD__)
+            .freebsd, .netbsd => {
-        //  struct arm_sync_icache_args arg;
+                var arg = arm_sync_icache_args{
-        //
+                    .addr = start,
-        //  arg.addr = (uintptr_t)start;
+                    .len = end - start,
-        //  arg.len = (uintptr_t)end - (uintptr_t)start;
+                };
-        //
+                const result = sysarch(ARM_SYNC_ICACHE, @ptrToInt(&arg));
-        //  sysarch(ARM_SYNC_ICACHE, &arg);
+                std.debug.assert(result == 0);
-        //#elif defined(__linux__)
+                exportIt();
-        //// We used to include asm/unistd.h for the __ARM_NR_cacheflush define, but
+            },
-        //// it also brought many other unused defines, as well as a dependency on
+            .linux => {
-        //// kernel headers to be installed.
+                const result = std.os.linux.syscall3(.cacheflush, start, end, 0);
-        ////
+                std.debug.assert(result == 0);
-        //// This value is stable at least since Linux 3.13 and should remain so for
+                exportIt();
-        //// compatibility reasons, warranting it's re-definition here.
+            },
-        //#define __ARM_NR_cacheflush 0x0f0002
+            else => {},
-        //  register int start_reg __asm("r0") = (int)(intptr_t)start;
+        }
-        //  const register int end_reg __asm("r1") = (int)(intptr_t)end;
-        //  const register int flags __asm("r2") = 0;
-        //  const register int syscall_nr __asm("r7") = __ARM_NR_cacheflush;
-        //  __asm __volatile("svc 0x0"
-        //                   : "=r"(start_reg)
-        //                   : "r"(syscall_nr), "r"(start_reg), "r"(end_reg), "r"(flags));
-        //  assert(start_reg == 0 && "Cache flush syscall failed.");
-        //#else
-        //  compilerrt_abort();
-        //#endif
     } else if (os == .linux and mips) {
-        @compileError("TODO");
+        const flags = 3; // ICACHE | DCACHE
-        //const uintptr_t start_int = (uintptr_t)start;
+        const result = std.os.linux.syscall3(.cacheflush, start, end - start, flags);
-        //const uintptr_t end_int = (uintptr_t)end;
+        std.debug.assert(result == 0);
-        //syscall(__NR_cacheflush, start, (end_int - start_int), BCACHE);
+        exportIt();
     } else if (mips and os == .openbsd) {
-        @compileError("TODO");
+        // TODO
         //cacheflush(start, (uintptr_t)end - (uintptr_t)start, BCACHE);
+        // exportIt();
+    } else if (os == .linux and riscv) {
+        const result = std.os.linux.syscall3(.riscv_flush_icache, start, end - start, 0);
+        std.debug.assert(result == 0);
+        exportIt();
     } else if (arm64 and !apple) {
         // Get Cache Type Info.
         // TODO memoize this?
 @@ -118,8 +119,9 @@ pub fn clear_cache(start: usize, end: usize) callconv(.C) void {
             }
         }
         asm volatile ("isb sy");
+        exportIt();
     } else if (powerpc64) {
-        @compileError("TODO");
+        // TODO
         //const size_t line_size = 32;
         //const size_t len = (uintptr_t)end - (uintptr_t)start;
         //
 @@ -134,8 +136,9 @@ pub fn clear_cache(start: usize, end: usize) callconv(.C) void {
         //for (uintptr_t line = start_line; line < end_line; line += line_size)
         //  __asm__ volatile("icbi 0, %0" : : "r"(line));
         //__asm__ volatile("isync");
+        // exportIt();
     } else if (sparc) {
-        @compileError("TODO");
+        // TODO
         //const size_t dword_size = 8;
         //const size_t len = (uintptr_t)end - (uintptr_t)start;
         //
 @@ -145,13 +148,26 @@ pub fn clear_cache(start: usize, end: usize) callconv(.C) void {
         //
         //for (uintptr_t dword = start_dword; dword < end_dword; dword += dword_size)
         //  __asm__ volatile("flush %0" : : "r"(dword));
+        // exportIt();
     } else if (apple) {
         // On Darwin, sys_icache_invalidate() provides this functionality
         sys_icache_invalidate(start, end - start);
-    } else {
+        exportIt();
-        @compileError("no __clear_cache implementation available for this target");
     }
 }
+const linkage = if (std.builtin.is_test) std.builtin.GlobalLinkage.Internal else std.builtin.GlobalLinkage.Weak;
+fn exportIt() void {
+    @export(clear_cache, .{ .name = "__clear_cache", .linkage = linkage });
+}
 // Darwin-only
 extern fn sys_icache_invalidate(start: usize, len: usize) void;
+// BSD-only
+const arm_sync_icache_args = extern struct {
+    addr: usize, // Virtual start address
+    len: usize, // Region size
+};
+const ARM_SYNC_ICACHE = 0;
+extern "c" fn sysarch(number: i32, args: usize) i32;

lib/std/special/compiler_rt/lshrdi3_test.zig created+55

...	@@ -0,0 +1,55 @@
1	const __lshrdi3 = @import("shift.zig").__lshrdi3;
2	const testing = @import("std").testing;
3
4	fn test__lshrdi3(a: i64, b: i32, expected: u64) void {
5	const x = __lshrdi3(a, b);
6	testing.expectEqual(@bitCast(i64, expected), x);
7	}
8
9	test "lshrdi3" {
10	test__lshrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 0, 0x123456789ABCDEF);
11	test__lshrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 1, 0x91A2B3C4D5E6F7);
12	test__lshrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 2, 0x48D159E26AF37B);
13	test__lshrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 3, 0x2468ACF13579BD);
14	test__lshrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 4, 0x123456789ABCDE);
15
16	test__lshrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 28, 0x12345678);
17	test__lshrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 29, 0x91A2B3C);
18	test__lshrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 30, 0x48D159E);
19	test__lshrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 31, 0x2468ACF);
20
21	test__lshrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 32, 0x1234567);
22
23	test__lshrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 33, 0x91A2B3);
24	test__lshrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 34, 0x48D159);
25	test__lshrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 35, 0x2468AC);
26	test__lshrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 36, 0x123456);
27
28	test__lshrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 60, 0);
29	test__lshrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 61, 0);
30	test__lshrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 62, 0);
31	test__lshrdi3(@bitCast(i64, @as(u64, 0x0123456789ABCDEF)), 63, 0);
32
33	test__lshrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 0, 0xFEDCBA9876543210);
34	test__lshrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 1, 0x7F6E5D4C3B2A1908);
35	test__lshrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 2, 0x3FB72EA61D950C84);
36	test__lshrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 3, 0x1FDB97530ECA8642);
37	test__lshrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 4, 0xFEDCBA987654321);
38
39	test__lshrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 28, 0xFEDCBA987);
40	test__lshrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 29, 0x7F6E5D4C3);
41	test__lshrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 30, 0x3FB72EA61);
42	test__lshrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 31, 0x1FDB97530);
43
44	test__lshrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 32, 0xFEDCBA98);
45
46	test__lshrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 33, 0x7F6E5D4C);
47	test__lshrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 34, 0x3FB72EA6);
48	test__lshrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 35, 0x1FDB9753);
49	test__lshrdi3(@bitCast(i64, @as(u64, 0xFEDCBA9876543210)), 36, 0xFEDCBA9);
50
51	test__lshrdi3(@bitCast(i64, @as(u64, 0xAEDCBA9876543210)), 60, 0xA);
52	test__lshrdi3(@bitCast(i64, @as(u64, 0xAEDCBA9876543210)), 61, 0x5);
53	test__lshrdi3(@bitCast(i64, @as(u64, 0xAEDCBA9876543210)), 62, 0x2);
54	test__lshrdi3(@bitCast(i64, @as(u64, 0xAEDCBA9876543210)), 63, 0x1);
55	}

lib/std/special/compiler_rt/lshrti3.zig deleted-41

...	@@ -1,41 +0,0 @@
1	const builtin = @import("builtin");
2	const compiler_rt = @import("../compiler_rt.zig");
3
4	pub fn __lshrti3(a: i128, b: i32) callconv(.C) i128 {
5	var input = twords{ .all = a };
6	var result: twords = undefined;
7
8	if (b > 63) {
9	// 64 <= b < 128
10	result.s.low = input.s.high >> @intCast(u6, b - 64);
11	result.s.high = 0;
12	} else {
13	// 0 <= b < 64
14	if (b == 0) return a;
15	result.s.low = input.s.high << @intCast(u6, 64 - b);
16	result.s.low \|= input.s.low >> @intCast(u6, b);
17	result.s.high = input.s.high >> @intCast(u6, b);
18	}
19
20	return result.all;
21	}
22
23	const twords = extern union {
24	all: i128,
25	s: S,
26
27	const S = if (builtin.endian == .Little)
28	struct {
29	low: u64,
30	high: u64,
31	}
32	else
33	struct {
34	high: u64,
35	low: u64,
36	};
37	};
38
39	test "import lshrti3" {
40	_ = @import("lshrti3_test.zig");
41	}

lib/std/special/compiler_rt/lshrti3_test.zig+2-2

...	@@ -1,9 +1,9 @@	...	@@ -1,9 +1,9 @@
1	const __lshrti3 = @import("lshrti3.zig").__lshrti3;	1	const __lshrti3 = @import("shift.zig").__lshrti3;
2	const testing = @import("std").testing;	2	const testing = @import("std").testing;
3		3
4	fn test__lshrti3(a: i128, b: i32, expected: i128) void {	4	fn test__lshrti3(a: i128, b: i32, expected: i128) void {
5	const x = __lshrti3(a, b);	5	const x = __lshrti3(a, b);
6	testing.expect(x == expected);	6	testing.expectEqual(expected, x);
7	}	7	}
8		8
9	test "lshrti3" {	9	test "lshrti3" {

lib/std/special/compiler_rt/shift.zig created+130

...	@@ -0,0 +1,130 @@
1	const std = @import("std");
2	const builtin = std.builtin;
3	const Log2Int = std.math.Log2Int;
4
5	fn Dwords(comptime T: type, comptime signed_half: bool) type {
6	return extern union {
7	pub const HalfTU = std.meta.IntType(false, @divExact(T.bit_count, 2));
8	pub const HalfTS = std.meta.IntType(true, @divExact(T.bit_count, 2));
9	pub const HalfT = if (signed_half) HalfTS else HalfTU;
10
11	all: T,
12	s: if (builtin.endian == .Little)
13	struct { low: HalfT, high: HalfT }
14	else
15	struct { high: HalfT, low: HalfT },
16	};
17	}
18
19	// Arithmetic shift left
20	// Precondition: 0 <= b < bits_in_dword
21	pub fn ashlXi3(comptime T: type, a: T, b: i32) T {
22	const dwords = Dwords(T, false);
23	const S = Log2Int(dwords.HalfT);
24
25	const input = dwords{ .all = a };
26	var output: dwords = undefined;
27
28	if (b >= dwords.HalfT.bit_count) {
29	output.s.low = 0;
30	output.s.high = input.s.low << @intCast(S, b - dwords.HalfT.bit_count);
31	} else if (b == 0) {
32	return a;
33	} else {
34	output.s.low = input.s.low << @intCast(S, b);
35	output.s.high = input.s.high << @intCast(S, b);
36	output.s.high \|= input.s.low >> @intCast(S, dwords.HalfT.bit_count - b);
37	}
38
39	return output.all;
40	}
41
42	// Arithmetic shift right
43	// Precondition: 0 <= b < T.bit_count
44	pub fn ashrXi3(comptime T: type, a: T, b: i32) T {
45	const dwords = Dwords(T, true);
46	const S = Log2Int(dwords.HalfT);
47
48	const input = dwords{ .all = a };
49	var output: dwords = undefined;
50
51	if (b >= dwords.HalfT.bit_count) {
52	output.s.high = input.s.high >> (dwords.HalfT.bit_count - 1);
53	output.s.low = input.s.high >> @intCast(S, b - dwords.HalfT.bit_count);
54	} else if (b == 0) {
55	return a;
56	} else {
57	output.s.high = input.s.high >> @intCast(S, b);
58	output.s.low = input.s.high << @intCast(S, dwords.HalfT.bit_count - b);
59	// Avoid sign-extension here
60	output.s.low \|= @bitCast(
61	dwords.HalfT,
62	@bitCast(dwords.HalfTU, input.s.low) >> @intCast(S, b),
63	);
64	}
65
66	return output.all;
67	}
68
69	// Logical shift right
70	// Precondition: 0 <= b < T.bit_count
71	pub fn lshrXi3(comptime T: type, a: T, b: i32) T {
72	const dwords = Dwords(T, false);
73	const S = Log2Int(dwords.HalfT);
74
75	const input = dwords{ .all = a };
76	var output: dwords = undefined;
77
78	if (b >= dwords.HalfT.bit_count) {
79	output.s.high = 0;
80	output.s.low = input.s.high >> @intCast(S, b - dwords.HalfT.bit_count);
81	} else if (b == 0) {
82	return a;
83	} else {
84	output.s.high = input.s.high >> @intCast(S, b);
85	output.s.low = input.s.high << @intCast(S, dwords.HalfT.bit_count - b);
86	output.s.low \|= input.s.low >> @intCast(S, b);
87	}
88
89	return output.all;
90	}
91
92	pub fn __ashldi3(a: i64, b: i32) callconv(.C) i64 {
93	return @call(.{ .modifier = .always_inline }, ashlXi3, .{ i64, a, b });
94	}
95	pub fn __ashlti3(a: i128, b: i32) callconv(.C) i128 {
96	return @call(.{ .modifier = .always_inline }, ashlXi3, .{ i128, a, b });
97	}
98	pub fn __ashrdi3(a: i64, b: i32) callconv(.C) i64 {
99	return @call(.{ .modifier = .always_inline }, ashrXi3, .{ i64, a, b });
100	}
101	pub fn __ashrti3(a: i128, b: i32) callconv(.C) i128 {
102	return @call(.{ .modifier = .always_inline }, ashrXi3, .{ i128, a, b });
103	}
104	pub fn __lshrdi3(a: i64, b: i32) callconv(.C) i64 {
105	return @call(.{ .modifier = .always_inline }, lshrXi3, .{ i64, a, b });
106	}
107	pub fn __lshrti3(a: i128, b: i32) callconv(.C) i128 {
108	return @call(.{ .modifier = .always_inline }, lshrXi3, .{ i128, a, b });
109	}
110
111	pub fn __aeabi_llsl(a: i64, b: i32) callconv(.AAPCS) i64 {
112	return __ashldi3(a, b);
113	}
114	pub fn __aeabi_lasr(a: i64, b: i32) callconv(.AAPCS) i64 {
115	return __ashrdi3(a, b);
116	}
117	pub fn __aeabi_llsr(a: i64, b: i32) callconv(.AAPCS) i64 {
118	return __lshrdi3(a, b);
119	}
120
121	test "" {
122	_ = @import("ashrdi3_test.zig");
123	_ = @import("ashrti3_test.zig");
124
125	_ = @import("ashldi3_test.zig");
126	_ = @import("ashlti3_test.zig");
127
128	_ = @import("lshrdi3_test.zig");
129	_ = @import("lshrti3_test.zig");
130	}

lib/std/std.zig+1-1

 @@ -1,10 +1,10 @@
 pub const AlignedArrayList = @import("array_list.zig").AlignedArrayList;
 pub const ArrayList = @import("array_list.zig").ArrayList;
+pub const ArrayListSentineled = @import("array_list_sentineled.zig").ArrayListSentineled;
 pub const AutoHashMap = @import("hash_map.zig").AutoHashMap;
 pub const BloomFilter = @import("bloom_filter.zig").BloomFilter;
 pub const BufMap = @import("buf_map.zig").BufMap;
 pub const BufSet = @import("buf_set.zig").BufSet;
-pub const Buffer = @import("buffer.zig").Buffer;
 pub const ChildProcess = @import("child_process.zig").ChildProcess;
 pub const DynLib = @import("dynamic_library.zig").DynLib;
 pub const HashMap = @import("hash_map.zig").HashMap;

lib/std/target.zig+4-4

...	@@ -967,15 +967,15 @@ pub const Target = struct {	...	@@ -967,15 +967,15 @@ pub const Target = struct {
967		967
968	pub const stack_align = 16;	968	pub const stack_align = 16;
969		969
970	pub fn zigTriple(self: Target, allocator: *mem.Allocator) ![:0]u8 {	970	pub fn zigTriple(self: Target, allocator: *mem.Allocator) ![]u8 {
971	return std.zig.CrossTarget.fromTarget(self).zigTriple(allocator);	971	return std.zig.CrossTarget.fromTarget(self).zigTriple(allocator);
972	}	972	}
973		973
974	pub fn linuxTripleSimple(allocator: *mem.Allocator, cpu_arch: Cpu.Arch, os_tag: Os.Tag, abi: Abi) ![:0]u8 {	974	pub fn linuxTripleSimple(allocator: *mem.Allocator, cpu_arch: Cpu.Arch, os_tag: Os.Tag, abi: Abi) ![]u8 {
975	return std.fmt.allocPrint0(allocator, "{}-{}-{}", .{ @tagName(cpu_arch), @tagName(os_tag), @tagName(abi) });	975	return std.fmt.allocPrint(allocator, "{}-{}-{}", .{ @tagName(cpu_arch), @tagName(os_tag), @tagName(abi) });
976	}	976	}
977		977
978	pub fn linuxTriple(self: Target, allocator: *mem.Allocator) ![:0]u8 {	978	pub fn linuxTriple(self: Target, allocator: *mem.Allocator) ![]u8 {
979	return linuxTripleSimple(allocator, self.cpu.arch, self.os.tag, self.abi);	979	return linuxTripleSimple(allocator, self.cpu.arch, self.os.tag, self.abi);
980	}	980	}
981		981

lib/std/thread.zig+1-1

...	@@ -464,7 +464,7 @@ pub const Thread = struct {	...	@@ -464,7 +464,7 @@ pub const Thread = struct {
464	var count: c_int = undefined;	464	var count: c_int = undefined;
465	var count_len: usize = @sizeOf(c_int);	465	var count_len: usize = @sizeOf(c_int);
466	const name = if (comptime std.Target.current.isDarwin()) "hw.logicalcpu" else "hw.ncpu";	466	const name = if (comptime std.Target.current.isDarwin()) "hw.logicalcpu" else "hw.ncpu";
467	os.sysctlbynameC(name, &count, &count_len, null, 0) catch \|err\| switch (err) {	467	os.sysctlbynameZ(name, &count, &count_len, null, 0) catch \|err\| switch (err) {
468	error.NameTooLong, error.UnknownName => unreachable,	468	error.NameTooLong, error.UnknownName => unreachable,
469	else => \|e\| return e,	469	else => \|e\| return e,
470	};	470	};

lib/std/zig/cross_target.zig+18-8

lib/std/zig/parser_test.zig+30-1

...	@@ -373,6 +373,35 @@ test "zig fmt: correctly move doc comments on struct fields" {	...	@@ -373,6 +373,35 @@ test "zig fmt: correctly move doc comments on struct fields" {
373	);	373	);
374	}	374	}
375		375
		376	test "zig fmt: correctly space struct fields with doc comments" {
		377	try testTransform(
		378	\\pub const S = struct {
		379	\\ /// A
		380	\\ a: u8,
		381	\\ /// B
		382	\\ /// B (cont)
		383	\\ b: u8,
		384	\\
		385	\\
		386	\\ /// C
		387	\\ c: u8,
		388	\\};
		389	\\
		390	,
		391	\\pub const S = struct {
		392	\\ /// A
		393	\\ a: u8,
		394	\\ /// B
		395	\\ /// B (cont)
		396	\\ b: u8,
		397	\\
		398	\\ /// C
		399	\\ c: u8,
		400	\\};
		401	\\
		402	);
		403	}
		404
376	test "zig fmt: doc comments on param decl" {	405	test "zig fmt: doc comments on param decl" {
377	try testCanonical(	406	try testCanonical(
378	\\pub const Allocator = struct {	407	\\pub const Allocator = struct {
...	@@ -2924,7 +2953,7 @@ fn testParse(source: []const u8, allocator: mem.Allocator, anything_changed: b	...	@@ -2924,7 +2953,7 @@ fn testParse(source: []const u8, allocator: mem.Allocator, anything_changed: b
2924	return error.ParseError;	2953	return error.ParseError;
2925	}	2954	}
2926		2955
2927	var buffer = try std.Buffer.initSize(allocator, 0);	2956	var buffer = std.ArrayList(u8).init(allocator);
2928	errdefer buffer.deinit();	2957	errdefer buffer.deinit();
2929		2958
2930	anything_changed.* = try std.zig.render(allocator, buffer.outStream(), tree);	2959	anything_changed.* = try std.zig.render(allocator, buffer.outStream(), tree);

lib/std/zig/render.zig+6-2

 @@ -187,12 +187,16 @@ fn renderExtraNewline(tree: *ast.Tree, stream: var, start_col: *usize, node: *as
     const first_token = node.firstToken();
     var prev_token = first_token;
     if (prev_token == 0) return;
+    var newline_threshold: usize = 2;
     while (tree.tokens.at(prev_token - 1).id == .DocComment) {
+        if (tree.tokenLocation(tree.tokens.at(prev_token - 1).end, prev_token).line == 1) {
+            newline_threshold += 1;
+        }
         prev_token -= 1;
     }
     const prev_token_end = tree.tokens.at(prev_token - 1).end;
     const loc = tree.tokenLocation(prev_token_end, first_token);
-    if (loc.line >= 2) {
+    if (loc.line >= newline_threshold) {
         try stream.writeByte('\n');
         start_col.* = 0;
     }
 @@ -1527,7 +1531,7 @@ fn renderExpression(
                 try renderToken(tree, stream, callconv_rparen, indent, start_col, Space.Space); // )
             } else if (cc_rewrite_str) |str| {
                 try stream.writeAll("callconv(");
-                try stream.writeAll(mem.toSliceConst(u8, str));
+                try stream.writeAll(mem.spanZ(str));
                 try stream.writeAll(") ");
             }

lib/std/zig/system.zig+17-13

src-self-hosted/clang_options_data.zig+85-50

 @@ -7,7 +7,7 @@ flagpd1("CC"),
 .{
     .name = "E",
     .syntax = .flag,
-    .zig_equivalent = .preprocess,
+    .zig_equivalent = .pp_or_asm,
     .pd1 = true,
     .pd2 = false,
     .psl = false,
 @@ -26,12 +26,26 @@ flagpd1("H"),
 },
 flagpd1("I-"),
 flagpd1("M"),
-flagpd1("MD"),
+.{
+    .name = "MD",
+    .syntax = .flag,
+    .zig_equivalent = .dep_file,
+    .pd1 = true,
+    .pd2 = false,
+    .psl = false,
+},
 flagpd1("MG"),
 flagpd1("MM"),
 flagpd1("MMD"),
 flagpd1("MP"),
-flagpd1("MV"),
+.{
+    .name = "MV",
+    .syntax = .flag,
+    .zig_equivalent = .dep_file,
+    .pd1 = true,
+    .pd2 = false,
+    .psl = false,
+},
 flagpd1("Mach"),
 flagpd1("O0"),
 flagpd1("O4"),
 @@ -53,7 +67,7 @@ flagpd1("Qy"),
 .{
     .name = "S",
     .syntax = .flag,
-    .zig_equivalent = .driver_punt,
+    .zig_equivalent = .pp_or_asm,
     .pd1 = true,
     .pd2 = false,
     .psl = false,
 @@ -154,7 +168,7 @@ sepd1("Zlinker-input"),
 .{
     .name = "E",
     .syntax = .flag,
-    .zig_equivalent = .preprocess,
+    .zig_equivalent = .pp_or_asm,
     .pd1 = true,
     .pd2 = false,
     .psl = true,
 @@ -490,7 +504,7 @@ sepd1("Zlinker-input"),
 .{
     .name = "MD",
     .syntax = .flag,
-    .zig_equivalent = .other,
+    .zig_equivalent = .dep_file,
     .pd1 = true,
     .pd2 = false,
     .psl = true,
 @@ -1442,7 +1456,7 @@ sepd1("Zlinker-input"),
 .{
     .name = "assemble",
     .syntax = .flag,
-    .zig_equivalent = .driver_punt,
+    .zig_equivalent = .pp_or_asm,
     .pd1 = false,
     .pd2 = true,
     .psl = false,
 @@ -1658,7 +1672,7 @@ sepd1("Zlinker-input"),
 .{
     .name = "library-directory",
     .syntax = .separate,
-    .zig_equivalent = .other,
+    .zig_equivalent = .lib_dir,
     .pd1 = false,
     .pd2 = true,
     .psl = false,
 @@ -1770,7 +1784,7 @@ sepd1("Zlinker-input"),
 .{
     .name = "preprocess",
     .syntax = .flag,
-    .zig_equivalent = .preprocess,
+    .zig_equivalent = .pp_or_asm,
     .pd1 = false,
     .pd2 = true,
     .psl = false,
 @@ -2554,14 +2568,7 @@ flagpd1("femulated-tls"),
 flagpd1("fencode-extended-block-signature"),
 sepd1("ferror-limit"),
 flagpd1("fescaping-block-tail-calls"),
-.{
+flagpd1("fexceptions"),
-    .name = "fexceptions",
-    .syntax = .flag,
-    .zig_equivalent = .exceptions,
-    .pd1 = true,
-    .pd2 = false,
-    .psl = false,
-},
 flagpd1("fexperimental-isel"),
 flagpd1("fexperimental-new-constant-interpreter"),
 flagpd1("fexperimental-new-pass-manager"),
 @@ -2765,14 +2772,7 @@ flagpd1("fno-elide-type"),
 flagpd1("fno-eliminate-unused-debug-symbols"),
 flagpd1("fno-emulated-tls"),
 flagpd1("fno-escaping-block-tail-calls"),
-.{
+flagpd1("fno-exceptions"),
-    .name = "fno-exceptions",
-    .syntax = .flag,
-    .zig_equivalent = .no_exceptions,
-    .pd1 = true,
-    .pd2 = false,
-    .psl = false,
-},
 flagpd1("fno-experimental-isel"),
 flagpd1("fno-experimental-new-pass-manager"),
 flagpd1("fno-fast-math"),
 @@ -2861,14 +2861,7 @@ flagpd1("fno-rewrite-includes"),
 flagpd1("fno-ropi"),
 flagpd1("fno-rounding-math"),
 flagpd1("fno-rtlib-add-rpath"),
-.{
+flagpd1("fno-rtti"),
-    .name = "fno-rtti",
-    .syntax = .flag,
-    .zig_equivalent = .no_rtti,
-    .pd1 = true,
-    .pd2 = false,
-    .psl = false,
-},
 flagpd1("fno-rtti-data"),
 flagpd1("fno-rwpi"),
 flagpd1("fno-sanitize-address-poison-custom-array-cookie"),
 @@ -2996,7 +2989,14 @@ sepd1("fprofile-remapping-file"),
 flagpd1("fprofile-sample-accurate"),
 flagpd1("fprofile-sample-use"),
 flagpd1("fprofile-use"),
-sepd1("framework"),
+.{
+    .name = "framework",
+    .syntax = .separate,
+    .zig_equivalent = .framework,
+    .pd1 = true,
+    .pd2 = false,
+    .psl = false,
+},
 flagpd1("freciprocal-math"),
 flagpd1("frecord-command-line"),
 flagpd1("ffree-form"),
 @@ -3016,14 +3016,7 @@ flagpd1("fno-frontend-optimize"),
 flagpd1("fropi"),
 flagpd1("frounding-math"),
 flagpd1("frtlib-add-rpath"),
-.{
+flagpd1("frtti"),
-    .name = "frtti",
-    .syntax = .flag,
-    .zig_equivalent = .rtti,
-    .pd1 = true,
-    .pd2 = false,
-    .psl = false,
-},
 flagpd1("frwpi"),
 flagpd1("fsanitize-address-globals-dead-stripping"),
 flagpd1("fsanitize-address-poison-custom-array-cookie"),
 @@ -4562,7 +4555,7 @@ joinpd1("target-sdk-version="),
 .{
     .name = "library-directory=",
     .syntax = .joined,
-    .zig_equivalent = .other,
+    .zig_equivalent = .lib_dir,
     .pd1 = false,
     .pd2 = true,
     .psl = false,
 @@ -5282,8 +5275,22 @@ joinpd1("fixit="),
 joinpd1("gstabs"),
 joinpd1("gxcoff"),
 jspd1("iquote"),
-joinpd1("march="),
+.{
-joinpd1("mtune="),
+    .name = "march=",
+    .syntax = .joined,
+    .zig_equivalent = .mcpu,
+    .pd1 = true,
+    .pd2 = false,
+    .psl = false,
+},
+.{
+    .name = "mtune=",
+    .syntax = .joined,
+    .zig_equivalent = .mcpu,
+    .pd1 = true,
+    .pd2 = false,
+    .psl = false,
+},
 .{
     .name = "rtlib=",
     .syntax = .joined,
 @@ -5348,7 +5355,14 @@ joinpd1("gcoff"),
 joinpd1("mabi="),
 joinpd1("mabs="),
 joinpd1("masm="),
-joinpd1("mcpu="),
+.{
+    .name = "mcpu=",
+    .syntax = .joined,
+    .zig_equivalent = .mcpu,
+    .pd1 = true,
+    .pd2 = false,
+    .psl = false,
+},
 joinpd1("mfpu="),
 joinpd1("mhvx="),
 joinpd1("mmcu="),
 @@ -5441,7 +5455,14 @@ joinpd1("mtp="),
 joinpd1("gz="),
 joinpd1("A-"),
 joinpd1("G="),
-jspd1("MF"),
+.{
+    .name = "MF",
+    .syntax = .joined_or_separate,
+    .zig_equivalent = .dep_file,
+    .pd1 = true,
+    .pd2 = false,
+    .psl = false,
+},
 jspd1("MJ"),
 jspd1("MQ"),
 jspd1("MT"),
 @@ -5656,11 +5677,25 @@ jspd1("MT"),
 jspd1("A"),
 jspd1("B"),
 jspd1("D"),
-jspd1("F"),
+.{
+    .name = "F",
+    .syntax = .joined_or_separate,
+    .zig_equivalent = .framework_dir,
+    .pd1 = true,
+    .pd2 = false,
+    .psl = false,
+},
 jspd1("G"),
 jspd1("I"),
 jspd1("J"),
-jspd1("L"),
+.{
+    .name = "L",
+    .syntax = .joined_or_separate,
+    .zig_equivalent = .lib_dir,
+    .pd1 = true,
+    .pd2 = false,
+    .psl = false,
+},
 .{
     .name = "O",
     .syntax = .joined,
 @@ -5694,7 +5729,7 @@ joinpd1("Z"),
 .{
     .name = "F",
     .syntax = .joined_or_separate,
-    .zig_equivalent = .other,
+    .zig_equivalent = .framework_dir,
     .pd1 = true,
     .pd2 = false,
     .psl = true,

src-self-hosted/codegen.zig+14-14

src-self-hosted/compilation.zig+11-11

...	@@ -2,7 +2,7 @@ const std = @import("std");	...	@@ -2,7 +2,7 @@ const std = @import("std");
2	const io = std.io;	2	const io = std.io;
3	const mem = std.mem;	3	const mem = std.mem;
4	const Allocator = mem.Allocator;	4	const Allocator = mem.Allocator;
5	const Buffer = std.Buffer;	5	const ArrayListSentineled = std.ArrayListSentineled;
6	const llvm = @import("llvm.zig");	6	const llvm = @import("llvm.zig");
7	const c = @import("c.zig");	7	const c = @import("c.zig");
8	const builtin = std.builtin;	8	const builtin = std.builtin;
...	@@ -123,8 +123,8 @@ pub const LlvmHandle = struct {	...	@@ -123,8 +123,8 @@ pub const LlvmHandle = struct {
123		123
124	pub const Compilation = struct {	124	pub const Compilation = struct {
125	zig_compiler: *ZigCompiler,	125	zig_compiler: *ZigCompiler,
126	name: Buffer,	126	name: ArrayListSentineled(u8, 0),
127	llvm_triple: Buffer,	127	llvm_triple: ArrayListSentineled(u8, 0),
128	root_src_path: ?[]const u8,	128	root_src_path: ?[]const u8,
129	target: std.Target,	129	target: std.Target,
130	llvm_target: *llvm.Target,	130	llvm_target: *llvm.Target,
...	@@ -444,7 +444,7 @@ pub const Compilation = struct {	...	@@ -444,7 +444,7 @@ pub const Compilation = struct {
444	comp.arena_allocator.deinit();	444	comp.arena_allocator.deinit();
445	}	445	}
446		446
447	comp.name = try Buffer.init(comp.arena(), name);	447	comp.name = try ArrayListSentineled(u8, 0).init(comp.arena(), name);
448	comp.llvm_triple = try util.getLLVMTriple(comp.arena(), target);	448	comp.llvm_triple = try util.getLLVMTriple(comp.arena(), target);
449	comp.llvm_target = try util.llvmTargetFromTriple(comp.llvm_triple);	449	comp.llvm_target = try util.llvmTargetFromTriple(comp.llvm_triple);
450	comp.zig_std_dir = try fs.path.join(comp.arena(), &[_][]const u8{ zig_lib_dir, "std" });	450	comp.zig_std_dir = try fs.path.join(comp.arena(), &[_][]const u8{ zig_lib_dir, "std" });
...	@@ -465,7 +465,7 @@ pub const Compilation = struct {	...	@@ -465,7 +465,7 @@ pub const Compilation = struct {
465		465
466	comp.target_machine = llvm.CreateTargetMachine(	466	comp.target_machine = llvm.CreateTargetMachine(
467	comp.llvm_target,	467	comp.llvm_target,
468	comp.llvm_triple.toSliceConst(),	468	comp.llvm_triple.span(),
469	target_specific_cpu_args orelse "",	469	target_specific_cpu_args orelse "",
470	target_specific_cpu_features orelse "",	470	target_specific_cpu_features orelse "",
471	opt_level,	471	opt_level,
...	@@ -1106,7 +1106,7 @@ pub const Compilation = struct {	...	@@ -1106,7 +1106,7 @@ pub const Compilation = struct {
1106	}	1106	}
1107	}	1107	}
1108		1108
1109	for (self.link_libs_list.toSliceConst()) \|existing_lib\| {	1109	for (self.link_libs_list.span()) \|existing_lib\| {
1110	if (mem.eql(u8, name, existing_lib.name)) {	1110	if (mem.eql(u8, name, existing_lib.name)) {
1111	return existing_lib;	1111	return existing_lib;
1112	}	1112	}
...	@@ -1151,7 +1151,7 @@ pub const Compilation = struct {	...	@@ -1151,7 +1151,7 @@ pub const Compilation = struct {
1151		1151
1152	/// If the temporary directory for this compilation has not been created, it creates it.	1152	/// If the temporary directory for this compilation has not been created, it creates it.
1153	/// Then it creates a random file name in that dir and returns it.	1153	/// Then it creates a random file name in that dir and returns it.
1154	pub fn createRandomOutputPath(self: *Compilation, suffix: []const u8) !Buffer {	1154	pub fn createRandomOutputPath(self: *Compilation, suffix: []const u8) !ArrayListSentineled(u8, 0) {
1155	const tmp_dir = try self.getTmpDir();	1155	const tmp_dir = try self.getTmpDir();
1156	const file_prefix = self.getRandomFileName();	1156	const file_prefix = self.getRandomFileName();
1157		1157
...	@@ -1161,7 +1161,7 @@ pub const Compilation = struct {	...	@@ -1161,7 +1161,7 @@ pub const Compilation = struct {
1161	const full_path = try fs.path.join(self.gpa(), &[_][]const u8{ tmp_dir, file_name[0..] });	1161	const full_path = try fs.path.join(self.gpa(), &[_][]const u8{ tmp_dir, file_name[0..] });
1162	errdefer self.gpa().free(full_path);	1162	errdefer self.gpa().free(full_path);
1163		1163
1164	return Buffer.fromOwnedSlice(self.gpa(), full_path);	1164	return ArrayListSentineled(u8, 0).fromOwnedSlice(self.gpa(), full_path);
1165	}	1165	}
1166		1166
1167	/// If the temporary directory for this Compilation has not been created, creates it.	1167	/// If the temporary directory for this Compilation has not been created, creates it.
...	@@ -1279,7 +1279,7 @@ fn generateDeclFn(comp: Compilation, fn_decl: Decl.Fn) !void {	...	@@ -1279,7 +1279,7 @@ fn generateDeclFn(comp: Compilation, fn_decl: Decl.Fn) !void {
1279	const fn_type = try analyzeFnType(comp, tree_scope, fn_decl.base.parent_scope, fn_decl.fn_proto);	1279	const fn_type = try analyzeFnType(comp, tree_scope, fn_decl.base.parent_scope, fn_decl.fn_proto);
1280	defer fn_type.base.base.deref(comp);	1280	defer fn_type.base.base.deref(comp);
1281		1281
1282	var symbol_name = try std.Buffer.init(comp.gpa(), fn_decl.base.name);	1282	var symbol_name = try std.ArrayListSentineled(u8, 0).init(comp.gpa(), fn_decl.base.name);
1283	var symbol_name_consumed = false;	1283	var symbol_name_consumed = false;
1284	errdefer if (!symbol_name_consumed) symbol_name.deinit();	1284	errdefer if (!symbol_name_consumed) symbol_name.deinit();
1285		1285
...	@@ -1371,7 +1371,7 @@ fn analyzeFnType(	...	@@ -1371,7 +1371,7 @@ fn analyzeFnType(
1371	var params = ArrayList(Type.Fn.Param).init(comp.gpa());	1371	var params = ArrayList(Type.Fn.Param).init(comp.gpa());
1372	var params_consumed = false;	1372	var params_consumed = false;
1373	defer if (!params_consumed) {	1373	defer if (!params_consumed) {
1374	for (params.toSliceConst()) \|param\| {	1374	for (params.span()) \|param\| {
1375	param.typ.base.deref(comp);	1375	param.typ.base.deref(comp);
1376	}	1376	}
1377	params.deinit();	1377	params.deinit();
...	@@ -1426,7 +1426,7 @@ fn generateDeclFnProto(comp: Compilation, fn_decl: Decl.Fn) !void {	...	@@ -1426,7 +1426,7 @@ fn generateDeclFnProto(comp: Compilation, fn_decl: Decl.Fn) !void {
1426	);	1426	);
1427	defer fn_type.base.base.deref(comp);	1427	defer fn_type.base.base.deref(comp);
1428		1428
1429	var symbol_name = try std.Buffer.init(comp.gpa(), fn_decl.base.name);	1429	var symbol_name = try std.ArrayListSentineled(u8, 0).init(comp.gpa(), fn_decl.base.name);
1430	var symbol_name_consumed = false;	1430	var symbol_name_consumed = false;
1431	defer if (!symbol_name_consumed) symbol_name.deinit();	1431	defer if (!symbol_name_consumed) symbol_name.deinit();
1432		1432

src-self-hosted/dep_tokenizer.zig+59-59

...	@@ -33,7 +33,7 @@ pub const Tokenizer = struct {	...	@@ -33,7 +33,7 @@ pub const Tokenizer = struct {
33	break; // advance	33	break; // advance
34	},	34	},
35	else => {	35	else => {
36	self.state = State{ .target = try std.Buffer.initSize(&self.arena.allocator, 0) };	36	self.state = State{ .target = try std.ArrayListSentineled(u8, 0).initSize(&self.arena.allocator, 0) };
37	},	37	},
38	},	38	},
39	.target => \|*target\| switch (char) {	39	.target => \|*target\| switch (char) {
...	@@ -53,7 +53,7 @@ pub const Tokenizer = struct {	...	@@ -53,7 +53,7 @@ pub const Tokenizer = struct {
53	break; // advance	53	break; // advance
54	},	54	},
55	else => {	55	else => {
56	try target.appendByte(char);	56	try target.append(char);
57	break; // advance	57	break; // advance
58	},	58	},
59	},	59	},
...	@@ -62,24 +62,24 @@ pub const Tokenizer = struct {	...	@@ -62,24 +62,24 @@ pub const Tokenizer = struct {
62	return self.errorIllegalChar(self.index, char, "bad target escape", .{});	62	return self.errorIllegalChar(self.index, char, "bad target escape", .{});
63	},	63	},
64	' ', '#', '\\' => {	64	' ', '#', '\\' => {
65	try target.appendByte(char);	65	try target.append(char);
66	self.state = State{ .target = target.* };	66	self.state = State{ .target = target.* };
67	break; // advance	67	break; // advance
68	},	68	},
69	'$' => {	69	'$' => {
70	try target.append(self.bytes[self.index - 1 .. self.index]);	70	try target.appendSlice(self.bytes[self.index - 1 .. self.index]);
71	self.state = State{ .target_dollar_sign = target.* };	71	self.state = State{ .target_dollar_sign = target.* };
72	break; // advance	72	break; // advance
73	},	73	},
74	else => {	74	else => {
75	try target.append(self.bytes[self.index - 1 .. self.index + 1]);	75	try target.appendSlice(self.bytes[self.index - 1 .. self.index + 1]);
76	self.state = State{ .target = target.* };	76	self.state = State{ .target = target.* };
77	break; // advance	77	break; // advance
78	},	78	},
79	},	79	},
80	.target_dollar_sign => \|*target\| switch (char) {	80	.target_dollar_sign => \|*target\| switch (char) {
81	'$' => {	81	'$' => {
82	try target.appendByte(char);	82	try target.append(char);
83	self.state = State{ .target = target.* };	83	self.state = State{ .target = target.* };
84	break; // advance	84	break; // advance
85	},	85	},
...	@@ -89,7 +89,7 @@ pub const Tokenizer = struct {	...	@@ -89,7 +89,7 @@ pub const Tokenizer = struct {
89	},	89	},
90	.target_colon => \|*target\| switch (char) {	90	.target_colon => \|*target\| switch (char) {
91	'\n', '\r' => {	91	'\n', '\r' => {
92	const bytes = target.toSlice();	92	const bytes = target.span();
93	if (bytes.len != 0) {	93	if (bytes.len != 0) {
94	self.state = State{ .lhs = {} };	94	self.state = State{ .lhs = {} };
95	return Token{ .id = .target, .bytes = bytes };	95	return Token{ .id = .target, .bytes = bytes };
...	@@ -103,7 +103,7 @@ pub const Tokenizer = struct {	...	@@ -103,7 +103,7 @@ pub const Tokenizer = struct {
103	break; // advance	103	break; // advance
104	},	104	},
105	else => {	105	else => {
106	const bytes = target.toSlice();	106	const bytes = target.span();
107	if (bytes.len != 0) {	107	if (bytes.len != 0) {
108	self.state = State{ .rhs = {} };	108	self.state = State{ .rhs = {} };
109	return Token{ .id = .target, .bytes = bytes };	109	return Token{ .id = .target, .bytes = bytes };
...	@@ -115,7 +115,7 @@ pub const Tokenizer = struct {	...	@@ -115,7 +115,7 @@ pub const Tokenizer = struct {
115	},	115	},
116	.target_colon_reverse_solidus => \|*target\| switch (char) {	116	.target_colon_reverse_solidus => \|*target\| switch (char) {
117	'\n', '\r' => {	117	'\n', '\r' => {
118	const bytes = target.toSlice();	118	const bytes = target.span();
119	if (bytes.len != 0) {	119	if (bytes.len != 0) {
120	self.state = State{ .lhs = {} };	120	self.state = State{ .lhs = {} };
121	return Token{ .id = .target, .bytes = bytes };	121	return Token{ .id = .target, .bytes = bytes };
...	@@ -125,7 +125,7 @@ pub const Tokenizer = struct {	...	@@ -125,7 +125,7 @@ pub const Tokenizer = struct {
125	continue;	125	continue;
126	},	126	},
127	else => {	127	else => {
128	try target.append(self.bytes[self.index - 2 .. self.index + 1]);	128	try target.appendSlice(self.bytes[self.index - 2 .. self.index + 1]);
129	self.state = State{ .target = target.* };	129	self.state = State{ .target = target.* };
130	break;	130	break;
131	},	131	},
...	@@ -144,11 +144,11 @@ pub const Tokenizer = struct {	...	@@ -144,11 +144,11 @@ pub const Tokenizer = struct {
144	break; // advance	144	break; // advance
145	},	145	},
146	'"' => {	146	'"' => {
147	self.state = State{ .prereq_quote = try std.Buffer.initSize(&self.arena.allocator, 0) };	147	self.state = State{ .prereq_quote = try std.ArrayListSentineled(u8, 0).initSize(&self.arena.allocator, 0) };
148	break; // advance	148	break; // advance
149	},	149	},
150	else => {	150	else => {
151	self.state = State{ .prereq = try std.Buffer.initSize(&self.arena.allocator, 0) };	151	self.state = State{ .prereq = try std.ArrayListSentineled(u8, 0).initSize(&self.arena.allocator, 0) };
152	},	152	},
153	},	153	},
154	.rhs_continuation => switch (char) {	154	.rhs_continuation => switch (char) {
...	@@ -175,24 +175,24 @@ pub const Tokenizer = struct {	...	@@ -175,24 +175,24 @@ pub const Tokenizer = struct {
175	},	175	},
176	.prereq_quote => \|*prereq\| switch (char) {	176	.prereq_quote => \|*prereq\| switch (char) {
177	'"' => {	177	'"' => {
178	const bytes = prereq.toSlice();	178	const bytes = prereq.span();
179	self.index += 1;	179	self.index += 1;
180	self.state = State{ .rhs = {} };	180	self.state = State{ .rhs = {} };
181	return Token{ .id = .prereq, .bytes = bytes };	181	return Token{ .id = .prereq, .bytes = bytes };
182	},	182	},
183	else => {	183	else => {
184	try prereq.appendByte(char);	184	try prereq.append(char);
185	break; // advance	185	break; // advance
186	},	186	},
187	},	187	},
188	.prereq => \|*prereq\| switch (char) {	188	.prereq => \|*prereq\| switch (char) {
189	'\t', ' ' => {	189	'\t', ' ' => {
190	const bytes = prereq.toSlice();	190	const bytes = prereq.span();
191	self.state = State{ .rhs = {} };	191	self.state = State{ .rhs = {} };
192	return Token{ .id = .prereq, .bytes = bytes };	192	return Token{ .id = .prereq, .bytes = bytes };
193	},	193	},
194	'\n', '\r' => {	194	'\n', '\r' => {
195	const bytes = prereq.toSlice();	195	const bytes = prereq.span();
196	self.state = State{ .lhs = {} };	196	self.state = State{ .lhs = {} };
197	return Token{ .id = .prereq, .bytes = bytes };	197	return Token{ .id = .prereq, .bytes = bytes };
198	},	198	},
...	@@ -201,13 +201,13 @@ pub const Tokenizer = struct {	...	@@ -201,13 +201,13 @@ pub const Tokenizer = struct {
201	break; // advance	201	break; // advance
202	},	202	},
203	else => {	203	else => {
204	try prereq.appendByte(char);	204	try prereq.append(char);
205	break; // advance	205	break; // advance
206	},	206	},
207	},	207	},
208	.prereq_continuation => \|*prereq\| switch (char) {	208	.prereq_continuation => \|*prereq\| switch (char) {
209	'\n' => {	209	'\n' => {
210	const bytes = prereq.toSlice();	210	const bytes = prereq.span();
211	self.index += 1;	211	self.index += 1;
212	self.state = State{ .rhs = {} };	212	self.state = State{ .rhs = {} };
213	return Token{ .id = .prereq, .bytes = bytes };	213	return Token{ .id = .prereq, .bytes = bytes };
...	@@ -218,14 +218,14 @@ pub const Tokenizer = struct {	...	@@ -218,14 +218,14 @@ pub const Tokenizer = struct {
218	},	218	},
219	else => {	219	else => {
220	// not continuation	220	// not continuation
221	try prereq.append(self.bytes[self.index - 1 .. self.index + 1]);	221	try prereq.appendSlice(self.bytes[self.index - 1 .. self.index + 1]);
222	self.state = State{ .prereq = prereq.* };	222	self.state = State{ .prereq = prereq.* };
223	break; // advance	223	break; // advance
224	},	224	},
225	},	225	},
226	.prereq_continuation_linefeed => \|prereq\| switch (char) {	226	.prereq_continuation_linefeed => \|prereq\| switch (char) {
227	'\n' => {	227	'\n' => {
228	const bytes = prereq.toSlice();	228	const bytes = prereq.span();
229	self.index += 1;	229	self.index += 1;
230	self.state = State{ .rhs = {} };	230	self.state = State{ .rhs = {} };
231	return Token{ .id = .prereq, .bytes = bytes };	231	return Token{ .id = .prereq, .bytes = bytes };
...	@@ -249,7 +249,7 @@ pub const Tokenizer = struct {	...	@@ -249,7 +249,7 @@ pub const Tokenizer = struct {
249	.rhs_continuation_linefeed,	249	.rhs_continuation_linefeed,
250	=> {},	250	=> {},
251	.target => \|target\| {	251	.target => \|target\| {
252	return self.errorPosition(idx, target.toSlice(), "incomplete target", .{});	252	return self.errorPosition(idx, target.span(), "incomplete target", .{});
253	},	253	},
254	.target_reverse_solidus,	254	.target_reverse_solidus,
255	.target_dollar_sign,	255	.target_dollar_sign,
...	@@ -258,7 +258,7 @@ pub const Tokenizer = struct {	...	@@ -258,7 +258,7 @@ pub const Tokenizer = struct {
258	return self.errorIllegalChar(idx, self.bytes[idx], "incomplete escape", .{});	258	return self.errorIllegalChar(idx, self.bytes[idx], "incomplete escape", .{});
259	},	259	},
260	.target_colon => \|target\| {	260	.target_colon => \|target\| {
261	const bytes = target.toSlice();	261	const bytes = target.span();
262	if (bytes.len != 0) {	262	if (bytes.len != 0) {
263	self.index += 1;	263	self.index += 1;
264	self.state = State{ .rhs = {} };	264	self.state = State{ .rhs = {} };
...	@@ -268,7 +268,7 @@ pub const Tokenizer = struct {	...	@@ -268,7 +268,7 @@ pub const Tokenizer = struct {
268	self.state = State{ .lhs = {} };	268	self.state = State{ .lhs = {} };
269	},	269	},
270	.target_colon_reverse_solidus => \|target\| {	270	.target_colon_reverse_solidus => \|target\| {
271	const bytes = target.toSlice();	271	const bytes = target.span();
272	if (bytes.len != 0) {	272	if (bytes.len != 0) {
273	self.index += 1;	273	self.index += 1;
274	self.state = State{ .rhs = {} };	274	self.state = State{ .rhs = {} };
...	@@ -278,20 +278,20 @@ pub const Tokenizer = struct {	...	@@ -278,20 +278,20 @@ pub const Tokenizer = struct {
278	self.state = State{ .lhs = {} };	278	self.state = State{ .lhs = {} };
279	},	279	},
280	.prereq_quote => \|prereq\| {	280	.prereq_quote => \|prereq\| {
281	return self.errorPosition(idx, prereq.toSlice(), "incomplete quoted prerequisite", .{});	281	return self.errorPosition(idx, prereq.span(), "incomplete quoted prerequisite", .{});
282	},	282	},
283	.prereq => \|prereq\| {	283	.prereq => \|prereq\| {
284	const bytes = prereq.toSlice();	284	const bytes = prereq.span();
285	self.state = State{ .lhs = {} };	285	self.state = State{ .lhs = {} };
286	return Token{ .id = .prereq, .bytes = bytes };	286	return Token{ .id = .prereq, .bytes = bytes };
287	},	287	},
288	.prereq_continuation => \|prereq\| {	288	.prereq_continuation => \|prereq\| {
289	const bytes = prereq.toSlice();	289	const bytes = prereq.span();
290	self.state = State{ .lhs = {} };	290	self.state = State{ .lhs = {} };
291	return Token{ .id = .prereq, .bytes = bytes };	291	return Token{ .id = .prereq, .bytes = bytes };
292	},	292	},
293	.prereq_continuation_linefeed => \|prereq\| {	293	.prereq_continuation_linefeed => \|prereq\| {
294	const bytes = prereq.toSlice();	294	const bytes = prereq.span();
295	self.state = State{ .lhs = {} };	295	self.state = State{ .lhs = {} };
296	return Token{ .id = .prereq, .bytes = bytes };	296	return Token{ .id = .prereq, .bytes = bytes };
297	},	297	},
...	@@ -300,29 +300,29 @@ pub const Tokenizer = struct {	...	@@ -300,29 +300,29 @@ pub const Tokenizer = struct {
300	}	300	}
301		301
302	fn errorf(self: *Tokenizer, comptime fmt: []const u8, args: var) Error {	302	fn errorf(self: *Tokenizer, comptime fmt: []const u8, args: var) Error {
303	self.error_text = (try std.Buffer.allocPrint(&self.arena.allocator, fmt, args)).toSlice();	303	self.error_text = try std.fmt.allocPrintZ(&self.arena.allocator, fmt, args);
304	return Error.InvalidInput;	304	return Error.InvalidInput;
305	}	305	}
306		306
307	fn errorPosition(self: *Tokenizer, position: usize, bytes: []const u8, comptime fmt: []const u8, args: var) Error {	307	fn errorPosition(self: *Tokenizer, position: usize, bytes: []const u8, comptime fmt: []const u8, args: var) Error {
308	var buffer = try std.Buffer.initSize(&self.arena.allocator, 0);	308	var buffer = try std.ArrayListSentineled(u8, 0).initSize(&self.arena.allocator, 0);
309	try buffer.outStream().print(fmt, args);	309	try buffer.outStream().print(fmt, args);
310	try buffer.append(" '");	310	try buffer.appendSlice(" '");
311	var out = makeOutput(std.Buffer.append, &buffer);	311	var out = makeOutput(std.ArrayListSentineled(u8, 0).appendSlice, &buffer);
312	try printCharValues(&out, bytes);	312	try printCharValues(&out, bytes);
313	try buffer.append("'");	313	try buffer.appendSlice("'");
314	try buffer.outStream().print(" at position {}", .{position - (bytes.len - 1)});	314	try buffer.outStream().print(" at position {}", .{position - (bytes.len - 1)});
315	self.error_text = buffer.toSlice();	315	self.error_text = buffer.span();
316	return Error.InvalidInput;	316	return Error.InvalidInput;
317	}	317	}
318		318
319	fn errorIllegalChar(self: *Tokenizer, position: usize, char: u8, comptime fmt: []const u8, args: var) Error {	319	fn errorIllegalChar(self: *Tokenizer, position: usize, char: u8, comptime fmt: []const u8, args: var) Error {
320	var buffer = try std.Buffer.initSize(&self.arena.allocator, 0);	320	var buffer = try std.ArrayListSentineled(u8, 0).initSize(&self.arena.allocator, 0);
321	try buffer.append("illegal char ");	321	try buffer.appendSlice("illegal char ");
322	try printUnderstandableChar(&buffer, char);	322	try printUnderstandableChar(&buffer, char);
323	try buffer.outStream().print(" at position {}", .{position});	323	try buffer.outStream().print(" at position {}", .{position});
324	if (fmt.len != 0) try buffer.outStream().print(": " ++ fmt, args);	324	if (fmt.len != 0) try buffer.outStream().print(": " ++ fmt, args);
325	self.error_text = buffer.toSlice();	325	self.error_text = buffer.span();
326	return Error.InvalidInput;	326	return Error.InvalidInput;
327	}	327	}
328		328
...	@@ -333,18 +333,18 @@ pub const Tokenizer = struct {	...	@@ -333,18 +333,18 @@ pub const Tokenizer = struct {
333		333
334	const State = union(enum) {	334	const State = union(enum) {
335	lhs: void,	335	lhs: void,
336	target: std.Buffer,	336	target: std.ArrayListSentineled(u8, 0),
337	target_reverse_solidus: std.Buffer,	337	target_reverse_solidus: std.ArrayListSentineled(u8, 0),
338	target_dollar_sign: std.Buffer,	338	target_dollar_sign: std.ArrayListSentineled(u8, 0),
339	target_colon: std.Buffer,	339	target_colon: std.ArrayListSentineled(u8, 0),
340	target_colon_reverse_solidus: std.Buffer,	340	target_colon_reverse_solidus: std.ArrayListSentineled(u8, 0),
341	rhs: void,	341	rhs: void,
342	rhs_continuation: void,	342	rhs_continuation: void,
343	rhs_continuation_linefeed: void,	343	rhs_continuation_linefeed: void,
344	prereq_quote: std.Buffer,	344	prereq_quote: std.ArrayListSentineled(u8, 0),
345	prereq: std.Buffer,	345	prereq: std.ArrayListSentineled(u8, 0),
346	prereq_continuation: std.Buffer,	346	prereq_continuation: std.ArrayListSentineled(u8, 0),
347	prereq_continuation_linefeed: std.Buffer,	347	prereq_continuation_linefeed: std.ArrayListSentineled(u8, 0),
348	};	348	};
349		349
350	const Token = struct {	350	const Token = struct {
...	@@ -841,31 +841,31 @@ fn depTokenizer(input: []const u8, expect: []const u8) !void {	...	@@ -841,31 +841,31 @@ fn depTokenizer(input: []const u8, expect: []const u8) !void {
841	defer arena_allocator.deinit();	841	defer arena_allocator.deinit();
842		842
843	var it = Tokenizer.init(arena, input);	843	var it = Tokenizer.init(arena, input);
844	var buffer = try std.Buffer.initSize(arena, 0);	844	var buffer = try std.ArrayListSentineled(u8, 0).initSize(arena, 0);
845	var i: usize = 0;	845	var i: usize = 0;
846	while (true) {	846	while (true) {
847	const r = it.next() catch \|err\| {	847	const r = it.next() catch \|err\| {
848	switch (err) {	848	switch (err) {
849	Tokenizer.Error.InvalidInput => {	849	Tokenizer.Error.InvalidInput => {
850	if (i != 0) try buffer.append("\n");	850	if (i != 0) try buffer.appendSlice("\n");
851	try buffer.append("ERROR: ");	851	try buffer.appendSlice("ERROR: ");
852	try buffer.append(it.error_text);	852	try buffer.appendSlice(it.error_text);
853	},	853	},
854	else => return err,	854	else => return err,
855	}	855	}
856	break;	856	break;
857	};	857	};
858	const token = r orelse break;	858	const token = r orelse break;
859	if (i != 0) try buffer.append("\n");	859	if (i != 0) try buffer.appendSlice("\n");
860	try buffer.append(@tagName(token.id));	860	try buffer.appendSlice(@tagName(token.id));
861	try buffer.append(" = {");	861	try buffer.appendSlice(" = {");
862	for (token.bytes) \|b\| {	862	for (token.bytes) \|b\| {
863	try buffer.appendByte(printable_char_tab[b]);	863	try buffer.append(printable_char_tab[b]);
864	}	864	}
865	try buffer.append("}");	865	try buffer.appendSlice("}");
866	i += 1;	866	i += 1;
867	}	867	}
868	const got: []const u8 = buffer.toSlice();	868	const got: []const u8 = buffer.span();
869		869
870	if (std.mem.eql(u8, expect, got)) {	870	if (std.mem.eql(u8, expect, got)) {
871	testing.expect(true);	871	testing.expect(true);
...	@@ -995,13 +995,13 @@ fn printCharValues(out: var, bytes: []const u8) !void {	...	@@ -995,13 +995,13 @@ fn printCharValues(out: var, bytes: []const u8) !void {
995	}	995	}
996	}	996	}
997		997
998	fn printUnderstandableChar(buffer: *std.Buffer, char: u8) !void {	998	fn printUnderstandableChar(buffer: *std.ArrayListSentineled(u8, 0), char: u8) !void {
999	if (!std.ascii.isPrint(char) or char == ' ') {	999	if (!std.ascii.isPrint(char) or char == ' ') {
1000	try buffer.outStream().print("\\x{X:2}", .{char});	1000	try buffer.outStream().print("\\x{X:2}", .{char});
1001	} else {	1001	} else {
1002	try buffer.append("'");	1002	try buffer.appendSlice("'");
1003	try buffer.appendByte(printable_char_tab[char]);	1003	try buffer.append(printable_char_tab[char]);
1004	try buffer.append("'");	1004	try buffer.appendSlice("'");
1005	}	1005	}
1006	}	1006	}
1007		1007

src-self-hosted/errmsg.zig+2-2

...	@@ -158,7 +158,7 @@ pub const Msg = struct {	...	@@ -158,7 +158,7 @@ pub const Msg = struct {
158	parse_error: *const ast.Error,	158	parse_error: *const ast.Error,
159	) !*Msg {	159	) !*Msg {
160	const loc_token = parse_error.loc();	160	const loc_token = parse_error.loc();
161	var text_buf = try std.Buffer.initSize(comp.gpa(), 0);	161	var text_buf = std.ArrayList(u8).init(comp.gpa());
162	defer text_buf.deinit();	162	defer text_buf.deinit();
163		163
164	const realpath_copy = try mem.dupe(comp.gpa(), u8, tree_scope.root().realpath);	164	const realpath_copy = try mem.dupe(comp.gpa(), u8, tree_scope.root().realpath);
...	@@ -197,7 +197,7 @@ pub const Msg = struct {	...	@@ -197,7 +197,7 @@ pub const Msg = struct {
197	realpath: []const u8,	197	realpath: []const u8,
198	) !*Msg {	198	) !*Msg {
199	const loc_token = parse_error.loc();	199	const loc_token = parse_error.loc();
200	var text_buf = try std.Buffer.initSize(allocator, 0);	200	var text_buf = std.ArrayList(u8).init(allocator);
201	defer text_buf.deinit();	201	defer text_buf.deinit();
202		202
203	const realpath_copy = try mem.dupe(allocator, u8, realpath);	203	const realpath_copy = try mem.dupe(allocator, u8, realpath);

src-self-hosted/ir.zig+4-4

...	@@ -965,9 +965,9 @@ pub const Code = struct {	...	@@ -965,9 +965,9 @@ pub const Code = struct {
965		965
966	pub fn dump(self: *Code) void {	966	pub fn dump(self: *Code) void {
967	var bb_i: usize = 0;	967	var bb_i: usize = 0;
968	for (self.basic_block_list.toSliceConst()) \|bb\| {	968	for (self.basic_block_list.span()) \|bb\| {
969	std.debug.warn("{s}_{}:\n", .{ bb.name_hint, bb.debug_id });	969	std.debug.warn("{s}_{}:\n", .{ bb.name_hint, bb.debug_id });
970	for (bb.instruction_list.toSliceConst()) \|instr\| {	970	for (bb.instruction_list.span()) \|instr\| {
971	std.debug.warn(" ", .{});	971	std.debug.warn(" ", .{});
972	instr.dump();	972	instr.dump();
973	std.debug.warn("\n", .{});	973	std.debug.warn("\n", .{});
...	@@ -978,7 +978,7 @@ pub const Code = struct {	...	@@ -978,7 +978,7 @@ pub const Code = struct {
978	/// returns a ref-incremented value, or adds a compile error	978	/// returns a ref-incremented value, or adds a compile error
979	pub fn getCompTimeResult(self: Code, comp: Compilation) !*Value {	979	pub fn getCompTimeResult(self: Code, comp: Compilation) !*Value {
980	const bb = self.basic_block_list.at(0);	980	const bb = self.basic_block_list.at(0);
981	for (bb.instruction_list.toSliceConst()) \|inst\| {	981	for (bb.instruction_list.span()) \|inst\| {
982	if (inst.cast(Inst.Return)) \|ret_inst\| {	982	if (inst.cast(Inst.Return)) \|ret_inst\| {
983	const ret_value = ret_inst.params.return_value;	983	const ret_value = ret_inst.params.return_value;
984	if (ret_value.isCompTime()) {	984	if (ret_value.isCompTime()) {
...	@@ -2585,6 +2585,6 @@ pub fn analyze(comp: Compilation, old_code: Code, expected_type: ?Type) !Cod	...	@@ -2585,6 +2585,6 @@ pub fn analyze(comp: Compilation, old_code: Code, expected_type: ?Type) !Cod
2585	return ira.irb.finish();	2585	return ira.irb.finish();
2586	}	2586	}
2587		2587
2588	ira.irb.code.return_type = try ira.resolvePeerTypes(expected_type, ira.src_implicit_return_type_list.toSliceConst());	2588	ira.irb.code.return_type = try ira.resolvePeerTypes(expected_type, ira.src_implicit_return_type_list.span());
2589	return ira.irb.finish();	2589	return ira.irb.finish();
2590	}	2590	}

src-self-hosted/libc_installation.zig+20-24

...	@@ -14,11 +14,11 @@ usingnamespace @import("windows_sdk.zig");	...	@@ -14,11 +14,11 @@ usingnamespace @import("windows_sdk.zig");
14		14
15	/// See the render function implementation for documentation of the fields.	15	/// See the render function implementation for documentation of the fields.
16	pub const LibCInstallation = struct {	16	pub const LibCInstallation = struct {
17	include_dir: ?[:0]const u8 = null,	17	include_dir: ?[]const u8 = null,
18	sys_include_dir: ?[:0]const u8 = null,	18	sys_include_dir: ?[]const u8 = null,
19	crt_dir: ?[:0]const u8 = null,	19	crt_dir: ?[]const u8 = null,
20	msvc_lib_dir: ?[:0]const u8 = null,	20	msvc_lib_dir: ?[]const u8 = null,
21	kernel32_lib_dir: ?[:0]const u8 = null,	21	kernel32_lib_dir: ?[]const u8 = null,
22		22
23	pub const FindError = error{	23	pub const FindError = error{
24	OutOfMemory,	24	OutOfMemory,
...	@@ -54,7 +54,7 @@ pub const LibCInstallation = struct {	...	@@ -54,7 +54,7 @@ pub const LibCInstallation = struct {
54	}	54	}
55	}	55	}
56		56
57	const contents = try std.io.readFileAlloc(allocator, libc_file);	57	const contents = try std.fs.cwd().readFileAlloc(allocator, libc_file, std.math.maxInt(usize));
58	defer allocator.free(contents);	58	defer allocator.free(contents);
59		59
60	var it = std.mem.tokenize(contents, "\n");	60	var it = std.mem.tokenize(contents, "\n");
...	@@ -229,7 +229,7 @@ pub const LibCInstallation = struct {	...	@@ -229,7 +229,7 @@ pub const LibCInstallation = struct {
229	"-xc",	229	"-xc",
230	dev_null,	230	dev_null,
231	};	231	};
232	const exec_res = std.ChildProcess.exec2(.{	232	const exec_res = std.ChildProcess.exec(.{
233	.allocator = allocator,	233	.allocator = allocator,
234	.argv = &argv,	234	.argv = &argv,
235	.max_output_bytes = 1024 * 1024,	235	.max_output_bytes = 1024 * 1024,
...	@@ -327,15 +327,14 @@ pub const LibCInstallation = struct {	...	@@ -327,15 +327,14 @@ pub const LibCInstallation = struct {
327	var search_buf: [2]Search = undefined;	327	var search_buf: [2]Search = undefined;
328	const searches = fillSearch(&search_buf, sdk);	328	const searches = fillSearch(&search_buf, sdk);
329		329
330	var result_buf = try std.Buffer.initSize(allocator, 0);	330	var result_buf = std.ArrayList(u8).init(allocator);
331	defer result_buf.deinit();	331	defer result_buf.deinit();
332		332
333	for (searches) \|search\| {	333	for (searches) \|search\| {
334	result_buf.shrink(0);	334	result_buf.shrink(0);
335	const stream = result_buf.outStream();	335	try result_buf.outStream().print("{}\\Include\\{}\\ucrt", .{ search.path, search.version });
336	try stream.print("{}\\Include\\{}\\ucrt", .{ search.path, search.version });
337		336
338	var dir = fs.cwd().openDir(result_buf.toSliceConst(), .{}) catch \|err\| switch (err) {	337	var dir = fs.cwd().openDir(result_buf.span(), .{}) catch \|err\| switch (err) {
339	error.FileNotFound,	338	error.FileNotFound,
340	error.NotDir,	339	error.NotDir,
341	error.NoDevice,	340	error.NoDevice,
...	@@ -367,7 +366,7 @@ pub const LibCInstallation = struct {	...	@@ -367,7 +366,7 @@ pub const LibCInstallation = struct {
367	var search_buf: [2]Search = undefined;	366	var search_buf: [2]Search = undefined;
368	const searches = fillSearch(&search_buf, sdk);	367	const searches = fillSearch(&search_buf, sdk);
369		368
370	var result_buf = try std.Buffer.initSize(allocator, 0);	369	var result_buf = std.ArrayList(u8).init(allocator);
371	defer result_buf.deinit();	370	defer result_buf.deinit();
372		371
373	const arch_sub_dir = switch (builtin.arch) {	372	const arch_sub_dir = switch (builtin.arch) {
...	@@ -379,10 +378,9 @@ pub const LibCInstallation = struct {	...	@@ -379,10 +378,9 @@ pub const LibCInstallation = struct {
379		378
380	for (searches) \|search\| {	379	for (searches) \|search\| {
381	result_buf.shrink(0);	380	result_buf.shrink(0);
382	const stream = result_buf.outStream();	381	try result_buf.outStream().print("{}\\Lib\\{}\\ucrt\\{}", .{ search.path, search.version, arch_sub_dir });
383	try stream.print("{}\\Lib\\{}\\ucrt\\{}", .{ search.path, search.version, arch_sub_dir });
384		382
385	var dir = fs.cwd().openDir(result_buf.toSliceConst(), .{}) catch \|err\| switch (err) {	383	var dir = fs.cwd().openDir(result_buf.span(), .{}) catch \|err\| switch (err) {
386	error.FileNotFound,	384	error.FileNotFound,
387	error.NotDir,	385	error.NotDir,
388	error.NoDevice,	386	error.NoDevice,
...	@@ -422,7 +420,7 @@ pub const LibCInstallation = struct {	...	@@ -422,7 +420,7 @@ pub const LibCInstallation = struct {
422	var search_buf: [2]Search = undefined;	420	var search_buf: [2]Search = undefined;
423	const searches = fillSearch(&search_buf, sdk);	421	const searches = fillSearch(&search_buf, sdk);
424		422
425	var result_buf = try std.Buffer.initSize(allocator, 0);	423	var result_buf = std.ArrayList(u8).init(allocator);
426	defer result_buf.deinit();	424	defer result_buf.deinit();
427		425
428	const arch_sub_dir = switch (builtin.arch) {	426	const arch_sub_dir = switch (builtin.arch) {
...	@@ -437,7 +435,7 @@ pub const LibCInstallation = struct {	...	@@ -437,7 +435,7 @@ pub const LibCInstallation = struct {
437	const stream = result_buf.outStream();	435	const stream = result_buf.outStream();
438	try stream.print("{}\\Lib\\{}\\um\\{}", .{ search.path, search.version, arch_sub_dir });	436	try stream.print("{}\\Lib\\{}\\um\\{}", .{ search.path, search.version, arch_sub_dir });
439		437
440	var dir = fs.cwd().openDir(result_buf.toSliceConst(), .{}) catch \|err\| switch (err) {	438	var dir = fs.cwd().openDir(result_buf.span(), .{}) catch \|err\| switch (err) {
441	error.FileNotFound,	439	error.FileNotFound,
442	error.NotDir,	440	error.NotDir,
443	error.NoDevice,	441	error.NoDevice,
...	@@ -470,12 +468,10 @@ pub const LibCInstallation = struct {	...	@@ -470,12 +468,10 @@ pub const LibCInstallation = struct {
470	const up1 = fs.path.dirname(msvc_lib_dir) orelse return error.LibCStdLibHeaderNotFound;	468	const up1 = fs.path.dirname(msvc_lib_dir) orelse return error.LibCStdLibHeaderNotFound;
471	const up2 = fs.path.dirname(up1) orelse return error.LibCStdLibHeaderNotFound;	469	const up2 = fs.path.dirname(up1) orelse return error.LibCStdLibHeaderNotFound;
472		470
473	var result_buf = try std.Buffer.init(allocator, up2);	471	const dir_path = try fs.path.join(allocator, &[_][]const u8{ up2, "include" });
474	defer result_buf.deinit();	472	errdefer allocator.free(dir_path);
475
476	try result_buf.append("\\include");
477		473
478	var dir = fs.cwd().openDir(result_buf.toSliceConst(), .{}) catch \|err\| switch (err) {	474	var dir = fs.cwd().openDir(dir_path, .{}) catch \|err\| switch (err) {
479	error.FileNotFound,	475	error.FileNotFound,
480	error.NotDir,	476	error.NotDir,
481	error.NoDevice,	477	error.NoDevice,
...	@@ -490,7 +486,7 @@ pub const LibCInstallation = struct {	...	@@ -490,7 +486,7 @@ pub const LibCInstallation = struct {
490	else => return error.FileSystem,	486	else => return error.FileSystem,
491	};	487	};
492		488
493	self.sys_include_dir = result_buf.toOwnedSlice();	489	self.sys_include_dir = dir_path;
494	}	490	}
495		491
496	fn findNativeMsvcLibDir(	492	fn findNativeMsvcLibDir(
...	@@ -522,7 +518,7 @@ fn ccPrintFileName(args: CCPrintFileNameOptions) ![:0]u8 {	...	@@ -522,7 +518,7 @@ fn ccPrintFileName(args: CCPrintFileNameOptions) ![:0]u8 {
522	defer allocator.free(arg1);	518	defer allocator.free(arg1);
523	const argv = [_][]const u8{ cc_exe, arg1 };	519	const argv = [_][]const u8{ cc_exe, arg1 };
524		520
525	const exec_res = std.ChildProcess.exec2(.{	521	const exec_res = std.ChildProcess.exec(.{
526	.allocator = allocator,	522	.allocator = allocator,
527	.argv = &argv,	523	.argv = &argv,
528	.max_output_bytes = 1024 * 1024,	524	.max_output_bytes = 1024 * 1024,

src-self-hosted/link.zig+12-12

...	@@ -15,10 +15,10 @@ const Context = struct {	...	@@ -15,10 +15,10 @@ const Context = struct {
15	link_in_crt: bool,	15	link_in_crt: bool,
16		16
17	link_err: error{OutOfMemory}!void,	17	link_err: error{OutOfMemory}!void,
18	link_msg: std.Buffer,	18	link_msg: std.ArrayListSentineled(u8, 0),
19		19
20	libc: *LibCInstallation,	20	libc: *LibCInstallation,
21	out_file_path: std.Buffer,	21	out_file_path: std.ArrayListSentineled(u8, 0),
22	};	22	};
23		23
24	pub fn link(comp: *Compilation) !void {	24	pub fn link(comp: *Compilation) !void {
...	@@ -34,9 +34,9 @@ pub fn link(comp: *Compilation) !void {	...	@@ -34,9 +34,9 @@ pub fn link(comp: *Compilation) !void {
34	};	34	};
35	defer ctx.arena.deinit();	35	defer ctx.arena.deinit();
36	ctx.args = std.ArrayList([*:0]const u8).init(&ctx.arena.allocator);	36	ctx.args = std.ArrayList([*:0]const u8).init(&ctx.arena.allocator);
37	ctx.link_msg = std.Buffer.initNull(&ctx.arena.allocator);	37	ctx.link_msg = std.ArrayListSentineled(u8, 0).initNull(&ctx.arena.allocator);
38		38
39	ctx.out_file_path = try std.Buffer.init(&ctx.arena.allocator, comp.name.toSliceConst());	39	ctx.out_file_path = try std.ArrayListSentineled(u8, 0).init(&ctx.arena.allocator, comp.name.span());
40	switch (comp.kind) {	40	switch (comp.kind) {
41	.Exe => {	41	.Exe => {
42	try ctx.out_file_path.append(comp.target.exeFileExt());	42	try ctx.out_file_path.append(comp.target.exeFileExt());
...	@@ -70,7 +70,7 @@ pub fn link(comp: *Compilation) !void {	...	@@ -70,7 +70,7 @@ pub fn link(comp: *Compilation) !void {
70	try constructLinkerArgs(&ctx);	70	try constructLinkerArgs(&ctx);
71		71
72	if (comp.verbose_link) {	72	if (comp.verbose_link) {
73	for (ctx.args.toSliceConst()) \|arg, i\| {	73	for (ctx.args.span()) \|arg, i\| {
74	const space = if (i == 0) "" else " ";	74	const space = if (i == 0) "" else " ";
75	std.debug.warn("{}{s}", .{ space, arg });	75	std.debug.warn("{}{s}", .{ space, arg });
76	}	76	}
...	@@ -78,7 +78,7 @@ pub fn link(comp: *Compilation) !void {	...	@@ -78,7 +78,7 @@ pub fn link(comp: *Compilation) !void {
78	}	78	}
79		79
80	const extern_ofmt = toExternObjectFormatType(comp.target.getObjectFormat());	80	const extern_ofmt = toExternObjectFormatType(comp.target.getObjectFormat());
81	const args_slice = ctx.args.toSlice();	81	const args_slice = ctx.args.span();
82		82
83	{	83	{
84	// LLD is not thread-safe, so we grab a global lock.	84	// LLD is not thread-safe, so we grab a global lock.
...	@@ -91,7 +91,7 @@ pub fn link(comp: *Compilation) !void {	...	@@ -91,7 +91,7 @@ pub fn link(comp: *Compilation) !void {
91	// TODO capture these messages and pass them through the system, reporting them through the	91	// TODO capture these messages and pass them through the system, reporting them through the
92	// event system instead of printing them directly here.	92	// event system instead of printing them directly here.
93	// perhaps try to parse and understand them.	93	// perhaps try to parse and understand them.
94	std.debug.warn("{}\n", .{ctx.link_msg.toSliceConst()});	94	std.debug.warn("{}\n", .{ctx.link_msg.span()});
95	}	95	}
96	return error.LinkFailed;	96	return error.LinkFailed;
97	}	97	}
...	@@ -173,7 +173,7 @@ fn constructLinkerArgsElf(ctx: *Context) !void {	...	@@ -173,7 +173,7 @@ fn constructLinkerArgsElf(ctx: *Context) !void {
173	//}	173	//}
174		174
175	try ctx.args.append("-o");	175	try ctx.args.append("-o");
176	try ctx.args.append(ctx.out_file_path.toSliceConst());	176	try ctx.args.append(ctx.out_file_path.span());
177		177
178	if (ctx.link_in_crt) {	178	if (ctx.link_in_crt) {
179	const crt1o = if (ctx.comp.is_static) "crt1.o" else "Scrt1.o";	179	const crt1o = if (ctx.comp.is_static) "crt1.o" else "Scrt1.o";
...	@@ -291,7 +291,7 @@ fn constructLinkerArgsCoff(ctx: *Context) !void {	...	@@ -291,7 +291,7 @@ fn constructLinkerArgsCoff(ctx: *Context) !void {
291		291
292	const is_library = ctx.comp.kind == .Lib;	292	const is_library = ctx.comp.kind == .Lib;
293		293
294	const out_arg = try std.fmt.allocPrint(&ctx.arena.allocator, "-OUT:{}\x00", .{ctx.out_file_path.toSliceConst()});	294	const out_arg = try std.fmt.allocPrint(&ctx.arena.allocator, "-OUT:{}\x00", .{ctx.out_file_path.span()});
295	try ctx.args.append(@ptrCast([*:0]const u8, out_arg.ptr));	295	try ctx.args.append(@ptrCast([*:0]const u8, out_arg.ptr));
296		296
297	if (ctx.comp.haveLibC()) {	297	if (ctx.comp.haveLibC()) {
...	@@ -394,7 +394,7 @@ fn constructLinkerArgsMachO(ctx: *Context) !void {	...	@@ -394,7 +394,7 @@ fn constructLinkerArgsMachO(ctx: *Context) !void {
394	}	394	}
395		395
396	try ctx.args.append("-o");	396	try ctx.args.append("-o");
397	try ctx.args.append(ctx.out_file_path.toSliceConst());	397	try ctx.args.append(ctx.out_file_path.span());
398		398
399	if (shared) {	399	if (shared) {
400	try ctx.args.append("-headerpad_max_install_names");	400	try ctx.args.append("-headerpad_max_install_names");
...	@@ -432,7 +432,7 @@ fn constructLinkerArgsMachO(ctx: *Context) !void {	...	@@ -432,7 +432,7 @@ fn constructLinkerArgsMachO(ctx: *Context) !void {
432		432
433	// TODO	433	// TODO
434	//if (ctx.comp.target == Target.Native) {	434	//if (ctx.comp.target == Target.Native) {
435	// for (ctx.comp.link_libs_list.toSliceConst()) \|lib\| {	435	// for (ctx.comp.link_libs_list.span()) \|lib\| {
436	// if (mem.eql(u8, lib.name, "c")) {	436	// if (mem.eql(u8, lib.name, "c")) {
437	// // on Darwin, libSystem has libc in it, but also you have to use it	437	// // on Darwin, libSystem has libc in it, but also you have to use it
438	// // to make syscalls because the syscall numbers are not documented	438	// // to make syscalls because the syscall numbers are not documented
...	@@ -482,7 +482,7 @@ fn addFnObjects(ctx: *Context) !void {	...	@@ -482,7 +482,7 @@ fn addFnObjects(ctx: *Context) !void {
482	ctx.comp.gpa().destroy(node);	482	ctx.comp.gpa().destroy(node);
483	continue;	483	continue;
484	};	484	};
485	try ctx.args.append(fn_val.containing_object.toSliceConst());	485	try ctx.args.append(fn_val.containing_object.span());
486	it = node.next;	486	it = node.next;
487	}	487	}
488	}	488	}

src-self-hosted/main.zig+7-7

...	@@ -421,7 +421,7 @@ fn buildOutputType(allocator: *Allocator, args: []const []const u8, out_type: Co	...	@@ -421,7 +421,7 @@ fn buildOutputType(allocator: *Allocator, args: []const []const u8, out_type: Co
421	process.exit(1);	421	process.exit(1);
422	}	422	}
423		423
424	try ZigCompiler.setLlvmArgv(allocator, mllvm_flags.toSliceConst());	424	try ZigCompiler.setLlvmArgv(allocator, mllvm_flags.span());
425		425
426	const zig_lib_dir = introspect.resolveZigLibDir(allocator) catch process.exit(1);	426	const zig_lib_dir = introspect.resolveZigLibDir(allocator) catch process.exit(1);
427	defer allocator.free(zig_lib_dir);	427	defer allocator.free(zig_lib_dir);
...	@@ -448,14 +448,14 @@ fn buildOutputType(allocator: *Allocator, args: []const []const u8, out_type: Co	...	@@ -448,14 +448,14 @@ fn buildOutputType(allocator: *Allocator, args: []const []const u8, out_type: Co
448	comp.override_libc = &override_libc;	448	comp.override_libc = &override_libc;
449	}	449	}
450		450
451	for (system_libs.toSliceConst()) \|lib\| {	451	for (system_libs.span()) \|lib\| {
452	_ = try comp.addLinkLib(lib, true);	452	_ = try comp.addLinkLib(lib, true);
453	}	453	}
454		454
455	comp.version = version;	455	comp.version = version;
456	comp.is_test = false;	456	comp.is_test = false;
457	comp.linker_script = linker_script;	457	comp.linker_script = linker_script;
458	comp.clang_argv = clang_argv_buf.toSliceConst();	458	comp.clang_argv = clang_argv_buf.span();
459	comp.strip = strip;	459	comp.strip = strip;
460		460
461	comp.verbose_tokenize = verbose_tokenize;	461	comp.verbose_tokenize = verbose_tokenize;
...	@@ -488,8 +488,8 @@ fn buildOutputType(allocator: *Allocator, args: []const []const u8, out_type: Co	...	@@ -488,8 +488,8 @@ fn buildOutputType(allocator: *Allocator, args: []const []const u8, out_type: Co
488	comp.emit_asm = emit_asm;	488	comp.emit_asm = emit_asm;
489	comp.emit_llvm_ir = emit_llvm_ir;	489	comp.emit_llvm_ir = emit_llvm_ir;
490	comp.emit_h = emit_h;	490	comp.emit_h = emit_h;
491	comp.assembly_files = assembly_files.toSliceConst();	491	comp.assembly_files = assembly_files.span();
492	comp.link_objects = link_objects.toSliceConst();	492	comp.link_objects = link_objects.span();
493		493
494	comp.start();	494	comp.start();
495	processBuildEvents(comp, color);	495	processBuildEvents(comp, color);
...	@@ -683,7 +683,7 @@ fn cmdFmt(allocator: *Allocator, args: []const []const u8) !void {	...	@@ -683,7 +683,7 @@ fn cmdFmt(allocator: *Allocator, args: []const []const u8) !void {
683	};	683	};
684		684
685	var group = event.Group(FmtError!void).init(allocator);	685	var group = event.Group(FmtError!void).init(allocator);
686	for (input_files.toSliceConst()) \|file_path\| {	686	for (input_files.span()) \|file_path\| {
687	try group.call(fmtPath, .{ &fmt, file_path, check_flag });	687	try group.call(fmtPath, .{ &fmt, file_path, check_flag });
688	}	688	}
689	try group.wait();	689	try group.wait();
...	@@ -898,7 +898,7 @@ const CliPkg = struct {	...	@@ -898,7 +898,7 @@ const CliPkg = struct {
898	}	898	}
899		899
900	pub fn deinit(self: *CliPkg) void {	900	pub fn deinit(self: *CliPkg) void {
901	for (self.children.toSliceConst()) \|child\| {	901	for (self.children.span()) \|child\| {
902	child.deinit();	902	child.deinit();
903	}	903	}
904	self.children.deinit();	904	self.children.deinit();

src-self-hosted/package.zig+5-5

...	@@ -1,11 +1,11 @@	...	@@ -1,11 +1,11 @@
1	const std = @import("std");	1	const std = @import("std");
2	const mem = std.mem;	2	const mem = std.mem;
3	const assert = std.debug.assert;	3	const assert = std.debug.assert;
4	const Buffer = std.Buffer;	4	const ArrayListSentineled = std.ArrayListSentineled;
5		5
6	pub const Package = struct {	6	pub const Package = struct {
7	root_src_dir: Buffer,	7	root_src_dir: ArrayListSentineled(u8, 0),
8	root_src_path: Buffer,	8	root_src_path: ArrayListSentineled(u8, 0),
9		9
10	/// relative to root_src_dir	10	/// relative to root_src_dir
11	table: Table,	11	table: Table,
...	@@ -17,8 +17,8 @@ pub const Package = struct {	...	@@ -17,8 +17,8 @@ pub const Package = struct {
17	pub fn create(allocator: mem.Allocator, root_src_dir: []const u8, root_src_path: []const u8) !Package {	17	pub fn create(allocator: mem.Allocator, root_src_dir: []const u8, root_src_path: []const u8) !Package {
18	const ptr = try allocator.create(Package);	18	const ptr = try allocator.create(Package);
19	ptr.* = Package{	19	ptr.* = Package{
20	.root_src_dir = try Buffer.init(allocator, root_src_dir),	20	.root_src_dir = try ArrayListSentineled(u8, 0).init(allocator, root_src_dir),
21	.root_src_path = try Buffer.init(allocator, root_src_path),	21	.root_src_path = try ArrayListSentineled(u8, 0).init(allocator, root_src_path),
22	.table = Table.init(allocator),	22	.table = Table.init(allocator),
23	};	23	};
24	return ptr;	24	return ptr;

src-self-hosted/stage2.zig+57-55

 @@ -8,7 +8,7 @@ const fs = std.fs;
 const process = std.process;
 const Allocator = mem.Allocator;
 const ArrayList = std.ArrayList;
-const Buffer = std.Buffer;
+const ArrayListSentineled = std.ArrayListSentineled;
 const Target = std.Target;
 const CrossTarget = std.zig.CrossTarget;
 const self_hosted_main = @import("main.zig");
 @@ -188,14 +188,14 @@ fn fmtMain(argc: c_int, argv: [*]const [*:0]const u8) !void {
     const argc_usize = @intCast(usize, argc);
     var arg_i: usize = 0;
     while (arg_i < argc_usize) : (arg_i += 1) {
-        try args_list.append(mem.toSliceConst(u8, argv[arg_i]));
+        try args_list.append(mem.spanZ(argv[arg_i]));
     }
     stdout = std.io.getStdOut().outStream();
     stderr_file = std.io.getStdErr();
     stderr = stderr_file.outStream();
-    const args = args_list.toSliceConst()[2..];
+    const args = args_list.span()[2..];
     var color: errmsg.Color = .Auto;
     var stdin_flag: bool = false;
 @@ -288,7 +288,7 @@ fn fmtMain(argc: c_int, argv: [*]const [*:0]const u8) !void {
         .allocator = allocator,
     };
-    for (input_files.toSliceConst()) |file_path| {
+    for (input_files.span()) |file_path| {
         try fmtPath(&fmt, file_path, check_flag);
     }
     if (fmt.any_error) {
 @@ -321,7 +321,8 @@ fn fmtPath(fmt: *Fmt, file_path: []const u8, check_mode: bool) FmtError!void {
     if (fmt.seen.exists(file_path)) return;
     try fmt.seen.put(file_path);
-    const source_code = io.readFileAlloc(fmt.allocator, file_path) catch |err| switch (err) {
+    const max = std.math.maxInt(usize);
+    const source_code = fs.cwd().readFileAlloc(fmt.allocator, file_path, max) catch |err| switch (err) {
         error.IsDir, error.AccessDenied => {
             // TODO make event based (and dir.next())
             var dir = try fs.cwd().openDir(file_path, .{ .iterate = true });
 @@ -413,12 +414,13 @@ fn printErrMsgToFile(
     const start_loc = tree.tokenLocationPtr(0, first_token);
     const end_loc = tree.tokenLocationPtr(first_token.end, last_token);
-    var text_buf = try std.Buffer.initSize(allocator, 0);
+    var text_buf = std.ArrayList(u8).init(allocator);
-    const out_stream = &text_buf.outStream();
+    defer text_buf.deinit();
+    const out_stream = text_buf.outStream();
     try parse_error.render(&tree.tokens, out_stream);
-    const text = text_buf.toOwnedSlice();
+    const text = text_buf.span();
-    const stream = &file.outStream();
+    const stream = file.outStream();
     try stream.print("{}:{}:{}: error: {}\n", .{ path, start_loc.line + 1, start_loc.column + 1, text });
     if (!color_on) return;
 @@ -450,10 +452,10 @@ export fn stage2_DepTokenizer_deinit(self: *stage2_DepTokenizer) void {
 export fn stage2_DepTokenizer_next(self: *stage2_DepTokenizer) stage2_DepNextResult {
     const otoken = self.handle.next() catch {
-        const textz = std.Buffer.init(&self.handle.arena.allocator, self.handle.error_text) catch @panic("failed to create .d tokenizer error text");
+        const textz = std.ArrayListSentineled(u8, 0).init(&self.handle.arena.allocator, self.handle.error_text) catch @panic("failed to create .d tokenizer error text");
         return stage2_DepNextResult{
             .type_id = .error_,
-            .textz = textz.toSlice().ptr,
+            .textz = textz.span().ptr,
         };
     };
     const token = otoken orelse {
 @@ -462,13 +464,13 @@ export fn stage2_DepTokenizer_next(self: *stage2_DepTokenizer) stage2_DepNextRes
             .textz = undefined,
         };
     };
-    const textz = std.Buffer.init(&self.handle.arena.allocator, token.bytes) catch @panic("failed to create .d tokenizer token text");
+    const textz = std.ArrayListSentineled(u8, 0).init(&self.handle.arena.allocator, token.bytes) catch @panic("failed to create .d tokenizer token text");
     return stage2_DepNextResult{
         .type_id = switch (token.id) {
             .target => .target,
             .prereq => .prereq,
         },
-        .textz = textz.toSlice().ptr,
+        .textz = textz.span().ptr,
     };
 }
 @@ -575,7 +577,7 @@ fn detectNativeCpuWithLLVM(
     var result = Target.Cpu.baseline(arch);
     if (llvm_cpu_name_z) |cpu_name_z| {
-        const llvm_cpu_name = mem.toSliceConst(u8, cpu_name_z);
+        const llvm_cpu_name = mem.spanZ(cpu_name_z);
         for (arch.allCpuModels()) |model| {
             const this_llvm_name = model.llvm_name orelse continue;
 @@ -596,7 +598,7 @@ fn detectNativeCpuWithLLVM(
     const all_features = arch.allFeaturesList();
     if (llvm_cpu_features_opt) |llvm_cpu_features| {
-        var it = mem.tokenize(mem.toSliceConst(u8, llvm_cpu_features), ",");
+        var it = mem.tokenize(mem.spanZ(llvm_cpu_features), ",");
         while (it.next()) |decorated_llvm_feat| {
             var op: enum {
                 add,
 @@ -691,12 +693,11 @@ fn stage2CrossTarget(
     mcpu_oz: ?[*:0]const u8,
     dynamic_linker_oz: ?[*:0]const u8,
 ) !CrossTarget {
-    const zig_triple = if (zig_triple_oz) |zig_triple_z| mem.toSliceConst(u8, zig_triple_z) else "native";
+    const mcpu = mem.spanZ(mcpu_oz);
-    const mcpu = if (mcpu_oz) |mcpu_z| mem.toSliceConst(u8, mcpu_z) else null;
+    const dynamic_linker = mem.spanZ(dynamic_linker_oz);
-    const dynamic_linker = if (dynamic_linker_oz) |dl_z| mem.toSliceConst(u8, dl_z) else null;
     var diags: CrossTarget.ParseOptions.Diagnostics = .{};
     const target: CrossTarget = CrossTarget.parse(.{
-        .arch_os_abi = zig_triple,
+        .arch_os_abi = mem.spanZ(zig_triple_oz) orelse "native",
         .cpu_features = mcpu,
         .dynamic_linker = dynamic_linker,
         .diagnostics = &diags,
 @@ -743,15 +744,15 @@ fn stage2TargetParse(
 // ABI warning
 const Stage2LibCInstallation = extern struct {
-    include_dir: [*:0]const u8,
+    include_dir: [*]const u8,
     include_dir_len: usize,
-    sys_include_dir: [*:0]const u8,
+    sys_include_dir: [*]const u8,
     sys_include_dir_len: usize,
-    crt_dir: [*:0]const u8,
+    crt_dir: [*]const u8,
     crt_dir_len: usize,
-    msvc_lib_dir: [*:0]const u8,
+    msvc_lib_dir: [*]const u8,
     msvc_lib_dir_len: usize,
-    kernel32_lib_dir: [*:0]const u8,
+    kernel32_lib_dir: [*]const u8,
     kernel32_lib_dir_len: usize,
     fn initFromStage2(self: *Stage2LibCInstallation, libc: LibCInstallation) void {
 @@ -795,19 +796,19 @@ const Stage2LibCInstallation = extern struct {
     fn toStage2(self: Stage2LibCInstallation) LibCInstallation {
         var libc: LibCInstallation = .{};
         if (self.include_dir_len != 0) {
-            libc.include_dir = self.include_dir[0..self.include_dir_len :0];
+            libc.include_dir = self.include_dir[0..self.include_dir_len];
         }
         if (self.sys_include_dir_len != 0) {
-            libc.sys_include_dir = self.sys_include_dir[0..self.sys_include_dir_len :0];
+            libc.sys_include_dir = self.sys_include_dir[0..self.sys_include_dir_len];
         }
         if (self.crt_dir_len != 0) {
-            libc.crt_dir = self.crt_dir[0..self.crt_dir_len :0];
+            libc.crt_dir = self.crt_dir[0..self.crt_dir_len];
         }
         if (self.msvc_lib_dir_len != 0) {
-            libc.msvc_lib_dir = self.msvc_lib_dir[0..self.msvc_lib_dir_len :0];
+            libc.msvc_lib_dir = self.msvc_lib_dir[0..self.msvc_lib_dir_len];
         }
         if (self.kernel32_lib_dir_len != 0) {
-            libc.kernel32_lib_dir = self.kernel32_lib_dir[0..self.kernel32_lib_dir_len :0];
+            libc.kernel32_lib_dir = self.kernel32_lib_dir[0..self.kernel32_lib_dir_len];
         }
         return libc;
     }
 @@ -817,7 +818,7 @@ const Stage2LibCInstallation = extern struct {
 export fn stage2_libc_parse(stage1_libc: *Stage2LibCInstallation, libc_file_z: [*:0]const u8) Error {
     stderr_file = std.io.getStdErr();
     stderr = stderr_file.outStream();
-    const libc_file = mem.toSliceConst(u8, libc_file_z);
+    const libc_file = mem.spanZ(libc_file_z);
     var libc = LibCInstallation.parse(std.heap.c_allocator, libc_file, stderr) catch |err| switch (err) {
         error.ParseError => return .SemanticAnalyzeFail,
         error.DiskQuota => return .DiskQuota,
 @@ -929,14 +930,14 @@ const Stage2Target = extern struct {
         var dynamic_linker: ?[*:0]u8 = null;
         const target = try crossTargetToTarget(cross_target, &dynamic_linker);
-        var cache_hash = try std.Buffer.allocPrint(allocator, "{}\n{}\n", .{
+        var cache_hash = try std.ArrayListSentineled(u8, 0).allocPrint(allocator, "{}\n{}\n", .{
             target.cpu.model.name,
             target.cpu.features.asBytes(),
         });
         defer cache_hash.deinit();
         const generic_arch_name = target.cpu.arch.genericName();
-        var cpu_builtin_str_buffer = try std.Buffer.allocPrint(allocator,
+        var cpu_builtin_str_buffer = try std.ArrayListSentineled(u8, 0).allocPrint(allocator,
             \\Cpu{{
             \\    .arch = .{},
             \\    .model = &Target.{}.cpu.{},
 @@ -951,7 +952,7 @@ const Stage2Target = extern struct {
         });
         defer cpu_builtin_str_buffer.deinit();
-        var llvm_features_buffer = try std.Buffer.initSize(allocator, 0);
+        var llvm_features_buffer = try std.ArrayListSentineled(u8, 0).initSize(allocator, 0);
         defer llvm_features_buffer.deinit();
         // Unfortunately we have to do the work twice, because Clang does not support
 @@ -966,17 +967,17 @@ const Stage2Target = extern struct {
             if (feature.llvm_name) |llvm_name| {
                 const plus_or_minus = "-+"[@boolToInt(is_enabled)];
-                try llvm_features_buffer.appendByte(plus_or_minus);
+                try llvm_features_buffer.append(plus_or_minus);
-                try llvm_features_buffer.append(llvm_name);
+                try llvm_features_buffer.appendSlice(llvm_name);
-                try llvm_features_buffer.append(",");
+                try llvm_features_buffer.appendSlice(",");
             }
             if (is_enabled) {
                 // TODO some kind of "zig identifier escape" function rather than
                 // unconditionally using @"" syntax
-                try cpu_builtin_str_buffer.append("        .@\"");
+                try cpu_builtin_str_buffer.appendSlice("        .@\"");
-                try cpu_builtin_str_buffer.append(feature.name);
+                try cpu_builtin_str_buffer.appendSlice(feature.name);
-                try cpu_builtin_str_buffer.append("\",\n");
+                try cpu_builtin_str_buffer.appendSlice("\",\n");
             }
         }
 @@ -995,16 +996,16 @@ const Stage2Target = extern struct {
             },
         }
-        try cpu_builtin_str_buffer.append(
+        try cpu_builtin_str_buffer.appendSlice(
             \\    }),
             \\};
             \\
         );
-        assert(mem.endsWith(u8, llvm_features_buffer.toSliceConst(), ","));
+        assert(mem.endsWith(u8, llvm_features_buffer.span(), ","));
         llvm_features_buffer.shrink(llvm_features_buffer.len() - 1);
-        var os_builtin_str_buffer = try std.Buffer.allocPrint(allocator,
+        var os_builtin_str_buffer = try std.ArrayListSentineled(u8, 0).allocPrint(allocator,
             \\Os{{
             \\    .tag = .{},
             \\    .version_range = .{{
 @@ -1047,7 +1048,7 @@ const Stage2Target = extern struct {
             .emscripten,
             .uefi,
             .other,
-            => try os_builtin_str_buffer.append(" .none = {} }\n"),
+            => try os_builtin_str_buffer.appendSlice(" .none = {} }\n"),
             .freebsd,
             .macosx,
 @@ -1123,10 +1124,10 @@ const Stage2Target = extern struct {
                 @tagName(target.os.version_range.windows.max),
             }),
         }
-        try os_builtin_str_buffer.append("};\n");
+        try os_builtin_str_buffer.appendSlice("};\n");
-        try cache_hash.append(
+        try cache_hash.appendSlice(
-            os_builtin_str_buffer.toSlice()[os_builtin_str_ver_start_index..os_builtin_str_buffer.len()],
+            os_builtin_str_buffer.span()[os_builtin_str_ver_start_index..os_builtin_str_buffer.len()],
         );
         const glibc_or_darwin_version = blk: {
 @@ -1238,10 +1239,10 @@ fn stage2DetectNativePaths(stage1_paths: *Stage2NativePaths) !void {
     var paths = try std.zig.system.NativePaths.detect(std.heap.c_allocator);
     errdefer paths.deinit();
-    try convertSlice(paths.include_dirs.toSlice(), &stage1_paths.include_dirs_ptr, &stage1_paths.include_dirs_len);
+    try convertSlice(paths.include_dirs.span(), &stage1_paths.include_dirs_ptr, &stage1_paths.include_dirs_len);
-    try convertSlice(paths.lib_dirs.toSlice(), &stage1_paths.lib_dirs_ptr, &stage1_paths.lib_dirs_len);
+    try convertSlice(paths.lib_dirs.span(), &stage1_paths.lib_dirs_ptr, &stage1_paths.lib_dirs_len);
-    try convertSlice(paths.rpaths.toSlice(), &stage1_paths.rpaths_ptr, &stage1_paths.rpaths_len);
+    try convertSlice(paths.rpaths.span(), &stage1_paths.rpaths_ptr, &stage1_paths.rpaths_len);
-    try convertSlice(paths.warnings.toSlice(), &stage1_paths.warnings_ptr, &stage1_paths.warnings_len);
+    try convertSlice(paths.warnings.span(), &stage1_paths.warnings_ptr, &stage1_paths.warnings_len);
 }
 fn convertSlice(slice: [][:0]u8, ptr: *[*][*:0]u8, len: *usize) !void {
 @@ -1285,18 +1286,19 @@ pub const ClangArgIterator = extern struct {
         shared,
         rdynamic,
         wl,
-        preprocess,
+        pp_or_asm,
         optimize,
         debug,
         sanitize,
         linker_script,
         verbose_cmds,
-        exceptions,
-        no_exceptions,
-        rtti,
-        no_rtti,
         for_linker,
         linker_input_z,
+        lib_dir,
+        mcpu,
+        dep_file,
+        framework_dir,
+        framework,
     };
     const Args = struct {

src-self-hosted/test.zig+7-5

 @@ -88,8 +88,7 @@ pub const TestContext = struct {
             try std.fs.cwd().makePath(dirname);
         }
-        // TODO async I/O
+        try std.fs.cwd().writeFile(file1_path, source);
-        try std.io.writeFile(file1_path, source);
         var comp = try Compilation.create(
             &self.zig_compiler,
 @@ -122,8 +121,7 @@ pub const TestContext = struct {
             try std.fs.cwd().makePath(dirname);
         }
-        // TODO async I/O
+        try std.fs.cwd().writeFile(file1_path, source);
-        try std.io.writeFile(file1_path, source);
         var comp = try Compilation.create(
             &self.zig_compiler,
 @@ -156,7 +154,11 @@ pub const TestContext = struct {
             .Ok => {
                 const argv = [_][]const u8{exe_file};
                 // TODO use event loop
-                const child = try std.ChildProcess.exec(allocator, argv, null, null, 1024 * 1024);
+                const child = try std.ChildProcess.exec(.{
+                    .allocator = allocator,
+                    .argv = argv,
+                    .max_output_bytes = 1024 * 1024,
+                });
                 switch (child.term) {
                     .Exited => |code| {
                         if (code != 0) {

src-self-hosted/translate_c.zig+44-12

 @@ -209,7 +209,7 @@ const Scope = struct {
 pub const Context = struct {
     tree: *ast.Tree,
-    source_buffer: *std.Buffer,
+    source_buffer: *std.ArrayList(u8),
     err: Error,
     source_manager: *ZigClangSourceManager,
     decl_table: DeclTable,
 @@ -235,7 +235,7 @@ pub const Context = struct {
     /// Convert a null-terminated C string to a slice allocated in the arena
     fn str(c: *Context, s: [*:0]const u8) ![]u8 {
-        return mem.dupe(c.a(), u8, mem.toSliceConst(u8, s));
+        return mem.dupe(c.a(), u8, mem.spanZ(s));
     }
     /// Convert a clang source location to a file:line:column string
 @@ -275,7 +275,7 @@ pub fn translate(
         const tree = try tree_arena.allocator.create(ast.Tree);
         tree.* = ast.Tree{
-            .source = undefined, // need to use Buffer.toOwnedSlice later
+            .source = undefined, // need to use toOwnedSlice later
             .root_node = undefined,
             .arena_allocator = tree_arena,
             .tokens = undefined, // can't reference the allocator yet
 @@ -296,7 +296,7 @@ pub fn translate(
         .eof_token = undefined,
     };
-    var source_buffer = try std.Buffer.initSize(arena, 0);
+    var source_buffer = std.ArrayList(u8).init(arena);
     var context = Context{
         .tree = tree,
 @@ -3845,7 +3845,9 @@ fn transCreateNodePtrType(
 }
 fn transCreateNodeAPInt(c: *Context, int: *const ZigClangAPSInt) !*ast.Node {
-    const num_limbs = ZigClangAPSInt_getNumWords(int);
+    const num_limbs = math.cast(usize, ZigClangAPSInt_getNumWords(int)) catch |err| switch (err) {
+        error.Overflow => return error.OutOfMemory,
+    };
     var aps_int = int;
     const is_negative = ZigClangAPSInt_isSigned(int) and ZigClangAPSInt_isNegative(int);
     if (is_negative)
 @@ -3855,8 +3857,26 @@ fn transCreateNodeAPInt(c: *Context, int: *const ZigClangAPSInt) !*ast.Node {
         big.negate();
     defer big.deinit();
     const data = ZigClangAPSInt_getRawData(aps_int);
-    var i: @TypeOf(num_limbs) = 0;
+    switch (@sizeOf(std.math.big.Limb)) {
-    while (i < num_limbs) : (i += 1) big.limbs[i] = data[i];
+        8 => {
+            var i: usize = 0;
+            while (i < num_limbs) : (i += 1) {
+                big.limbs[i] = data[i];
+            }
+        },
+        4 => {
+            var limb_i: usize = 0;
+            var data_i: usize = 0;
+            while (limb_i < num_limbs) : ({
+                limb_i += 2;
+                data_i += 1;
+            }) {
+                big.limbs[limb_i] = @truncate(u32, data[data_i]);
+                big.limbs[limb_i + 1] = @truncate(u32, data[data_i] >> 32);
+            }
+        },
+        else => @compileError("unimplemented"),
+    }
     const str = big.toString(c.a(), 10) catch |err| switch (err) {
         error.OutOfMemory => return error.OutOfMemory,
         else => unreachable,
 @@ -4289,7 +4309,7 @@ fn makeRestorePoint(c: *Context) RestorePoint {
     return RestorePoint{
         .c = c,
         .token_index = c.tree.tokens.len,
-        .src_buf_index = c.source_buffer.len(),
+        .src_buf_index = c.source_buffer.len,
     };
 }
 @@ -4751,11 +4771,11 @@ fn appendToken(c: *Context, token_id: Token.Id, bytes: []const u8) !ast.TokenInd
 fn appendTokenFmt(c: *Context, token_id: Token.Id, comptime format: []const u8, args: var) !ast.TokenIndex {
     assert(token_id != .Invalid);
-    const start_index = c.source_buffer.len();
+    const start_index = c.source_buffer.len;
     errdefer c.source_buffer.shrink(start_index);
     try c.source_buffer.outStream().print(format, args);
-    const end_index = c.source_buffer.len();
+    const end_index = c.source_buffer.len;
     const token_index = c.tree.tokens.len;
     const new_token = try c.tree.tokens.addOne();
     errdefer c.tree.tokens.shrink(token_index);
 @@ -4765,7 +4785,7 @@ fn appendTokenFmt(c: *Context, token_id: Token.Id, comptime format: []const u8,
         .start = start_index,
         .end = end_index,
     };
-    try c.source_buffer.appendByte(' ');
+    try c.source_buffer.append(' ');
     return token_index;
 }
 @@ -5782,6 +5802,18 @@ fn parseCSuffixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
                 op_id = .Mod;
                 op_token = try appendToken(c, .Percent, "%");
             },
+            .StringLiteral => {
+                op_id = .ArrayCat;
+                op_token = try appendToken(c, .PlusPlus, "++");
+                _ = it.prev();
+            },
+            .Identifier => {
+                op_id = .ArrayCat;
+                op_token = try appendToken(c, .PlusPlus, "++");
+                _ = it.prev();
+            },
             else => {
                 _ = it.prev();
                 return node;
 @@ -5839,7 +5871,7 @@ fn parseCPrefixOpExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
 fn tokenSlice(c: *Context, token: ast.TokenIndex) []u8 {
     const tok = c.tree.tokens.at(token);
-    const slice = c.source_buffer.toSlice()[tok.start..tok.end];
+    const slice = c.source_buffer.span()[tok.start..tok.end];
     return if (mem.startsWith(u8, slice, "@\""))
         slice[2 .. slice.len - 1]
     else

src-self-hosted/type.zig+2-2

...	@@ -387,10 +387,10 @@ pub const Type = struct {	...	@@ -387,10 +387,10 @@ pub const Type = struct {
387	};	387	};
388	errdefer comp.gpa().destroy(self);	388	errdefer comp.gpa().destroy(self);
389		389
390	var name_buf = try std.Buffer.initSize(comp.gpa(), 0);	390	var name_buf = std.ArrayList(u8).init(comp.gpa());
391	defer name_buf.deinit();	391	defer name_buf.deinit();
392		392
393	const name_stream = &std.io.BufferOutStream.init(&name_buf).stream;	393	const name_stream = name_buf.outStream();
394		394
395	switch (key.data) {	395	switch (key.data) {
396	.Generic => \|generic\| {	396	.Generic => \|generic\| {

src-self-hosted/util.zig+7-7

...	@@ -16,11 +16,11 @@ pub fn getDarwinArchString(self: Target) [:0]const u8 {	...	@@ -16,11 +16,11 @@ pub fn getDarwinArchString(self: Target) [:0]const u8 {
16	}	16	}
17	}	17	}
18		18
19	pub fn llvmTargetFromTriple(triple: std.Buffer) !*llvm.Target {	19	pub fn llvmTargetFromTriple(triple: [:0]const u8) !*llvm.Target {
20	var result: *llvm.Target = undefined;	20	var result: *llvm.Target = undefined;
21	var err_msg: [*:0]u8 = undefined;	21	var err_msg: [*:0]u8 = undefined;
22	if (llvm.GetTargetFromTriple(triple.toSlice(), &result, &err_msg) != 0) {	22	if (llvm.GetTargetFromTriple(triple, &result, &err_msg) != 0) {
23	std.debug.warn("triple: {s} error: {s}\n", .{ triple.toSlice(), err_msg });	23	std.debug.warn("triple: {s} error: {s}\n", .{ triple, err_msg });
24	return error.UnsupportedTarget;	24	return error.UnsupportedTarget;
25	}	25	}
26	return result;	26	return result;
...	@@ -34,14 +34,14 @@ pub fn initializeAllTargets() void {	...	@@ -34,14 +34,14 @@ pub fn initializeAllTargets() void {
34	llvm.InitializeAllAsmParsers();	34	llvm.InitializeAllAsmParsers();
35	}	35	}
36		36
37	pub fn getLLVMTriple(allocator: *std.mem.Allocator, target: std.Target) !std.Buffer {	37	pub fn getLLVMTriple(allocator: *std.mem.Allocator, target: std.Target) ![:0]u8 {
38	var result = try std.Buffer.initSize(allocator, 0);	38	var result = try std.ArrayListSentineled(u8, 0).initSize(allocator, 0);
39	errdefer result.deinit();	39	defer result.deinit();
40		40
41	try result.outStream().print(	41	try result.outStream().print(
42	"{}-unknown-{}-{}",	42	"{}-unknown-{}-{}",
43	.{ @tagName(target.cpu.arch), @tagName(target.os.tag), @tagName(target.abi) },	43	.{ @tagName(target.cpu.arch), @tagName(target.os.tag), @tagName(target.abi) },
44	);	44	);
45		45
46	return result;	46	return result.toOwnedSlice();
47	}	47	}

src-self-hosted/value.zig+9-9

src/all_types.hpp+30-4

 @@ -54,6 +54,16 @@ struct ResultLocCast;
 struct ResultLocReturn;
 struct IrExecutableGen;
+enum FileExt {
+    FileExtUnknown,
+    FileExtAsm,
+    FileExtC,
+    FileExtCpp,
+    FileExtHeader,
+    FileExtLLVMIr,
+    FileExtLLVMBitCode,
+};
 enum PtrLen {
     PtrLenUnknown,
     PtrLenSingle,
 @@ -1324,6 +1334,7 @@ struct ZigTypeFloat {
     size_t bit_count;
 };
+// Needs to have the same memory layout as ZigTypeVector
 struct ZigTypeArray {
     ZigType *child_type;
     uint64_t len;
 @@ -1512,12 +1523,17 @@ struct ZigTypeBoundFn {
     ZigType *fn_type;
 };
+// Needs to have the same memory layout as ZigTypeArray
 struct ZigTypeVector {
     // The type must be a pointer, integer, bool, or float
     ZigType *elem_type;
-    uint32_t len;
+    uint64_t len;
+    size_t padding;
 };
+// A lot of code is relying on ZigTypeArray and ZigTypeVector having the same layout/size
+static_assert(sizeof(ZigTypeVector) == sizeof(ZigTypeArray), "Size of ZigTypeVector and ZigTypeArray do not match!");
 enum ZigTypeId {
     ZigTypeIdInvalid,
     ZigTypeIdMetaType,
 @@ -1999,6 +2015,12 @@ enum WantCSanitize {
     WantCSanitizeEnabled,
 };
+enum OptionalBool {
+    OptionalBoolNull,
+    OptionalBoolFalse,
+    OptionalBoolTrue,
+};
 struct CFile {
     ZigList<const char *> args;
     const char *source_path;
 @@ -2214,6 +2236,7 @@ struct CodeGen {
     bool reported_bad_link_libc_error;
     bool is_dynamic; // shared library rather than static library. dynamic musl rather than static musl.
     bool need_frame_size_prefix_data;
+    bool disable_c_depfile;
     //////////////////////////// Participates in Input Parameter Cache Hash
     /////// Note: there is a separate cache hash for builtin.zig, when adding fields,
 @@ -2242,6 +2265,9 @@ struct CodeGen {
     const ZigTarget *zig_target;
     TargetSubsystem subsystem; // careful using this directly; see detect_subsystem
     ValgrindSupport valgrind_support;
+    CodeModel code_model;
+    OptionalBool linker_gc_sections;
+    OptionalBool linker_allow_shlib_undefined;
     bool strip_debug_symbols;
     bool is_test_build;
     bool is_single_threaded;
 @@ -2262,9 +2288,8 @@ struct CodeGen {
     bool emit_asm;
     bool emit_llvm_ir;
     bool test_is_evented;
-    bool cpp_rtti;
+    bool linker_z_nodelete;
-    bool cpp_exceptions;
+    bool linker_z_defs;
-    CodeModel code_model;
     Buf *root_out_name;
     Buf *test_filter;
 @@ -2273,6 +2298,7 @@ struct CodeGen {
     Buf *zig_std_dir;
     Buf *version_script_path;
     Buf *override_soname;
+    Buf *linker_optimization;
     const char **llvm_argv;
     size_t llvm_argv_len;

src/analyze.cpp+7-4

...	@@ -363,6 +363,7 @@ bool type_is_resolved(ZigType *type_entry, ResolveStatus status) {	...	@@ -363,6 +363,7 @@ bool type_is_resolved(ZigType *type_entry, ResolveStatus status) {
363	case ResolveStatusLLVMFull:	363	case ResolveStatusLLVMFull:
364	return type_entry->llvm_type != nullptr;	364	return type_entry->llvm_type != nullptr;
365	}	365	}
		366	zig_unreachable();
366	case ZigTypeIdOpaque:	367	case ZigTypeIdOpaque:
367	return status < ResolveStatusSizeKnown;	368	return status < ResolveStatusSizeKnown;
368	case ZigTypeIdPointer:	369	case ZigTypeIdPointer:
...	@@ -381,6 +382,7 @@ bool type_is_resolved(ZigType *type_entry, ResolveStatus status) {	...	@@ -381,6 +382,7 @@ bool type_is_resolved(ZigType *type_entry, ResolveStatus status) {
381	case ResolveStatusLLVMFull:	382	case ResolveStatusLLVMFull:
382	return type_entry->llvm_type != nullptr;	383	return type_entry->llvm_type != nullptr;
383	}	384	}
		385	zig_unreachable();
384	case ZigTypeIdMetaType:	386	case ZigTypeIdMetaType:
385	case ZigTypeIdVoid:	387	case ZigTypeIdVoid:
386	case ZigTypeIdBool:	388	case ZigTypeIdBool:
...	@@ -5156,6 +5158,7 @@ ZigType get_vector_type(CodeGen g, uint32_t len, ZigType *elem_type) {	...	@@ -5156,6 +5158,7 @@ ZigType get_vector_type(CodeGen g, uint32_t len, ZigType *elem_type) {
5156	}	5158	}
5157	entry->data.vector.len = len;	5159	entry->data.vector.len = len;
5158	entry->data.vector.elem_type = elem_type;	5160	entry->data.vector.elem_type = elem_type;
		5161	entry->data.vector.padding = 0;
5159		5162
5160	buf_resize(&entry->name, 0);	5163	buf_resize(&entry->name, 0);
5161	buf_appendf(&entry->name, "@Vector(%u, %s)", len, buf_ptr(&elem_type->name));	5164	buf_appendf(&entry->name, "@Vector(%u, %s)", len, buf_ptr(&elem_type->name));
...	@@ -5358,7 +5361,7 @@ static uint32_t hash_const_val(ZigValue *const_val) {	...	@@ -5358,7 +5361,7 @@ static uint32_t hash_const_val(ZigValue *const_val) {
5358	return result;	5361	return result;
5359	}	5362	}
5360	case ZigTypeIdEnumLiteral:	5363	case ZigTypeIdEnumLiteral:
5361	return buf_hash(const_val->data.x_enum_literal) * 2691276464;	5364	return buf_hash(const_val->data.x_enum_literal) * (uint32_t)2691276464;
5362	case ZigTypeIdEnum:	5365	case ZigTypeIdEnum:
5363	{	5366	{
5364	uint32_t result = 31643936;	5367	uint32_t result = 31643936;
...	@@ -5426,12 +5429,12 @@ static uint32_t hash_const_val(ZigValue *const_val) {	...	@@ -5426,12 +5429,12 @@ static uint32_t hash_const_val(ZigValue *const_val) {
5426	return 2709806591;	5429	return 2709806591;
5427	case ZigTypeIdOptional:	5430	case ZigTypeIdOptional:
5428	if (get_src_ptr_type(const_val->type) != nullptr) {	5431	if (get_src_ptr_type(const_val->type) != nullptr) {
5429	return hash_const_val_ptr(const_val) * 1992916303;	5432	return hash_const_val_ptr(const_val) * (uint32_t)1992916303;
5430	} else if (const_val->type->data.maybe.child_type->id == ZigTypeIdErrorSet) {	5433	} else if (const_val->type->data.maybe.child_type->id == ZigTypeIdErrorSet) {
5431	return hash_const_val_error_set(const_val) * 3147031929;	5434	return hash_const_val_error_set(const_val) * (uint32_t)3147031929;
5432	} else {	5435	} else {
5433	if (const_val->data.x_optional) {	5436	if (const_val->data.x_optional) {
5434	return hash_const_val(const_val->data.x_optional) * 1992916303;	5437	return hash_const_val(const_val->data.x_optional) * (uint32_t)1992916303;
5435	} else {	5438	} else {
5436	return 4016830364;	5439	return 4016830364;
5437	}	5440	}

src/analyze.hpp+1-7

 @@ -257,14 +257,8 @@ Error create_c_object_cache(CodeGen *g, CacheHash **out_cache_hash, bool verbose
 LLVMTypeRef get_llvm_type(CodeGen *g, ZigType *type);
 ZigLLVMDIType *get_llvm_di_type(CodeGen *g, ZigType *type);
-enum CSourceKind {
-    CSourceKindAsm,
-    CSourceKindC,
-    CSourceKindCpp,
-};
 void add_cc_args(CodeGen *g, ZigList<const char *> &args, const char *out_dep_path, bool translate_c,
-        CSourceKind source_kind);
+        FileExt source_kind);
 void src_assert(bool ok, AstNode *source_node);
 bool is_container(ZigType *type_entry);

src/bigint.cpp+1-1

...	@@ -1430,7 +1430,7 @@ void bigint_shr(BigInt dest, const BigInt op1, const BigInt *op2) {	...	@@ -1430,7 +1430,7 @@ void bigint_shr(BigInt dest, const BigInt op1, const BigInt *op2) {
1430	uint64_t digit = op1_digits[op_digit_index];	1430	uint64_t digit = op1_digits[op_digit_index];
1431	size_t dest_digit_index = op_digit_index - digit_shift_count;	1431	size_t dest_digit_index = op_digit_index - digit_shift_count;
1432	digits[dest_digit_index] = carry \| (digit >> leftover_shift_count);	1432	digits[dest_digit_index] = carry \| (digit >> leftover_shift_count);
1433	carry = digit << (64 - leftover_shift_count);	1433	carry = (leftover_shift_count != 0) ? (digit << (64 - leftover_shift_count)) : 0;
1434		1434
1435	if (dest_digit_index == 0) { break; }	1435	if (dest_digit_index == 0) { break; }
1436	op_digit_index -= 1;	1436	op_digit_index -= 1;

src/buffer.hpp+1-4

 @@ -178,10 +178,7 @@ static inline bool buf_starts_with_str(Buf *buf, const char *str) {
 }
 static inline bool buf_ends_with_mem(Buf *buf, const char *mem, size_t mem_len) {
-    if (buf_len(buf) < mem_len) {
+    return mem_ends_with_mem(buf_ptr(buf), buf_len(buf), mem, mem_len);
-        return false;
-    }
-    return memcmp(buf_ptr(buf) + buf_len(buf) - mem_len, mem, mem_len) == 0;
 }
 static inline bool buf_ends_with_str(Buf *buf, const char *str) {

src/cache_hash.cpp+7-1

 @@ -27,11 +27,17 @@ void cache_init(CacheHash *ch, Buf *manifest_dir) {
 void cache_mem(CacheHash *ch, const char *ptr, size_t len) {
     assert(ch->manifest_file_path == nullptr);
     assert(ptr != nullptr);
-    // + 1 to include the null byte
     blake2b_update(&ch->blake, ptr, len);
 }
+void cache_slice(CacheHash *ch, Slice<const char> slice) {
+    // mix the length into the hash so that two juxtaposed cached slices can't collide
+    cache_usize(ch, slice.len);
+    cache_mem(ch, slice.ptr, slice.len);
+}
 void cache_str(CacheHash *ch, const char *ptr) {
+    // + 1 to include the null byte
     cache_mem(ch, ptr, strlen(ptr) + 1);
 }

src/cache_hash.hpp+1

...	@@ -36,6 +36,7 @@ void cache_init(CacheHash ch, Buf manifest_dir);	...	@@ -36,6 +36,7 @@ void cache_init(CacheHash ch, Buf manifest_dir);
36		36
37	// Next, use the hash population functions to add the initial parameters.	37	// Next, use the hash population functions to add the initial parameters.
38	void cache_mem(CacheHash ch, const char ptr, size_t len);	38	void cache_mem(CacheHash ch, const char ptr, size_t len);
		39	void cache_slice(CacheHash *ch, Slice<const char> slice);
39	void cache_str(CacheHash ch, const char ptr);	40	void cache_str(CacheHash ch, const char ptr);
40	void cache_int(CacheHash *ch, int x);	41	void cache_int(CacheHash *ch, int x);
41	void cache_bool(CacheHash *ch, bool x);	42	void cache_bool(CacheHash *ch, bool x);

src/codegen.cpp+82-89

 @@ -714,7 +714,7 @@ static LLVMValueRef get_arithmetic_overflow_fn(CodeGen *g, ZigType *operand_type
     };
     if (operand_type->id == ZigTypeIdVector) {
-        sprintf(fn_name, "llvm.%s.with.overflow.v%" PRIu32 "i%" PRIu32, signed_str,
+        sprintf(fn_name, "llvm.%s.with.overflow.v%" PRIu64 "i%" PRIu32, signed_str,
                 operand_type->data.vector.len, int_type->data.integral.bit_count);
         LLVMTypeRef return_elem_types[] = {
 @@ -3954,8 +3954,9 @@ static void render_async_var_decls(CodeGen *g, Scope *scope) {
                 if (var->did_the_decl_codegen) {
                     render_decl_var(g, var);
                 }
-                // fallthrough
             }
+            ZIG_FALLTHROUGH;
             case ScopeIdDecls:
             case ScopeIdBlock:
             case ScopeIdDefer:
 @@ -8784,8 +8785,6 @@ static Error define_builtin_compile_vars(CodeGen *g) {
     cache_bool(&cache_hash, g->is_test_build);
     cache_bool(&cache_hash, g->is_single_threaded);
     cache_bool(&cache_hash, g->test_is_evented);
-    cache_bool(&cache_hash, g->cpp_rtti);
-    cache_bool(&cache_hash, g->cpp_exceptions);
     cache_int(&cache_hash, g->code_model);
     cache_int(&cache_hash, g->zig_target->is_native_os);
     cache_int(&cache_hash, g->zig_target->is_native_cpu);
 @@ -9125,21 +9124,29 @@ static void detect_libc(CodeGen *g) {
         g->libc_include_dir_len = 0;
         g->libc_include_dir_list = heap::c_allocator.allocate<const char *>(dir_count);
-        g->libc_include_dir_list[g->libc_include_dir_len] = g->libc->include_dir;
+        g->libc_include_dir_list[g->libc_include_dir_len] = buf_ptr(buf_create_from_mem(
+                    g->libc->include_dir, g->libc->include_dir_len));
         g->libc_include_dir_len += 1;
         if (want_sys_dir) {
-            g->libc_include_dir_list[g->libc_include_dir_len] = g->libc->sys_include_dir;
+            g->libc_include_dir_list[g->libc_include_dir_len] = buf_ptr(buf_create_from_mem(
+                        g->libc->sys_include_dir, g->libc->sys_include_dir_len));
             g->libc_include_dir_len += 1;
         }
         if (want_um_and_shared_dirs != 0) {
-            g->libc_include_dir_list[g->libc_include_dir_len] = buf_ptr(buf_sprintf(
+            Buf *include_dir_parent = buf_alloc();
-                        "%s" OS_SEP ".." OS_SEP "um", g->libc->include_dir));
+            os_path_join(buf_create_from_mem(g->libc->include_dir, g->libc->include_dir_len),
+                    buf_create_from_str(".."), include_dir_parent);
+            Buf *buff1 = buf_alloc();
+            os_path_join(include_dir_parent, buf_create_from_str("um"), buff1);
+            g->libc_include_dir_list[g->libc_include_dir_len] = buf_ptr(buff1);
             g->libc_include_dir_len += 1;
-            g->libc_include_dir_list[g->libc_include_dir_len] = buf_ptr(buf_sprintf(
+            Buf *buff2 = buf_alloc();
-                        "%s" OS_SEP ".." OS_SEP "shared", g->libc->include_dir));
+            os_path_join(include_dir_parent, buf_create_from_str("shared"), buff2);
+            g->libc_include_dir_list[g->libc_include_dir_len] = buf_ptr(buff2);
             g->libc_include_dir_len += 1;
         }
         assert(g->libc_include_dir_len == dir_count);
 @@ -9163,20 +9170,13 @@ static void detect_libc(CodeGen *g) {
 // does not add the "cc" arg
 void add_cc_args(CodeGen *g, ZigList<const char *> &args, const char *out_dep_path,
-        bool translate_c, CSourceKind source_kind)
+        bool translate_c, FileExt source_kind)
 {
     if (translate_c) {
         args.append("-x");
         args.append("c");
     }
-    if (source_kind != CSourceKindAsm && out_dep_path != nullptr) {
-        args.append("-MD");
-        args.append("-MV");
-        args.append("-MF");
-        args.append(out_dep_path);
-    }
     args.append("-nostdinc");
     args.append("-fno-spell-checking");
 @@ -9184,14 +9184,7 @@ void add_cc_args(CodeGen *g, ZigList<const char *> &args, const char *out_dep_pa
         args.append("-ffunction-sections");
     }
-    if (translate_c) {
+    if (!translate_c) {
-        if (source_kind != CSourceKindAsm) {
-            // this gives us access to preprocessing entities, presumably at
-            // the cost of performance
-            args.append("-Xclang");
-            args.append("-detailed-preprocessing-record");
-        }
-    } else {
         switch (g->err_color) {
             case ErrColorAuto:
                 break;
 @@ -9225,24 +9218,25 @@ void add_cc_args(CodeGen *g, ZigList<const char *> &args, const char *out_dep_pa
         args.append("-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS");
     }
-    // According to Rich Felker libc headers are supposed to go before C language headers.
-    // However as noted by @dimenus, appending libc headers before c_headers breaks intrinsics
-    // and other compiler specific items.
-    args.append("-isystem");
-    args.append(buf_ptr(g->zig_c_headers_dir));
-    for (size_t i = 0; i < g->libc_include_dir_len; i += 1) {
-        const char *include_dir = g->libc_include_dir_list[i];
-        args.append("-isystem");
-        args.append(include_dir);
-    }
     args.append("-target");
     args.append(buf_ptr(&g->llvm_triple_str));
     switch (source_kind) {
-        case CSourceKindC:
+        case FileExtC:
-        case CSourceKindCpp:
+        case FileExtCpp:
+        case FileExtHeader:
+            // According to Rich Felker libc headers are supposed to go before C language headers.
+            // However as noted by @dimenus, appending libc headers before c_headers breaks intrinsics
+            // and other compiler specific items.
+            args.append("-isystem");
+            args.append(buf_ptr(g->zig_c_headers_dir));
+            for (size_t i = 0; i < g->libc_include_dir_len; i += 1) {
+                const char *include_dir = g->libc_include_dir_list[i];
+                args.append("-isystem");
+                args.append(include_dir);
+            }
             if (g->zig_target->llvm_cpu_name != nullptr) {
                 args.append("-Xclang");
                 args.append("-target-cpu");
 @@ -9255,18 +9249,25 @@ void add_cc_args(CodeGen *g, ZigList<const char *> &args, const char *out_dep_pa
                 args.append("-Xclang");
                 args.append(g->zig_target->llvm_cpu_features);
             }
+            if (translate_c) {
+                // this gives us access to preprocessing entities, presumably at
+                // the cost of performance
+                args.append("-Xclang");
+                args.append("-detailed-preprocessing-record");
+            }
+            if (out_dep_path != nullptr) {
+                args.append("-MD");
+                args.append("-MV");
+                args.append("-MF");
+                args.append(out_dep_path);
+            }
             break;
-        case CSourceKindAsm:
+        case FileExtAsm:
+        case FileExtLLVMIr:
+        case FileExtLLVMBitCode:
+        case FileExtUnknown:
             break;
     }
-    if (source_kind == CSourceKindCpp) {
-        if (!g->cpp_rtti) {
-            args.append("-fno-rtti");
-        }
-        if (!g->cpp_exceptions) {
-            args.append("-fno-exceptions");
-        }
-    }
     for (size_t i = 0; i < g->zig_target->llvm_cpu_features_asm_len; i += 1) {
         args.append(g->zig_target->llvm_cpu_features_asm_ptr[i]);
     }
 @@ -9414,7 +9415,7 @@ void codegen_translate_c(CodeGen *g, Buf *full_path) {
     }
     ZigList<const char *> clang_argv = {0};
-    add_cc_args(g, clang_argv, out_dep_path_cstr, true, CSourceKindC);
+    add_cc_args(g, clang_argv, out_dep_path_cstr, true, FileExtC);
     clang_argv.append(buf_ptr(full_path));
 @@ -9714,8 +9715,6 @@ Error create_c_object_cache(CodeGen *g, CacheHash **out_cache_hash, bool verbose
     cache_bool(cache_hash, g->have_sanitize_c);
     cache_bool(cache_hash, want_valgrind_support(g));
     cache_bool(cache_hash, g->function_sections);
-    cache_bool(cache_hash, g->cpp_rtti);
-    cache_bool(cache_hash, g->cpp_exceptions);
     cache_int(cache_hash, g->code_model);
     for (size_t arg_i = 0; arg_i < g->clang_argv_len; arg_i += 1) {
 @@ -9754,15 +9753,6 @@ static void gen_c_object(CodeGen *g, Buf *self_exe_path, CFile *c_file) {
     Buf *c_source_basename = buf_alloc();
     os_path_split(c_source_file, nullptr, c_source_basename);
-    CSourceKind c_source_kind;
-    if (buf_ends_with_str(c_source_basename, ".s") ||
-        buf_ends_with_str(c_source_basename, ".S"))
-    {
-        c_source_kind = CSourceKindAsm;
-    } else {
-        c_source_kind = CSourceKindC;
-    }
     Stage2ProgressNode *child_prog_node = stage2_progress_start(g->sub_progress_node, buf_ptr(c_source_basename),
             buf_len(c_source_basename), 0);
 @@ -9813,7 +9803,7 @@ static void gen_c_object(CodeGen *g, Buf *self_exe_path, CFile *c_file) {
             exit(1);
         }
     }
-    bool is_cache_miss = (buf_len(&digest) == 0);
+    bool is_cache_miss = g->disable_c_depfile || (buf_len(&digest) == 0);
     if (is_cache_miss) {
         // we can't know the digest until we do the C compiler invocation, so we
         // need a tmp filename.
 @@ -9828,14 +9818,14 @@ static void gen_c_object(CodeGen *g, Buf *self_exe_path, CFile *c_file) {
         args.append(buf_ptr(self_exe_path));
         args.append("clang");
-        if (c_file->preprocessor_only_basename != nullptr) {
+        if (c_file->preprocessor_only_basename == nullptr) {
-            args.append("-E");
-        } else {
             args.append("-c");
         }
-        Buf *out_dep_path = buf_sprintf("%s.d", buf_ptr(out_obj_path));
+        Buf *out_dep_path = g->disable_c_depfile ? nullptr : buf_sprintf("%s.d", buf_ptr(out_obj_path));
-        add_cc_args(g, args, buf_ptr(out_dep_path), false, c_source_kind);
+        const char *out_dep_path_cstr = (out_dep_path == nullptr) ? nullptr : buf_ptr(out_dep_path);
+        FileExt ext = classify_file_ext(buf_ptr(c_source_basename), buf_len(c_source_basename));
+        add_cc_args(g, args, out_dep_path_cstr, false, ext);
         args.append("-o");
         args.append(buf_ptr(out_obj_path));
 @@ -9856,22 +9846,24 @@ static void gen_c_object(CodeGen *g, Buf *self_exe_path, CFile *c_file) {
             exit(1);
         }
-        // add the files depended on to the cache system
+        if (out_dep_path != nullptr) {
-        if ((err = cache_add_dep_file(cache_hash, out_dep_path, true))) {
+            // add the files depended on to the cache system
-            // Don't treat the absence of the .d file as a fatal error, the
+            if ((err = cache_add_dep_file(cache_hash, out_dep_path, true))) {
-            // compiler may not produce one eg. when compiling .s files
+                // Don't treat the absence of the .d file as a fatal error, the
+                // compiler may not produce one eg. when compiling .s files
+                if (err != ErrorFileNotFound) {
+                    fprintf(stderr, "Failed to add C source dependencies to cache: %s\n", err_str(err));
+                    exit(1);
+                }
+            }
             if (err != ErrorFileNotFound) {
-                fprintf(stderr, "Failed to add C source dependencies to cache: %s\n", err_str(err));
+                os_delete_file(out_dep_path);
-                exit(1);
             }
-        }
-        if (err != ErrorFileNotFound) {
-            os_delete_file(out_dep_path);
-        }
-        if ((err = cache_final(cache_hash, &digest))) {
+            if ((err = cache_final(cache_hash, &digest))) {
-            fprintf(stderr, "Unable to finalize cache hash: %s\n", err_str(err));
+                fprintf(stderr, "Unable to finalize cache hash: %s\n", err_str(err));
-            exit(1);
+                exit(1);
+            }
         }
         artifact_dir = buf_alloc();
         os_path_join(o_dir, &digest, artifact_dir);
 @@ -10550,8 +10542,6 @@ static Error check_cache(CodeGen *g, Buf *manifest_dir, Buf *digest) {
     cache_bool(ch, g->emit_bin);
     cache_bool(ch, g->emit_llvm_ir);
     cache_bool(ch, g->emit_asm);
-    cache_bool(ch, g->cpp_rtti);
-    cache_bool(ch, g->cpp_exceptions);
     cache_usize(ch, g->version_major);
     cache_usize(ch, g->version_minor);
     cache_usize(ch, g->version_patch);
 @@ -10560,14 +10550,19 @@ static Error check_cache(CodeGen *g, Buf *manifest_dir, Buf *digest) {
     cache_list_of_str(ch, g->lib_dirs.items, g->lib_dirs.length);
     cache_list_of_str(ch, g->framework_dirs.items, g->framework_dirs.length);
     if (g->libc) {
-        cache_str(ch, g->libc->include_dir);
+        cache_slice(ch, Slice<const char>{g->libc->include_dir, g->libc->include_dir_len});
-        cache_str(ch, g->libc->sys_include_dir);
+        cache_slice(ch, Slice<const char>{g->libc->sys_include_dir, g->libc->sys_include_dir_len});
-        cache_str(ch, g->libc->crt_dir);
+        cache_slice(ch, Slice<const char>{g->libc->crt_dir, g->libc->crt_dir_len});
-        cache_str(ch, g->libc->msvc_lib_dir);
+        cache_slice(ch, Slice<const char>{g->libc->msvc_lib_dir, g->libc->msvc_lib_dir_len});
-        cache_str(ch, g->libc->kernel32_lib_dir);
+        cache_slice(ch, Slice<const char>{g->libc->kernel32_lib_dir, g->libc->kernel32_lib_dir_len});
     }
     cache_buf_opt(ch, g->version_script_path);
     cache_buf_opt(ch, g->override_soname);
+    cache_buf_opt(ch, g->linker_optimization);
+    cache_int(ch, g->linker_gc_sections);
+    cache_int(ch, g->linker_allow_shlib_undefined);
+    cache_bool(ch, g->linker_z_nodelete);
+    cache_bool(ch, g->linker_z_defs);
     // gen_c_objects appends objects to g->link_objects which we want to include in the hash
     gen_c_objects(g);
 @@ -10856,8 +10851,6 @@ CodeGen *create_child_codegen(CodeGen *parent_gen, Buf *root_src_path, OutType o
         parent_gen->build_mode, parent_gen->zig_lib_dir, libc, get_global_cache_dir(), false, child_progress_node);
     child_gen->root_out_name = buf_create_from_str(name);
     child_gen->disable_gen_h = true;
-    child_gen->cpp_rtti = parent_gen->cpp_rtti;
-    child_gen->cpp_exceptions = parent_gen->cpp_exceptions;
     child_gen->want_stack_check = WantStackCheckDisabled;
     child_gen->want_sanitize_c = WantCSanitizeDisabled;
     child_gen->verbose_tokenize = parent_gen->verbose_tokenize;

src/compiler.cpp+22

...	@@ -164,3 +164,25 @@ Buf *get_global_cache_dir(void) {	...	@@ -164,3 +164,25 @@ Buf *get_global_cache_dir(void) {
164	buf_deinit(&app_data_dir);	164	buf_deinit(&app_data_dir);
165	return &saved_global_cache_dir;	165	return &saved_global_cache_dir;
166	}	166	}
		167
		168	FileExt classify_file_ext(const char *filename_ptr, size_t filename_len) {
		169	if (mem_ends_with_str(filename_ptr, filename_len, ".c")) {
		170	return FileExtC;
		171	} else if (mem_ends_with_str(filename_ptr, filename_len, ".C") \|\|
		172	mem_ends_with_str(filename_ptr, filename_len, ".cc") \|\|
		173	mem_ends_with_str(filename_ptr, filename_len, ".cpp") \|\|
		174	mem_ends_with_str(filename_ptr, filename_len, ".cxx"))
		175	{
		176	return FileExtCpp;
		177	} else if (mem_ends_with_str(filename_ptr, filename_len, ".ll")) {
		178	return FileExtLLVMIr;
		179	} else if (mem_ends_with_str(filename_ptr, filename_len, ".bc")) {
		180	return FileExtLLVMBitCode;
		181	} else if (mem_ends_with_str(filename_ptr, filename_len, ".s") \|\|
		182	mem_ends_with_str(filename_ptr, filename_len, ".S"))
		183	{
		184	return FileExtAsm;
		185	}
		186	// TODO look for .so, .so.X, .so.X.Y, .so.X.Y.Z
		187	return FileExtUnknown;
		188	}

src/compiler.hpp+4-2

...	@@ -8,8 +8,7 @@	...	@@ -8,8 +8,7 @@
8	#ifndef ZIG_COMPILER_HPP	8	#ifndef ZIG_COMPILER_HPP
9	#define ZIG_COMPILER_HPP	9	#define ZIG_COMPILER_HPP
10		10
11	#include "buffer.hpp"	11	#include "all_types.hpp"
12	#include "error.hpp"
13		12
14	Error get_compiler_id(Buf **result);	13	Error get_compiler_id(Buf **result);
15		14
...	@@ -19,4 +18,7 @@ Buf get_zig_std_dir(Buf zig_lib_dir);	...	@@ -19,4 +18,7 @@ Buf get_zig_std_dir(Buf zig_lib_dir);
19		18
20	Buf *get_global_cache_dir(void);	19	Buf *get_global_cache_dir(void);
21		20
		21
		22	FileExt classify_file_ext(const char *filename_ptr, size_t filename_len);
		23
22	#endif	24	#endif

src/dump_analysis.cpp+2-2

...	@@ -80,7 +80,7 @@ static void jw_array_elem(JsonWriter *jw) {	...	@@ -80,7 +80,7 @@ static void jw_array_elem(JsonWriter *jw) {
80	zig_unreachable();	80	zig_unreachable();
81	case JsonWriterStateArray:	81	case JsonWriterStateArray:
82	fprintf(jw->f, ",");	82	fprintf(jw->f, ",");
83	// fallthrough	83	ZIG_FALLTHROUGH;
84	case JsonWriterStateArrayStart:	84	case JsonWriterStateArrayStart:
85	jw->state[jw->state_index] = JsonWriterStateArray;	85	jw->state[jw->state_index] = JsonWriterStateArray;
86	jw_push_state(jw, JsonWriterStateValue);	86	jw_push_state(jw, JsonWriterStateValue);
...	@@ -134,7 +134,7 @@ static void jw_object_field(JsonWriter jw, const char name) {	...	@@ -134,7 +134,7 @@ static void jw_object_field(JsonWriter jw, const char name) {
134	zig_unreachable();	134	zig_unreachable();
135	case JsonWriterStateObject:	135	case JsonWriterStateObject:
136	fprintf(jw->f, ",");	136	fprintf(jw->f, ",");
137	// fallthrough	137	ZIG_FALLTHROUGH;
138	case JsonWriterStateObjectStart:	138	case JsonWriterStateObjectStart:
139	jw->state[jw->state_index] = JsonWriterStateObject;	139	jw->state[jw->state_index] = JsonWriterStateObject;
140	jw_push_state(jw, JsonWriterStateValue);	140	jw_push_state(jw, JsonWriterStateValue);

src/ir.cpp+73-32

 @@ -231,6 +231,7 @@ static ZigType *ir_resolve_atomic_operand_type(IrAnalyze *ira, IrInstGen *op);
 static IrInstSrc *ir_lval_wrap(IrBuilderSrc *irb, Scope *scope, IrInstSrc *value, LVal lval, ResultLoc *result_loc);
 static IrInstSrc *ir_expr_wrap(IrBuilderSrc *irb, Scope *scope, IrInstSrc *inst, ResultLoc *result_loc);
 static ZigType *adjust_ptr_align(CodeGen *g, ZigType *ptr_type, uint32_t new_align);
+static ZigType *adjust_ptr_const(CodeGen *g, ZigType *ptr_type, bool is_const);
 static ZigType *adjust_slice_align(CodeGen *g, ZigType *slice_type, uint32_t new_align);
 static Error buf_read_value_bytes(IrAnalyze *ira, CodeGen *codegen, AstNode *source_node, uint8_t *buf, ZigValue *val);
 static void buf_write_value_bytes(CodeGen *codegen, uint8_t *buf, ZigValue *val);
 @@ -11453,10 +11454,8 @@ static ConstCastOnly types_match_const_cast_only(IrAnalyze *ira, ZigType *wanted
     bool actual_allows_zero = ptr_allows_addr_zero(actual_type);
     bool wanted_is_c_ptr = wanted_type->id == ZigTypeIdPointer && wanted_type->data.pointer.ptr_len == PtrLenC;
     bool actual_is_c_ptr = actual_type->id == ZigTypeIdPointer && actual_type->data.pointer.ptr_len == PtrLenC;
-    bool wanted_opt_or_ptr = wanted_ptr_type != nullptr &&
+    bool wanted_opt_or_ptr = wanted_ptr_type != nullptr && wanted_ptr_type->id == ZigTypeIdPointer;
-        (wanted_type->id == ZigTypeIdPointer || wanted_type->id == ZigTypeIdOptional);
+    bool actual_opt_or_ptr = actual_ptr_type != nullptr && actual_ptr_type->id == ZigTypeIdPointer;
-    bool actual_opt_or_ptr = actual_ptr_type != nullptr &&
-        (actual_type->id == ZigTypeIdPointer || actual_type->id == ZigTypeIdOptional);
     if (wanted_opt_or_ptr && actual_opt_or_ptr) {
         bool ok_null_term_ptrs =
             wanted_ptr_type->data.pointer.sentinel == nullptr ||
 @@ -11844,6 +11843,7 @@ static ZigType *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_node, ZigT
     bool any_are_null = (prev_inst->value->type->id == ZigTypeIdNull);
     bool convert_to_const_slice = false;
+    bool make_the_slice_const = false;
     for (; i < instruction_count; i += 1) {
         IrInstGen *cur_inst = instructions[i];
         ZigType *cur_type = cur_inst->value->type;
 @@ -12357,12 +12357,12 @@ static ZigType *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_node, ZigT
             ZigType *slice_type = (prev_type->id == ZigTypeIdErrorUnion) ?
                 prev_type->data.error_union.payload_type : prev_type;
             ZigType *slice_ptr_type = slice_type->data.structure.fields[slice_ptr_index]->type_entry;
-            if ((slice_ptr_type->data.pointer.is_const || array_type->data.array.len == 0 ||
+            if (types_match_const_cast_only(ira, slice_ptr_type->data.pointer.child_type,
-                        !cur_type->data.pointer.is_const) &&
-                types_match_const_cast_only(ira,
-                    slice_ptr_type->data.pointer.child_type,
                     array_type->data.array.child_type, source_node, false).id == ConstCastResultIdOk)
             {
+                bool const_ok = (slice_ptr_type->data.pointer.is_const || array_type->data.array.len == 0 ||
+                        !cur_type->data.pointer.is_const);
+                if (!const_ok) make_the_slice_const = true;
                 convert_to_const_slice = false;
                 continue;
             }
 @@ -12391,12 +12391,12 @@ static ZigType *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_node, ZigT
                     break;
             }
             ZigType *slice_ptr_type = slice_type->data.structure.fields[slice_ptr_index]->type_entry;
-            if ((slice_ptr_type->data.pointer.is_const || array_type->data.array.len == 0 ||
+            if (types_match_const_cast_only(ira, slice_ptr_type->data.pointer.child_type,
-                        !prev_type->data.pointer.is_const) &&
-                types_match_const_cast_only(ira,
-                    slice_ptr_type->data.pointer.child_type,
                     array_type->data.array.child_type, source_node, false).id == ConstCastResultIdOk)
             {
+                bool const_ok = (slice_ptr_type->data.pointer.is_const || array_type->data.array.len == 0 ||
+                        !prev_type->data.pointer.is_const);
+                if (!const_ok) make_the_slice_const = true;
                 prev_inst = cur_inst;
                 convert_to_const_slice = false;
                 continue;
 @@ -12408,8 +12408,6 @@ static ZigType *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_node, ZigT
                 cur_type->data.pointer.child_type->id == ZigTypeIdArray &&
             prev_type->id == ZigTypeIdPointer && prev_type->data.pointer.ptr_len == PtrLenSingle &&
                 prev_type->data.pointer.child_type->id == ZigTypeIdArray &&
-            (cur_type->data.pointer.is_const || !prev_type->data.pointer.is_const ||
-                prev_type->data.pointer.child_type->data.array.len == 0) &&
             (
                 prev_type->data.pointer.child_type->data.array.sentinel == nullptr ||
                 (cur_type->data.pointer.child_type->data.array.sentinel != nullptr &&
 @@ -12421,6 +12419,9 @@ static ZigType *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_node, ZigT
                 prev_type->data.pointer.child_type->data.array.child_type,
                 source_node, !cur_type->data.pointer.is_const).id == ConstCastResultIdOk)
         {
+            bool const_ok = (cur_type->data.pointer.is_const || !prev_type->data.pointer.is_const ||
+                prev_type->data.pointer.child_type->data.array.len == 0);
+            if (!const_ok) make_the_slice_const = true;
             prev_inst = cur_inst;
             convert_to_const_slice = true;
             continue;
 @@ -12429,8 +12430,6 @@ static ZigType *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_node, ZigT
                 prev_type->data.pointer.child_type->id == ZigTypeIdArray &&
             cur_type->id == ZigTypeIdPointer && cur_type->data.pointer.ptr_len == PtrLenSingle &&
                 cur_type->data.pointer.child_type->id == ZigTypeIdArray &&
-            (prev_type->data.pointer.is_const || !cur_type->data.pointer.is_const ||
-                cur_type->data.pointer.child_type->data.array.len == 0) &&
             (
                 cur_type->data.pointer.child_type->data.array.sentinel == nullptr ||
                 (prev_type->data.pointer.child_type->data.array.sentinel != nullptr &&
 @@ -12442,6 +12441,9 @@ static ZigType *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_node, ZigT
                 cur_type->data.pointer.child_type->data.array.child_type,
                 source_node, !prev_type->data.pointer.is_const).id == ConstCastResultIdOk)
         {
+            bool const_ok = (prev_type->data.pointer.is_const || !cur_type->data.pointer.is_const ||
+                cur_type->data.pointer.child_type->data.array.len == 0);
+            if (!const_ok) make_the_slice_const = true;
             convert_to_const_slice = true;
             continue;
         }
 @@ -12486,7 +12488,7 @@ static ZigType *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_node, ZigT
             src_assert(array_type->id == ZigTypeIdArray, source_node);
             ZigType *ptr_type = get_pointer_to_type_extra2(
                     ira->codegen, array_type->data.array.child_type,
-                    prev_inst->value->type->data.pointer.is_const, false,
+                    prev_inst->value->type->data.pointer.is_const || make_the_slice_const, false,
                     PtrLenUnknown,
                     0, 0, 0, false,
                     VECTOR_INDEX_NONE, nullptr, array_type->data.array.sentinel);
 @@ -12537,6 +12539,26 @@ static ZigType *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_node, ZigT
                 return ira->codegen->builtin_types.entry_invalid;
             return get_optional_type(ira->codegen, prev_inst->value->type);
         }
+    } else if (make_the_slice_const) {
+        ZigType *slice_type;
+        if (prev_inst->value->type->id == ZigTypeIdErrorUnion) {
+            slice_type = prev_inst->value->type->data.error_union.payload_type;
+        } else if (is_slice(prev_inst->value->type)) {
+            slice_type = prev_inst->value->type;
+        } else {
+            zig_unreachable();
+        }
+        ZigType *slice_ptr_type = slice_type->data.structure.fields[slice_ptr_index]->type_entry;
+        ZigType *adjusted_ptr_type = adjust_ptr_const(ira->codegen, slice_ptr_type, make_the_slice_const);
+        ZigType *adjusted_slice_type = get_slice_type(ira->codegen, adjusted_ptr_type);
+        if (prev_inst->value->type->id == ZigTypeIdErrorUnion) {
+            return get_error_union_type(ira->codegen, prev_inst->value->type->data.error_union.err_set_type,
+                    adjusted_slice_type);
+        } else if (is_slice(prev_inst->value->type)) {
+            return adjusted_slice_type;
+        } else {
+            zig_unreachable();
+        }
     } else {
         return prev_inst->value->type;
     }
 @@ -15929,7 +15951,7 @@ static IrInstGen *ir_analyze_bin_op_cmp_numeric(IrAnalyze *ira, IrInst *source_i
     if (op1->value->type->id == ZigTypeIdVector && op2->value->type->id == ZigTypeIdVector) {
         if (op1->value->type->data.vector.len != op2->value->type->data.vector.len) {
             ir_add_error(ira, source_instr,
-                buf_sprintf("vector length mismatch: %" PRIu32 " and %" PRIu32,
+                buf_sprintf("vector length mismatch: %" PRIu64 " and %" PRIu64,
                     op1->value->type->data.vector.len, op2->value->type->data.vector.len));
             return ira->codegen->invalid_inst_gen;
         }
 @@ -18958,7 +18980,7 @@ static IrInstGen *ir_analyze_async_call(IrAnalyze *ira, IrInst* source_instr, Zi
         if (type_is_invalid(result_loc->value->type) || result_loc->value->type->id == ZigTypeIdUnreachable) {
             return result_loc;
         }
-        result_loc = ir_implicit_cast2(ira, &call_result_loc->source_instruction->base, result_loc,
+        result_loc = ir_implicit_cast2(ira, source_instr, result_loc,
                 get_pointer_to_type(ira->codegen, frame_type, false));
         if (type_is_invalid(result_loc->value->type))
             return ira->codegen->invalid_inst_gen;
 @@ -19925,6 +19947,7 @@ static IrInstGen *ir_analyze_call_extra(IrAnalyze *ira, IrInst* source_instr,
                     buf_sprintf("the specified modifier requires a comptime-known function"));
                 return ira->codegen->invalid_inst_gen;
             }
+            ZIG_FALLTHROUGH;
         default:
             break;
     }
 @@ -19943,14 +19966,16 @@ static IrInstGen *ir_analyze_call_extra(IrAnalyze *ira, IrInst* source_instr,
         return ira->codegen->invalid_inst_gen;
     IrInstGen *stack = nullptr;
+    IrInst *stack_src = nullptr;
     if (stack_is_non_null) {
         stack = ir_analyze_optional_value_payload_value(ira, source_instr, opt_stack, false);
         if (type_is_invalid(stack->value->type))
             return ira->codegen->invalid_inst_gen;
+        stack_src = &stack->base;
     }
     return ir_analyze_fn_call(ira, source_instr, fn, fn_type, fn_ref, first_arg_ptr, first_arg_ptr_src,
-        modifier, stack, &stack->base, false, args_ptr, args_len, nullptr, result_loc);
+        modifier, stack, stack_src, false, args_ptr, args_len, nullptr, result_loc);
 }
 static IrInstGen *ir_analyze_instruction_call_extra(IrAnalyze *ira, IrInstSrcCallExtra *instruction) {
 @@ -20708,24 +20733,44 @@ static ZigType *adjust_slice_align(CodeGen *g, ZigType *slice_type, uint32_t new
 static ZigType *adjust_ptr_len(CodeGen *g, ZigType *ptr_type, PtrLen ptr_len) {
     assert(ptr_type->id == ZigTypeIdPointer);
-    return get_pointer_to_type_extra(g,
+    return get_pointer_to_type_extra2(g,
             ptr_type->data.pointer.child_type,
             ptr_type->data.pointer.is_const, ptr_type->data.pointer.is_volatile,
             ptr_len,
             ptr_type->data.pointer.explicit_alignment,
             ptr_type->data.pointer.bit_offset_in_host, ptr_type->data.pointer.host_int_bytes,
-            ptr_type->data.pointer.allow_zero);
+            ptr_type->data.pointer.allow_zero,
+            ptr_type->data.pointer.vector_index,
+            ptr_type->data.pointer.inferred_struct_field,
+            ptr_type->data.pointer.sentinel);
 }
 static ZigType *adjust_ptr_allow_zero(CodeGen *g, ZigType *ptr_type, bool allow_zero) {
     assert(ptr_type->id == ZigTypeIdPointer);
-    return get_pointer_to_type_extra(g,
+    return get_pointer_to_type_extra2(g,
             ptr_type->data.pointer.child_type,
             ptr_type->data.pointer.is_const, ptr_type->data.pointer.is_volatile,
             ptr_type->data.pointer.ptr_len,
             ptr_type->data.pointer.explicit_alignment,
             ptr_type->data.pointer.bit_offset_in_host, ptr_type->data.pointer.host_int_bytes,
-            allow_zero);
+            allow_zero,
+            ptr_type->data.pointer.vector_index,
+            ptr_type->data.pointer.inferred_struct_field,
+            ptr_type->data.pointer.sentinel);
+}
+static ZigType *adjust_ptr_const(CodeGen *g, ZigType *ptr_type, bool is_const) {
+    assert(ptr_type->id == ZigTypeIdPointer);
+    return get_pointer_to_type_extra2(g,
+            ptr_type->data.pointer.child_type,
+            is_const, ptr_type->data.pointer.is_volatile,
+            ptr_type->data.pointer.ptr_len,
+            ptr_type->data.pointer.explicit_alignment,
+            ptr_type->data.pointer.bit_offset_in_host, ptr_type->data.pointer.host_int_bytes,
+            ptr_type->data.pointer.allow_zero,
+            ptr_type->data.pointer.vector_index,
+            ptr_type->data.pointer.inferred_struct_field,
+            ptr_type->data.pointer.sentinel);
 }
 static Error compute_elem_align(IrAnalyze *ira, ZigType *elem_type, uint32_t base_ptr_align,
 @@ -20880,13 +20925,8 @@ static IrInstGen *ir_analyze_instruction_elem_ptr(IrAnalyze *ira, IrInstSrcElemP
     if (instr_is_comptime(casted_elem_index)) {
         uint64_t index = bigint_as_u64(&casted_elem_index->value->data.x_bigint);
         if (array_type->id == ZigTypeIdArray) {
-            uint64_t array_len = array_type->data.array.len;
+            uint64_t array_len = array_type->data.array.len +
-            if (index == array_len && array_type->data.array.sentinel != nullptr) {
+                (array_type->data.array.sentinel != nullptr);
-                ZigType *elem_type = array_type->data.array.child_type;
-                IrInstGen *sentinel_elem = ir_const(ira, &elem_ptr_instruction->base.base, elem_type);
-                copy_const_val(ira->codegen, sentinel_elem->value, array_type->data.array.sentinel);
-                return ir_get_ref(ira, &elem_ptr_instruction->base.base, sentinel_elem, true, false);
-            }
             if (index >= array_len) {
                 ir_add_error_node(ira, elem_ptr_instruction->base.base.source_node,
                     buf_sprintf("index %" ZIG_PRI_u64 " outside array of size %" ZIG_PRI_u64,
 @@ -25131,7 +25171,7 @@ static IrInstGen *ir_analyze_instruction_c_import(IrAnalyze *ira, IrInstSrcCImpo
         ZigList<const char *> clang_argv = {0};
-        add_cc_args(ira->codegen, clang_argv, buf_ptr(tmp_dep_file), true, CSourceKindC);
+        add_cc_args(ira->codegen, clang_argv, buf_ptr(tmp_dep_file), true, FileExtC);
         clang_argv.append(buf_ptr(&tmp_c_file_path));
 @@ -28128,6 +28168,7 @@ static void buf_write_value_bytes(CodeGen *codegen, uint8_t *buf, ZigValue *val)
                     return;
                 }
             }
+            zig_unreachable();
         case ZigTypeIdOptional:
             zig_panic("TODO buf_write_value_bytes maybe type");
         case ZigTypeIdFn:

src/link.cpp+103-22

 @@ -651,6 +651,7 @@ static const char *build_libunwind(CodeGen *parent, Stage2ProgressNode *progress
         if (parent->is_single_threaded) {
             c_file->args.append("-D_LIBUNWIND_HAS_NO_THREADS");
         }
+        c_file->args.append("-Wno-bitwise-conditional-parentheses");
         c_source_files.append(c_file);
     }
     child_gen->c_source_files = c_source_files;
 @@ -1594,7 +1595,8 @@ static const char *get_libc_crt_file(CodeGen *parent, const char *file, Stage2Pr
     } else {
         assert(parent->libc != nullptr);
         Buf *out_buf = buf_alloc();
-        os_path_join(buf_create_from_str(parent->libc->crt_dir), buf_create_from_str(file), out_buf);
+        os_path_join(buf_create_from_mem(parent->libc->crt_dir, parent->libc->crt_dir_len),
+                buf_create_from_str(file), out_buf);
         return buf_ptr(out_buf);
     }
 }
 @@ -1767,8 +1769,17 @@ static void construct_linker_job_elf(LinkJob *lj) {
         lj->args.append(g->linker_script);
     }
-    if (g->out_type != OutTypeObj) {
+    switch (g->linker_gc_sections) {
-        lj->args.append("--gc-sections");
+        case OptionalBoolNull:
+            if (g->out_type != OutTypeObj) {
+                lj->args.append("--gc-sections");
+            }
+            break;
+        case OptionalBoolTrue:
+            lj->args.append("--gc-sections");
+            break;
+        case OptionalBoolFalse:
+            break;
     }
     if (g->link_eh_frame_hdr) {
 @@ -1779,6 +1790,19 @@ static void construct_linker_job_elf(LinkJob *lj) {
         lj->args.append("--export-dynamic");
     }
+    if (g->linker_optimization != nullptr) {
+        lj->args.append(buf_ptr(g->linker_optimization));
+    }
+    if (g->linker_z_nodelete) {
+        lj->args.append("-z");
+        lj->args.append("nodelete");
+    }
+    if (g->linker_z_defs) {
+        lj->args.append("-z");
+        lj->args.append("defs");
+    }
     lj->args.append("-m");
     lj->args.append(getLDMOption(g->zig_target));
 @@ -1859,7 +1883,7 @@ static void construct_linker_job_elf(LinkJob *lj) {
     if (g->libc_link_lib != nullptr) {
         if (g->libc != nullptr) {
             lj->args.append("-L");
-            lj->args.append(g->libc->crt_dir);
+            lj->args.append(buf_ptr(buf_create_from_mem(g->libc->crt_dir, g->libc->crt_dir_len)));
         }
         if (g->have_dynamic_link && (is_dyn_lib || g->out_type == OutTypeExe)) {
 @@ -1903,7 +1927,7 @@ static void construct_linker_job_elf(LinkJob *lj) {
             // libc is linked specially
             continue;
         }
-        if (buf_eql_str(link_lib->name, "c++") || buf_eql_str(link_lib->name, "c++abi")) {
+        if (target_is_libcpp_lib_name(g->zig_target, buf_ptr(link_lib->name))) {
             // libc++ is linked specially
             continue;
         }
 @@ -1947,15 +1971,11 @@ static void construct_linker_job_elf(LinkJob *lj) {
                 lj->args.append("-lpthread");
             }
         } else if (target_is_glibc(g->zig_target)) {
-            if (target_supports_libunwind(g->zig_target)) {
+            lj->args.append(build_libunwind(g, lj->build_dep_prog_node));
-                lj->args.append(build_libunwind(g, lj->build_dep_prog_node));
-            }
             add_glibc_libs(lj);
             lj->args.append(get_libc_crt_file(g, "libc_nonshared.a", lj->build_dep_prog_node));
         } else if (target_is_musl(g->zig_target)) {
-            if (target_supports_libunwind(g->zig_target)) {
+            lj->args.append(build_libunwind(g, lj->build_dep_prog_node));
-                lj->args.append(build_libunwind(g, lj->build_dep_prog_node));
-            }
             lj->args.append(build_musl(g, lj->build_dep_prog_node));
         } else if (g->libcpp_link_lib != nullptr) {
             lj->args.append(build_libunwind(g, lj->build_dep_prog_node));
 @@ -1973,8 +1993,17 @@ static void construct_linker_job_elf(LinkJob *lj) {
         }
     }
-    if (!g->zig_target->is_native_os) {
+    switch (g->linker_allow_shlib_undefined) {
-        lj->args.append("--allow-shlib-undefined");
+        case OptionalBoolNull:
+            if (!g->zig_target->is_native_os) {
+                lj->args.append("--allow-shlib-undefined");
+            }
+            break;
+        case OptionalBoolFalse:
+            break;
+        case OptionalBoolTrue:
+            lj->args.append("--allow-shlib-undefined");
+            break;
     }
 }
 @@ -2384,14 +2413,26 @@ static void construct_linker_job_coff(LinkJob *lj) {
     lj->args.append(buf_ptr(buf_sprintf("-OUT:%s", buf_ptr(&g->bin_file_output_path))));
     if (g->libc_link_lib != nullptr && g->libc != nullptr) {
-        lj->args.append(buf_ptr(buf_sprintf("-LIBPATH:%s", g->libc->crt_dir)));
+        Buf *buff0 = buf_create_from_str("-LIBPATH:");
+        buf_append_mem(buff0, g->libc->crt_dir, g->libc->crt_dir_len);
+        lj->args.append(buf_ptr(buff0));
         if (target_abi_is_gnu(g->zig_target->abi)) {
-            lj->args.append(buf_ptr(buf_sprintf("-LIBPATH:%s", g->libc->sys_include_dir)));
+            Buf *buff1 = buf_create_from_str("-LIBPATH:");
-            lj->args.append(buf_ptr(buf_sprintf("-LIBPATH:%s", g->libc->include_dir)));
+            buf_append_mem(buff1, g->libc->sys_include_dir, g->libc->sys_include_dir_len);
+            lj->args.append(buf_ptr(buff1));
+            Buf *buff2 = buf_create_from_str("-LIBPATH:");
+            buf_append_mem(buff2, g->libc->include_dir, g->libc->include_dir_len);
+            lj->args.append(buf_ptr(buff2));
         } else {
-            lj->args.append(buf_ptr(buf_sprintf("-LIBPATH:%s", g->libc->msvc_lib_dir)));
+            Buf *buff1 = buf_create_from_str("-LIBPATH:");
-            lj->args.append(buf_ptr(buf_sprintf("-LIBPATH:%s", g->libc->kernel32_lib_dir)));
+            buf_append_mem(buff1, g->libc->msvc_lib_dir, g->libc->msvc_lib_dir_len);
+            lj->args.append(buf_ptr(buff1));
+            Buf *buff2 = buf_create_from_str("-LIBPATH:");
+            buf_append_mem(buff2, g->libc->kernel32_lib_dir, g->libc->kernel32_lib_dir_len);
+            lj->args.append(buf_ptr(buff2));
         }
     }
 @@ -2470,7 +2511,12 @@ static void construct_linker_job_coff(LinkJob *lj) {
         if (buf_eql_str(link_lib->name, "c")) {
             continue;
         }
-        if (buf_eql_str(link_lib->name, "c++") || buf_eql_str(link_lib->name, "c++abi")) {
+        if (target_is_libcpp_lib_name(g->zig_target, buf_ptr(link_lib->name))) {
+            // libc++ is linked specially
+            continue;
+        }
+        if (g->libc == nullptr && target_is_libc_lib_name(g->zig_target, buf_ptr(link_lib->name))) {
+            // these libraries are always linked below when targeting glibc
             continue;
         }
         bool is_sys_lib = is_mingw_link_lib(link_lib->name);
 @@ -2521,10 +2567,34 @@ static void construct_linker_job_macho(LinkJob *lj) {
     //lj->args.append("-error-limit=0");
     lj->args.append("-demangle");
+    switch (g->linker_gc_sections) {
+        case OptionalBoolNull:
+            // TODO why do we not follow the same logic of elf here?
+            break;
+        case OptionalBoolTrue:
+            lj->args.append("--gc-sections");
+            break;
+        case OptionalBoolFalse:
+            break;
+    }
     if (g->linker_rdynamic) {
         lj->args.append("-export_dynamic");
     }
+    if (g->linker_optimization != nullptr) {
+        lj->args.append(buf_ptr(g->linker_optimization));
+    }
+    if (g->linker_z_nodelete) {
+        lj->args.append("-z");
+        lj->args.append("nodelete");
+    }
+    if (g->linker_z_defs) {
+        lj->args.append("-z");
+        lj->args.append("defs");
+    }
     bool is_lib = g->out_type == OutTypeLib;
     bool is_dyn_lib = g->is_dynamic && is_lib;
     if (is_lib && !g->is_dynamic) {
 @@ -2639,9 +2709,20 @@ static void construct_linker_job_macho(LinkJob *lj) {
         // and change between versions.
         // so we always link against libSystem
         lj->args.append("-lSystem");
-    } else {
+    }
-        lj->args.append("-undefined");
+    switch (g->linker_allow_shlib_undefined) {
-        lj->args.append("dynamic_lookup");
+        case OptionalBoolNull:
+            if (!g->zig_target->is_native_os) {
+                lj->args.append("-undefined");
+                lj->args.append("dynamic_lookup");
+            }
+            break;
+        case OptionalBoolFalse:
+            break;
+        case OptionalBoolTrue:
+            lj->args.append("-undefined");
+            lj->args.append("dynamic_lookup");
+            break;
     }
     for (size_t i = 0; i < g->framework_dirs.length; i += 1) {

src/main.cpp+97-43

 @@ -455,11 +455,15 @@ static int main0(int argc, char **argv) {
     const char *mcpu = nullptr;
     CodeModel code_model = CodeModelDefault;
     const char *override_soname = nullptr;
-    bool only_preprocess = false;
+    bool only_pp_or_asm = false;
     bool ensure_libc_on_non_freestanding = false;
     bool ensure_libcpp_on_non_freestanding = false;
-    bool cpp_rtti = true;
+    bool disable_c_depfile = false;
-    bool cpp_exceptions = true;
+    Buf *linker_optimization = nullptr;
+    OptionalBool linker_gc_sections = OptionalBoolNull;
+    OptionalBool linker_allow_shlib_undefined = OptionalBoolNull;
+    bool linker_z_nodelete = false;
+    bool linker_z_defs = false;
     ZigList<const char *> llvm_argv = {0};
     llvm_argv.append("zig (LLVM option parsing)");
 @@ -617,20 +621,22 @@ static int main0(int argc, char **argv) {
                     }
                     break;
                 case Stage2ClangArgPositional: {
-                    Buf *arg_buf = buf_create_from_str(it.only_arg);
+                    FileExt file_ext = classify_file_ext(it.only_arg, strlen(it.only_arg));
-                    if (buf_ends_with_str(arg_buf, ".c") ||
+                    switch (file_ext) {
-                        buf_ends_with_str(arg_buf, ".C") ||
+                        case FileExtAsm:
-                        buf_ends_with_str(arg_buf, ".cc") ||
+                        case FileExtC:
-                        buf_ends_with_str(arg_buf, ".cpp") ||
+                        case FileExtCpp:
-                        buf_ends_with_str(arg_buf, ".cxx") ||
+                        case FileExtLLVMIr:
-                        buf_ends_with_str(arg_buf, ".s") ||
+                        case FileExtLLVMBitCode:
-                        buf_ends_with_str(arg_buf, ".S"))
+                        case FileExtHeader: {
-                    {
+                            CFile *c_file = heap::c_allocator.create<CFile>();
-                        CFile *c_file = heap::c_allocator.create<CFile>();
+                            c_file->source_path = it.only_arg;
-                        c_file->source_path = it.only_arg;
+                            c_source_files.append(c_file);
-                        c_source_files.append(c_file);
+                            break;
-                    } else {
+                        }
-                        objects.append(it.only_arg);
+                        case FileExtUnknown:
+                            objects.append(it.only_arg);
+                            break;
                     }
                     break;
                 }
 @@ -676,8 +682,12 @@ static int main0(int argc, char **argv) {
                     }
                     break;
                 }
-                case Stage2ClangArgPreprocess:
+                case Stage2ClangArgPreprocessOrAsm:
-                    only_preprocess = true;
+                    // this handles both -E and -S
+                    only_pp_or_asm = true;
+                    for (size_t i = 0; i < it.other_args_len; i += 1) {
+                        clang_argv.append(it.other_args_ptr[i]);
+                    }
                     break;
                 case Stage2ClangArgOptimize:
                     // alright what release mode do they want?
 @@ -688,7 +698,9 @@ static int main0(int argc, char **argv) {
                             strcmp(it.only_arg, "O4") == 0)
                     {
                         build_mode = BuildModeFastRelease;
-                    } else if (strcmp(it.only_arg, "Og") == 0) {
+                    } else if (strcmp(it.only_arg, "Og") == 0 ||
+                            strcmp(it.only_arg, "O0") == 0)
+                    {
                         build_mode = BuildModeDebug;
                     } else {
                         for (size_t i = 0; i < it.other_args_len; i += 1) {
 @@ -722,18 +734,6 @@ static int main0(int argc, char **argv) {
                     verbose_cc = true;
                     verbose_link = true;
                     break;
-                case Stage2ClangArgExceptions:
-                    cpp_exceptions = true;
-                    break;
-                case Stage2ClangArgNoExceptions:
-                    cpp_exceptions = false;
-                    break;
-                case Stage2ClangArgRtti:
-                    cpp_rtti = true;
-                    break;
-                case Stage2ClangArgNoRtti:
-                    cpp_rtti = false;
-                    break;
                 case Stage2ClangArgForLinker:
                     linker_args.append(buf_create_from_str(it.only_arg));
                     break;
 @@ -741,6 +741,24 @@ static int main0(int argc, char **argv) {
                     linker_args.append(buf_create_from_str("-z"));
                     linker_args.append(buf_create_from_str(it.only_arg));
                     break;
+                case Stage2ClangArgLibDir:
+                    lib_dirs.append(it.only_arg);
+                    break;
+                case Stage2ClangArgMCpu:
+                    mcpu = it.only_arg;
+                    break;
+                case Stage2ClangArgDepFile:
+                    disable_c_depfile = true;
+                    for (size_t i = 0; i < it.other_args_len; i += 1) {
+                        clang_argv.append(it.other_args_ptr[i]);
+                    }
+                    break;
+                case Stage2ClangArgFrameworkDir:
+                    framework_dirs.append(it.only_arg);
+                    break;
+                case Stage2ClangArgFramework:
+                    frameworks.append(it.only_arg);
+                    break;
             }
         }
         // Parse linker args
 @@ -802,6 +820,37 @@ static int main0(int argc, char **argv) {
                 buf_eql_str(arg, "-export-dynamic"))
             {
                 rdynamic = true;
+            } else if (buf_eql_str(arg, "--version-script")) {
+                i += 1;
+                if (i >= linker_args.length) {
+                    fprintf(stderr, "expected linker arg after '%s'\n", buf_ptr(arg));
+                    return EXIT_FAILURE;
+                }
+                version_script = linker_args.at(i);
+            } else if (buf_starts_with_str(arg, "-O")) {
+                linker_optimization = arg;
+            } else if (buf_eql_str(arg, "--gc-sections")) {
+                linker_gc_sections = OptionalBoolTrue;
+            } else if (buf_eql_str(arg, "--no-gc-sections")) {
+                linker_gc_sections = OptionalBoolFalse;
+            } else if (buf_eql_str(arg, "--allow-shlib-undefined")) {
+                linker_allow_shlib_undefined = OptionalBoolTrue;
+            } else if (buf_eql_str(arg, "--no-allow-shlib-undefined")) {
+                linker_allow_shlib_undefined = OptionalBoolFalse;
+            } else if (buf_eql_str(arg, "-z")) {
+                i += 1;
+                if (i >= linker_args.length) {
+                    fprintf(stderr, "expected linker arg after '%s'\n", buf_ptr(arg));
+                    return EXIT_FAILURE;
+                }
+                Buf *z_arg = linker_args.at(i);
+                if (buf_eql_str(z_arg, "nodelete")) {
+                    linker_z_nodelete = true;
+                } else if (buf_eql_str(z_arg, "defs")) {
+                    linker_z_defs = true;
+                } else {
+                    fprintf(stderr, "warning: unsupported linker arg: -z %s\n", buf_ptr(z_arg));
+                }
             } else {
                 fprintf(stderr, "warning: unsupported linker arg: %s\n", buf_ptr(arg));
             }
 @@ -811,7 +860,7 @@ static int main0(int argc, char **argv) {
             build_mode = BuildModeSafeRelease;
         }
-        if (only_preprocess) {
+        if (only_pp_or_asm) {
             cmd = CmdBuild;
             out_type = OutTypeObj;
             emit_bin = false;
 @@ -1329,8 +1378,6 @@ static int main0(int argc, char **argv) {
             LinkLib *link_lib = codegen_add_link_lib(g, buf_create_from_str(link_libs.at(i)));
             link_lib->provided_explicitly = true;
         }
-        g->cpp_rtti = cpp_rtti;
-        g->cpp_exceptions = cpp_exceptions;
         g->subsystem = subsystem;
         g->valgrind_support = valgrind_support;
         g->want_pic = want_pic;
 @@ -1369,15 +1416,17 @@ static int main0(int argc, char **argv) {
                 return print_error_usage(arg0);
             }
-            bool any_non_c_link_libs = false;
+            bool any_system_lib_dependencies = false;
             for (size_t i = 0; i < link_libs.length; i += 1) {
-                if (!target_is_libc_lib_name(&target, link_libs.at(i))) {
+                if (!target_is_libc_lib_name(&target, link_libs.at(i)) &&
-                    any_non_c_link_libs = true;
+                    !target_is_libcpp_lib_name(&target, link_libs.at(i)))
+                {
+                    any_system_lib_dependencies = true;
                     break;
                 }
             }
-            if (target.is_native_os && any_non_c_link_libs) {
+            if (target.is_native_os && any_system_lib_dependencies) {
                 Error err;
                 Stage2NativePaths paths;
                 if ((err = stage2_detect_native_paths(&paths))) {
 @@ -1477,8 +1526,6 @@ static int main0(int argc, char **argv) {
             }
             CodeGen *g = codegen_create(main_pkg_path, zig_root_source_file, &target, out_type, build_mode,
                     override_lib_dir, libc, cache_dir_buf, cmd == CmdTest, root_progress_node);
-            g->cpp_rtti = cpp_rtti;
-            g->cpp_exceptions = cpp_exceptions;
             if (llvm_argv.length >= 2) codegen_set_llvm_argv(g, llvm_argv.items + 1, llvm_argv.length - 2);
             g->valgrind_support = valgrind_support;
             g->link_eh_frame_hdr = link_eh_frame_hdr;
 @@ -1522,6 +1569,13 @@ static int main0(int argc, char **argv) {
             g->system_linker_hack = system_linker_hack;
             g->function_sections = function_sections;
             g->code_model = code_model;
+            g->disable_c_depfile = disable_c_depfile;
+            g->linker_optimization = linker_optimization;
+            g->linker_gc_sections = linker_gc_sections;
+            g->linker_allow_shlib_undefined = linker_allow_shlib_undefined;
+            g->linker_z_nodelete = linker_z_nodelete;
+            g->linker_z_defs = linker_z_defs;
             if (override_soname) {
                 g->override_soname = buf_create_from_str(override_soname);
 @@ -1611,7 +1665,7 @@ static int main0(int argc, char **argv) {
 #endif
                         Buf *dest_path = buf_create_from_str(emit_bin_override_path);
                         Buf *source_path;
-                        if (only_preprocess) {
+                        if (only_pp_or_asm) {
                             source_path = buf_alloc();
                             Buf *pp_only_basename = buf_create_from_str(
                                     c_source_files.at(0)->preprocessor_only_basename);
 @@ -1625,7 +1679,7 @@ static int main0(int argc, char **argv) {
                                     buf_ptr(dest_path), err_str(err));
                             return main_exit(root_progress_node, EXIT_FAILURE);
                         }
-                    } else if (only_preprocess) {
+                    } else if (only_pp_or_asm) {
 #if defined(ZIG_OS_WINDOWS)
                         buf_replace(g->c_artifact_dir, '/', '\\');
 #endif

src/os.cpp+6-3

 @@ -1097,8 +1097,8 @@ static Error set_file_times(OsFile file, OsTimeStamp ts) {
     return ErrorNone;
 #else
     struct timespec times[2] = {
-        { (time_t)ts.sec, (time_t)ts.nsec },
+        { (time_t)ts.sec, (long)ts.nsec },
-        { (time_t)ts.sec, (time_t)ts.nsec },
+        { (time_t)ts.sec, (long)ts.nsec },
     };
     if (futimens(file, times) == -1) {
         switch (errno) {
 @@ -1456,7 +1456,10 @@ static void init_rand() {
     memcpy(&seed, bytes, sizeof(unsigned));
     srand(seed);
 #elif defined(ZIG_OS_LINUX)
-    srand(*((unsigned*)getauxval(AT_RANDOM)));
+    unsigned char *ptr_random = (unsigned char*)getauxval(AT_RANDOM);
+    unsigned seed;
+    memcpy(&seed, ptr_random, sizeof(seed));
+    srand(seed);
 #else
     int fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC);
     if (fd == -1) {

src/stage2.h+6-5

 @@ -342,18 +342,19 @@ enum Stage2ClangArg {
     Stage2ClangArgShared,
     Stage2ClangArgRDynamic,
     Stage2ClangArgWL,
-    Stage2ClangArgPreprocess,
+    Stage2ClangArgPreprocessOrAsm,
     Stage2ClangArgOptimize,
     Stage2ClangArgDebug,
     Stage2ClangArgSanitize,
     Stage2ClangArgLinkerScript,
     Stage2ClangArgVerboseCmds,
-    Stage2ClangArgExceptions,
-    Stage2ClangArgNoExceptions,
-    Stage2ClangArgRtti,
-    Stage2ClangArgNoRtti,
     Stage2ClangArgForLinker,
     Stage2ClangArgLinkerInputZ,
+    Stage2ClangArgLibDir,
+    Stage2ClangArgMCpu,
+    Stage2ClangArgDepFile,
+    Stage2ClangArgFrameworkDir,
+    Stage2ClangArgFramework,
 };
 // ABI warning

src/target.cpp+14-13

 @@ -624,6 +624,7 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) {
                         case CIntTypeCount:
                             zig_unreachable();
                     }
+                    zig_unreachable();
                 default:
                     switch (id) {
                         case CIntTypeShort:
 @@ -642,6 +643,7 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) {
                             zig_unreachable();
                     }
             }
+            zig_unreachable();
         case OsLinux:
         case OsMacOSX:
         case OsFreeBSD:
 @@ -666,6 +668,7 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) {
                 case CIntTypeCount:
                     zig_unreachable();
             }
+            zig_unreachable();
         case OsUefi:
         case OsWindows:
             switch (id) {
 @@ -683,6 +686,7 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) {
                 case CIntTypeCount:
                     zig_unreachable();
             }
+            zig_unreachable();
         case OsIOS:
             switch (id) {
                 case CIntTypeShort:
 @@ -699,6 +703,7 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) {
                 case CIntTypeCount:
                     zig_unreachable();
             }
+            zig_unreachable();
         case OsAnanas:
         case OsCloudABI:
         case OsKFreeBSD:
 @@ -1207,6 +1212,15 @@ bool target_is_libc_lib_name(const ZigTarget *target, const char *name) {
     if (strcmp(name, "c") == 0)
         return true;
+    if (target_abi_is_gnu(target->abi) && target->os == OsWindows) {
+        // mingw-w64
+        if (strcmp(name, "m") == 0)
+            return true;
+        return false;
+    }
     if (target_abi_is_gnu(target->abi) || target_abi_is_musl(target->abi) || target_os_is_darwin(target->os)) {
         if (strcmp(name, "m") == 0)
             return true;
 @@ -1286,19 +1300,6 @@ const char *target_arch_musl_name(ZigLLVM_ArchType arch) {
     }
 }
-bool target_supports_libunwind(const ZigTarget *target) {
-    switch (target->arch) {
-        case ZigLLVM_arm:
-        case ZigLLVM_armeb:
-        case ZigLLVM_riscv32:
-        case ZigLLVM_riscv64:
-            return false;
-        default:
-            return true;
-    }
-    return true;
-}
 bool target_libc_needs_crti_crtn(const ZigTarget *target) {
     if (target->arch == ZigLLVM_riscv32 || target->arch == ZigLLVM_riscv64 || target_is_android(target)) {
         return false;

src/target.hpp-1

...	@@ -119,7 +119,6 @@ bool target_supports_stack_probing(const ZigTarget *target);	...	@@ -119,7 +119,6 @@ bool target_supports_stack_probing(const ZigTarget *target);
119	bool target_supports_sanitize_c(const ZigTarget *target);	119	bool target_supports_sanitize_c(const ZigTarget *target);
120	bool target_has_debug_info(const ZigTarget *target);	120	bool target_has_debug_info(const ZigTarget *target);
121	const char *target_arch_musl_name(ZigLLVM_ArchType arch);	121	const char *target_arch_musl_name(ZigLLVM_ArchType arch);
122	bool target_supports_libunwind(const ZigTarget *target);
123		122
124	uint32_t target_arch_pointer_bit_width(ZigLLVM_ArchType arch);	123	uint32_t target_arch_pointer_bit_width(ZigLLVM_ArchType arch);
125	uint32_t target_arch_largest_atomic_bits(ZigLLVM_ArchType arch);	124	uint32_t target_arch_largest_atomic_bits(ZigLLVM_ArchType arch);

src/tokenizer.cpp+12-3

 @@ -840,6 +840,7 @@ void tokenize(Buf *buf, Tokenization *out) {
                         t.state = TokenizeStateStart;
                         continue;
                 }
+                break;
             case TokenizeStateSawSlash:
                 switch (c) {
                     case '/':
 @@ -1209,7 +1210,7 @@ void tokenize(Buf *buf, Tokenization *out) {
                     t.is_trailing_underscore = false;
                     t.state = TokenizeStateNumber;
                 }
-                // fall through
+                ZIG_FALLTHROUGH;
             case TokenizeStateNumber:
                 {
                     if (c == '_') {
 @@ -1291,7 +1292,7 @@ void tokenize(Buf *buf, Tokenization *out) {
                     t.is_trailing_underscore = false;
                     t.state = TokenizeStateFloatFraction;
                 }
-                // fall through
+                ZIG_FALLTHROUGH;
             case TokenizeStateFloatFraction:
                 {
                     if (c == '_') {
 @@ -1350,7 +1351,7 @@ void tokenize(Buf *buf, Tokenization *out) {
                     t.is_trailing_underscore = false;
                     t.state = TokenizeStateFloatExponentNumber;
                 }
-                // fall through
+                ZIG_FALLTHROUGH;
             case TokenizeStateFloatExponentNumber:
                 {
                     if (c == '_') {
 @@ -1494,9 +1495,17 @@ void tokenize(Buf *buf, Tokenization *out) {
             tokenize_error(&t, "unexpected EOF");
             break;
         case TokenizeStateLineComment:
+            break;
         case TokenizeStateSawSlash2:
+            cancel_token(&t);
+            break;
         case TokenizeStateSawSlash3:
+            set_token_id(&t, t.cur_tok, TokenIdDocComment);
+            end_token(&t);
+            break;
         case TokenizeStateSawSlashBang:
+            set_token_id(&t, t.cur_tok, TokenIdContainerDocComment);
+            end_token(&t);
             break;
     }
     if (t.state != TokenizeStateError) {

src/util.hpp+9

...	@@ -100,6 +100,15 @@ static inline bool is_power_of_2(uint64_t x) {	...	@@ -100,6 +100,15 @@ static inline bool is_power_of_2(uint64_t x) {
100	return x != 0 && ((x & (~x + 1)) == x);	100	return x != 0 && ((x & (~x + 1)) == x);
101	}	101	}
102		102
		103	static inline bool mem_ends_with_mem(const char mem, size_t mem_len, const char end, size_t end_len) {
		104	if (mem_len < end_len) return false;
		105	return memcmp(mem + mem_len - end_len, end, end_len) == 0;
		106	}
		107
		108	static inline bool mem_ends_with_str(const char mem, size_t mem_len, const char str) {
		109	return mem_ends_with_mem(mem, mem_len, str, strlen(str));
		110	}
		111
103	static inline uint64_t round_to_next_power_of_2(uint64_t x) {	112	static inline uint64_t round_to_next_power_of_2(uint64_t x) {
104	--x;	113	--x;
105	x \|= x >> 1;	114	x \|= x >> 1;

src/util_base.hpp+10

...	@@ -64,4 +64,14 @@ static inline void zig_assert(bool ok, const char file, int line, const char f	...	@@ -64,4 +64,14 @@ static inline void zig_assert(bool ok, const char file, int line, const char f
64	#undef assert	64	#undef assert
65	#define assert(ok) zig_assert(ok, __FILE__, __LINE__, __func__)	65	#define assert(ok) zig_assert(ok, __FILE__, __LINE__, __func__)
66		66
		67	#if defined(_MSC_VER)
		68	#define ZIG_FALLTHROUGH
		69	#elif defined(__clang__)
		70	#define ZIG_FALLTHROUGH [[clang::fallthrough]]
		71	#elif defined(__GNUC__)
		72	#define ZIG_FALLTHROUGH __attribute__((fallthrough))
		73	#else
		74	#define ZIG_FALLTHROUGH
		75	#endif
		76
67	#endif	77	#endif

src/zig_clang.h+2

...	@@ -52,6 +52,8 @@ struct ZigClangAPValue {	...	@@ -52,6 +52,8 @@ struct ZigClangAPValue {
52	// experimentally-derived size of clang::APValue::DataType	52	// experimentally-derived size of clang::APValue::DataType
53	#if defined(_WIN32) && defined(_MSC_VER)	53	#if defined(_WIN32) && defined(_MSC_VER)
54	char Data[52];	54	char Data[52];
		55	#elif defined(__i386__)
		56	char Data[48];
55	#else	57	#else
56	char Data[68];	58	char Data[68];
57	#endif	59	#endif

test/cli.zig+8-3

...	@@ -59,7 +59,12 @@ fn printCmd(cwd: []const u8, argv: []const []const u8) void {	...	@@ -59,7 +59,12 @@ fn printCmd(cwd: []const u8, argv: []const []const u8) void {
59		59
60	fn exec(cwd: []const u8, argv: []const []const u8) !ChildProcess.ExecResult {	60	fn exec(cwd: []const u8, argv: []const []const u8) !ChildProcess.ExecResult {
61	const max_output_size = 100 * 1024;	61	const max_output_size = 100 * 1024;
62	const result = ChildProcess.exec(a, argv, cwd, null, max_output_size) catch \|err\| {	62	const result = ChildProcess.exec(.{
		63	.allocator = a,
		64	.argv = argv,
		65	.cwd = cwd,
		66	.max_output_bytes = max_output_size,
		67	}) catch \|err\| {
63	std.debug.warn("The following command failed:\n", .{});	68	std.debug.warn("The following command failed:\n", .{});
64	printCmd(cwd, argv);	69	printCmd(cwd, argv);
65	return err;	70	return err;
...	@@ -101,7 +106,7 @@ fn testGodboltApi(zig_exe: []const u8, dir_path: []const u8) anyerror!void {	...	@@ -101,7 +106,7 @@ fn testGodboltApi(zig_exe: []const u8, dir_path: []const u8) anyerror!void {
101	const example_zig_path = try fs.path.join(a, &[_][]const u8{ dir_path, "example.zig" });	106	const example_zig_path = try fs.path.join(a, &[_][]const u8{ dir_path, "example.zig" });
102	const example_s_path = try fs.path.join(a, &[_][]const u8{ dir_path, "example.s" });	107	const example_s_path = try fs.path.join(a, &[_][]const u8{ dir_path, "example.s" });
103		108
104	try std.io.writeFile(example_zig_path,	109	try fs.cwd().writeFile(example_zig_path,
105	\\// Type your code here, or load an example.	110	\\// Type your code here, or load an example.
106	\\export fn square(num: i32) i32 {	111	\\export fn square(num: i32) i32 {
107	\\ return num * num;	112	\\ return num * num;
...	@@ -124,7 +129,7 @@ fn testGodboltApi(zig_exe: []const u8, dir_path: []const u8) anyerror!void {	...	@@ -124,7 +129,7 @@ fn testGodboltApi(zig_exe: []const u8, dir_path: []const u8) anyerror!void {
124	};	129	};
125	_ = try exec(dir_path, &args);	130	_ = try exec(dir_path, &args);
126		131
127	const out_asm = try std.io.readFileAlloc(a, example_s_path);	132	const out_asm = try std.fs.cwd().readFileAlloc(a, example_s_path, std.math.maxInt(usize));
128	testing.expect(std.mem.indexOf(u8, out_asm, "square:") != null);	133	testing.expect(std.mem.indexOf(u8, out_asm, "square:") != null);
129	testing.expect(std.mem.indexOf(u8, out_asm, "mov\teax, edi") != null);	134	testing.expect(std.mem.indexOf(u8, out_asm, "mov\teax, edi") != null);
130	testing.expect(std.mem.indexOf(u8, out_asm, "imul\teax, edi") != null);	135	testing.expect(std.mem.indexOf(u8, out_asm, "imul\teax, edi") != null);

test/compile_errors.zig+52-1

...	@@ -2,6 +2,19 @@ const tests = @import("tests.zig");	...	@@ -2,6 +2,19 @@ const tests = @import("tests.zig");
2	const std = @import("std");	2	const std = @import("std");
3		3
4	pub fn addCases(cases: *tests.CompileErrorContext) void {	4	pub fn addCases(cases: *tests.CompileErrorContext) void {
		5	cases.addTest("cast between ?T where T is not a pointer",
		6	\\pub const fnty1 = ?fn (i8) void;
		7	\\pub const fnty2 = ?fn (u64) void;
		8	\\export fn entry() void {
		9	\\ var a: fnty1 = undefined;
		10	\\ var b: fnty2 = undefined;
		11	\\ a = b;
		12	\\}
		13	, &[_][]const u8{
		14	"tmp.zig:6:9: error: expected type '?fn(i8) void', found '?fn(u64) void'",
		15	"tmp.zig:6:9: note: optional type child 'fn(u64) void' cannot cast into optional type child 'fn(i8) void'",
		16	});
		17
5	cases.addTest("unused variable error on errdefer",	18	cases.addTest("unused variable error on errdefer",
6	\\fn foo() !void {	19	\\fn foo() !void {
7	\\ errdefer \|a\| unreachable;	20	\\ errdefer \|a\| unreachable;
...	@@ -1188,7 +1201,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {	...	@@ -1188,7 +1201,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
1188	\\ suspend;	1201	\\ suspend;
1189	\\}	1202	\\}
1190	, &[_][]const u8{	1203	, &[_][]const u8{
1191	"tmp.zig:3:5: error: expected type '@Frame(bar)', found '@Frame(foo)'",	1204	"tmp.zig:3:13: error: expected type '@Frame(bar)', found '@Frame(foo)'",
1192	});	1205	});
1193		1206
1194	cases.add("@Frame() of generic function",	1207	cases.add("@Frame() of generic function",
...	@@ -6806,4 +6819,42 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {	...	@@ -6806,4 +6819,42 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
6806	, &[_][]const u8{	6819	, &[_][]const u8{
6807	"tmp.zig:2:27: error: type 'u32' does not support array initialization",	6820	"tmp.zig:2:27: error: type 'u32' does not support array initialization",
6808	});	6821	});
		6822
		6823	cases.add("issue #2687: coerce from undefined array pointer to slice",
		6824	\\export fn foo1() void {
		6825	\\ const a: *[1]u8 = undefined;
		6826	\\ var b: []u8 = a;
		6827	\\}
		6828	\\export fn foo2() void {
		6829	\\ comptime {
		6830	\\ var a: *[1]u8 = undefined;
		6831	\\ var b: []u8 = a;
		6832	\\ }
		6833	\\}
		6834	\\export fn foo3() void {
		6835	\\ comptime {
		6836	\\ const a: *[1]u8 = undefined;
		6837	\\ var b: []u8 = a;
		6838	\\ }
		6839	\\}
		6840	, &[_][]const u8{
		6841	"tmp.zig:3:19: error: use of undefined value here causes undefined behavior",
		6842	"tmp.zig:8:23: error: use of undefined value here causes undefined behavior",
		6843	"tmp.zig:14:23: error: use of undefined value here causes undefined behavior",
		6844	});
		6845
		6846	cases.add("issue #3818: bitcast from parray/slice to u16",
		6847	\\export fn foo1() void {
		6848	\\ var bytes = [_]u8{1, 2};
		6849	\\ const word: u16 = @bitCast(u16, bytes[0..]);
		6850	\\}
		6851	\\export fn foo2() void {
		6852	\\ var bytes: []u8 = &[_]u8{1, 2};
		6853	\\ const word: u16 = @bitCast(u16, bytes);
		6854	\\}
		6855	, &[_][]const u8{
		6856	"tmp.zig:3:42: error: unable to @bitCast from pointer type '*[2]u8'",
		6857	"tmp.zig:7:32: error: destination type 'u16' has size 2 but source type '[]u8' has size 16",
		6858	"tmp.zig:7:37: note: referenced here",
		6859	});
6809	}	6860	}

test/src/compare_output.zig+4-4

...	@@ -91,7 +91,7 @@ pub const CompareOutputContext = struct {	...	@@ -91,7 +91,7 @@ pub const CompareOutputContext = struct {
91	const b = self.b;	91	const b = self.b;
92		92
93	const write_src = b.addWriteFiles();	93	const write_src = b.addWriteFiles();
94	for (case.sources.toSliceConst()) \|src_file\| {	94	for (case.sources.span()) \|src_file\| {
95	write_src.add(src_file.filename, src_file.source);	95	write_src.add(src_file.filename, src_file.source);
96	}	96	}
97		97
...	@@ -105,7 +105,7 @@ pub const CompareOutputContext = struct {	...	@@ -105,7 +105,7 @@ pub const CompareOutputContext = struct {
105	}	105	}
106		106
107	const exe = b.addExecutable("test", null);	107	const exe = b.addExecutable("test", null);
108	exe.addAssemblyFileFromWriteFileStep(write_src, case.sources.toSliceConst()[0].filename);	108	exe.addAssemblyFileFromWriteFileStep(write_src, case.sources.span()[0].filename);
109		109
110	const run = exe.run();	110	const run = exe.run();
111	run.addArgs(case.cli_args);	111	run.addArgs(case.cli_args);
...	@@ -125,7 +125,7 @@ pub const CompareOutputContext = struct {	...	@@ -125,7 +125,7 @@ pub const CompareOutputContext = struct {
125	if (mem.indexOf(u8, annotated_case_name, filter) == null) continue;	125	if (mem.indexOf(u8, annotated_case_name, filter) == null) continue;
126	}	126	}
127		127
128	const basename = case.sources.toSliceConst()[0].filename;	128	const basename = case.sources.span()[0].filename;
129	const exe = b.addExecutableFromWriteFileStep("test", write_src, basename);	129	const exe = b.addExecutableFromWriteFileStep("test", write_src, basename);
130	exe.setBuildMode(mode);	130	exe.setBuildMode(mode);
131	if (case.link_libc) {	131	if (case.link_libc) {
...	@@ -146,7 +146,7 @@ pub const CompareOutputContext = struct {	...	@@ -146,7 +146,7 @@ pub const CompareOutputContext = struct {
146	if (mem.indexOf(u8, annotated_case_name, filter) == null) return;	146	if (mem.indexOf(u8, annotated_case_name, filter) == null) return;
147	}	147	}
148		148
149	const basename = case.sources.toSliceConst()[0].filename;	149	const basename = case.sources.span()[0].filename;
150	const exe = b.addExecutableFromWriteFileStep("test", write_src, basename);	150	const exe = b.addExecutableFromWriteFileStep("test", write_src, basename);
151	if (case.link_libc) {	151	if (case.link_libc) {
152	exe.linkSystemLibrary("c");	152	exe.linkSystemLibrary("c");

test/src/run_translated_c.zig+2-2

...	@@ -82,13 +82,13 @@ pub const RunTranslatedCContext = struct {	...	@@ -82,13 +82,13 @@ pub const RunTranslatedCContext = struct {
82	}	82	}
83		83
84	const write_src = b.addWriteFiles();	84	const write_src = b.addWriteFiles();
85	for (case.sources.toSliceConst()) \|src_file\| {	85	for (case.sources.span()) \|src_file\| {
86	write_src.add(src_file.filename, src_file.source);	86	write_src.add(src_file.filename, src_file.source);
87	}	87	}
88	const translate_c = b.addTranslateC(.{	88	const translate_c = b.addTranslateC(.{
89	.write_file = .{	89	.write_file = .{
90	.step = write_src,	90	.step = write_src,
91	.basename = case.sources.toSliceConst()[0].filename,	91	.basename = case.sources.span()[0].filename,
92	},	92	},
93	});	93	});
94	translate_c.step.name = b.fmt("{} translate-c", .{annotated_case_name});	94	translate_c.step.name = b.fmt("{} translate-c", .{annotated_case_name});

test/src/translate_c.zig+3-3

...	@@ -105,20 +105,20 @@ pub const TranslateCContext = struct {	...	@@ -105,20 +105,20 @@ pub const TranslateCContext = struct {
105	}	105	}
106		106
107	const write_src = b.addWriteFiles();	107	const write_src = b.addWriteFiles();
108	for (case.sources.toSliceConst()) \|src_file\| {	108	for (case.sources.span()) \|src_file\| {
109	write_src.add(src_file.filename, src_file.source);	109	write_src.add(src_file.filename, src_file.source);
110	}	110	}
111		111
112	const translate_c = b.addTranslateC(.{	112	const translate_c = b.addTranslateC(.{
113	.write_file = .{	113	.write_file = .{
114	.step = write_src,	114	.step = write_src,
115	.basename = case.sources.toSliceConst()[0].filename,	115	.basename = case.sources.span()[0].filename,
116	},	116	},
117	});	117	});
118	translate_c.step.name = annotated_case_name;	118	translate_c.step.name = annotated_case_name;
119	translate_c.setTarget(case.target);	119	translate_c.setTarget(case.target);
120		120
121	const check_file = translate_c.addCheckFile(case.expected_lines.toSliceConst());	121	const check_file = translate_c.addCheckFile(case.expected_lines.span());
122		122
123	self.step.dependOn(&check_file.step);	123	self.step.dependOn(&check_file.step);
124	}	124	}

test/stage1/behavior.zig+3

 @@ -41,6 +41,9 @@ comptime {
     _ = @import("behavior/bugs/3586.zig");
     _ = @import("behavior/bugs/3742.zig");
     _ = @import("behavior/bugs/4560.zig");
+    _ = @import("behavior/bugs/4769_a.zig");
+    _ = @import("behavior/bugs/4769_b.zig");
+    _ = @import("behavior/bugs/4769_c.zig");
     _ = @import("behavior/bugs/394.zig");
     _ = @import("behavior/bugs/421.zig");
     _ = @import("behavior/bugs/529.zig");

test/stage1/behavior/array.zig+14-5

 @@ -31,14 +31,23 @@ fn getArrayLen(a: []const u32) usize {
 test "array with sentinels" {
     const S = struct {
         fn doTheTest(is_ct: bool) void {
-            var zero_sized: [0:0xde]u8 = [_:0xde]u8{};
-            expectEqual(@as(u8, 0xde), zero_sized[0]);
-            // Disabled at runtime because of
-            // https://github.com/ziglang/zig/issues/4372
             if (is_ct) {
+                var zero_sized: [0:0xde]u8 = [_:0xde]u8{};
+                // Disabled at runtime because of
+                // https://github.com/ziglang/zig/issues/4372
+                expectEqual(@as(u8, 0xde), zero_sized[0]);
                 var reinterpreted = @ptrCast(*[1]u8, &zero_sized);
                 expectEqual(@as(u8, 0xde), reinterpreted[0]);
             }
+            var arr: [3:0x55]u8 = undefined;
+            // Make sure the sentinel pointer is pointing after the last element
+            if (!is_ct) {
+                const sentinel_ptr = @ptrToInt(&arr[3]);
+                const last_elem_ptr = @ptrToInt(&arr[2]);
+                expectEqual(@as(usize, 1), sentinel_ptr - last_elem_ptr);
+            }
+            // Make sure the sentinel is writeable
+            arr[3] = 0x55;
         }
     };
 @@ -372,7 +381,7 @@ test "access the null element of a null terminated array" {
     const S = struct {
         fn doTheTest() void {
             var array: [4:0]u8 = .{ 'a', 'o', 'e', 'u' };
-            comptime expect(array[4] == 0);
+            expect(array[4] == 0);
             var len: usize = 4;
             expect(array[len] == 0);
         }

test/stage1/behavior/atomics.zig-2

...	@@ -190,8 +190,6 @@ fn testAtomicRmwInt() void {	...	@@ -190,8 +190,6 @@ fn testAtomicRmwInt() void {
190	_ = @atomicRmw(u8, &x, .Xor, 2, .SeqCst);	190	_ = @atomicRmw(u8, &x, .Xor, 2, .SeqCst);
191	expect(x == 0xfd);	191	expect(x == 0xfd);
192		192
193	// TODO https://github.com/ziglang/zig/issues/4724
194	if (builtin.arch == .mipsel) return;
195	_ = @atomicRmw(u8, &x, .Max, 1, .SeqCst);	193	_ = @atomicRmw(u8, &x, .Max, 1, .SeqCst);
196	expect(x == 0xfd);	194	expect(x == 0xfd);
197	_ = @atomicRmw(u8, &x, .Min, 1, .SeqCst);	195	_ = @atomicRmw(u8, &x, .Min, 1, .SeqCst);

test/stage1/behavior/bugs/4769_a.zig created+1

...	@@ -0,0 +1 @@
1	//
	\ No newline at end of file

test/stage1/behavior/bugs/4769_b.zig created+1

...	@@ -0,0 +1 @@
1	//!
	\ No newline at end of file

test/stage1/behavior/bugs/4769_c.zig created+1

...	@@ -0,0 +1 @@
1	///
	\ No newline at end of file

test/stage1/behavior/cast.zig+16-1

...	@@ -329,7 +329,7 @@ fn testCastPtrOfArrayToSliceAndPtr() void {	...	@@ -329,7 +329,7 @@ fn testCastPtrOfArrayToSliceAndPtr() void {
329	test "cast [1][]const u8 to []const ?[]const u8" {	329	test "cast [1][]const u8 to []const ?[]const u8" {
330	const window_name = [1][*]const u8{"window name"};	330	const window_name = [1][*]const u8{"window name"};
331	const x: []const ?[]const u8 = &window_name;	331	const x: []const ?[]const u8 = &window_name;
332	expect(mem.eql(u8, std.mem.toSliceConst(u8, @ptrCast([*:0]const u8, x[0].?)), "window name"));	332	expect(mem.eql(u8, std.mem.spanZ(@ptrCast([*:0]const u8, x[0].?)), "window name"));
333	}	333	}
334		334
335	test "@intCast comptime_int" {	335	test "@intCast comptime_int" {
...	@@ -790,3 +790,18 @@ test "assignment to optional pointer result loc" {	...	@@ -790,3 +790,18 @@ test "assignment to optional pointer result loc" {
790	var foo: struct { ptr: ?*c_void } = .{ .ptr = &global_struct };	790	var foo: struct { ptr: ?*c_void } = .{ .ptr = &global_struct };
791	expect(foo.ptr.? == @ptrCast(*c_void, &global_struct));	791	expect(foo.ptr.? == @ptrCast(*c_void, &global_struct));
792	}	792	}
		793
		794	test "peer type resolve string lit with sentinel-terminated mutable slice" {
		795	var array: [4:0]u8 = undefined;
		796	array[4] = 0; // TODO remove this when #4372 is solved
		797	var slice: [:0]u8 = array[0..4 :0];
		798	comptime expect(@TypeOf(slice, "hi") == [:0]const u8);
		799	comptime expect(@TypeOf("hi", slice) == [:0]const u8);
		800	}
		801
		802	test "peer type resolve array pointers, one of them const" {
		803	var array1: [4]u8 = undefined;
		804	const array2: [5]u8 = undefined;
		805	comptime expect(@TypeOf(&array1, &array2) == []const u8);
		806	comptime expect(@TypeOf(&array2, &array1) == []const u8);
		807	}

test/stage1/behavior/pointers.zig+1-1

...	@@ -225,7 +225,7 @@ test "null terminated pointer" {	...	@@ -225,7 +225,7 @@ test "null terminated pointer" {
225	var zero_ptr: [:0]const u8 = @ptrCast([:0]const u8, &array_with_zero);	225	var zero_ptr: [:0]const u8 = @ptrCast([:0]const u8, &array_with_zero);
226	var no_zero_ptr: [*]const u8 = zero_ptr;	226	var no_zero_ptr: [*]const u8 = zero_ptr;
227	var zero_ptr_again = @ptrCast([*:0]const u8, no_zero_ptr);	227	var zero_ptr_again = @ptrCast([*:0]const u8, no_zero_ptr);
228	expect(std.mem.eql(u8, std.mem.toSliceConst(u8, zero_ptr_again), "hello"));	228	expect(std.mem.eql(u8, std.mem.spanZ(zero_ptr_again), "hello"));
229	}	229	}
230	};	230	};
231	S.doTheTest();	231	S.doTheTest();

test/standalone/brace_expansion/main.zig+24-24

...	@@ -4,7 +4,7 @@ const mem = std.mem;	...	@@ -4,7 +4,7 @@ const mem = std.mem;
4	const debug = std.debug;	4	const debug = std.debug;
5	const assert = debug.assert;	5	const assert = debug.assert;
6	const testing = std.testing;	6	const testing = std.testing;
7	const Buffer = std.Buffer;	7	const ArrayListSentineled = std.ArrayListSentineled;
8	const ArrayList = std.ArrayList;	8	const ArrayList = std.ArrayList;
9	const maxInt = std.math.maxInt;	9	const maxInt = std.math.maxInt;
10		10
...	@@ -111,7 +111,7 @@ fn parse(tokens: const ArrayList(Token), token_index: usize) ParseError!Node {	...	@@ -111,7 +111,7 @@ fn parse(tokens: const ArrayList(Token), token_index: usize) ParseError!Node {
111	}	111	}
112	}	112	}
113		113
114	fn expandString(input: []const u8, output: *Buffer) !void {	114	fn expandString(input: []const u8, output: *ArrayListSentineled(u8, 0)) !void {
115	const tokens = try tokenize(input);	115	const tokens = try tokenize(input);
116	if (tokens.len == 1) {	116	if (tokens.len == 1) {
117	return output.resize(0);	117	return output.resize(0);
...	@@ -125,52 +125,52 @@ fn expandString(input: []const u8, output: *Buffer) !void {	...	@@ -125,52 +125,52 @@ fn expandString(input: []const u8, output: *Buffer) !void {
125	else => return error.InvalidInput,	125	else => return error.InvalidInput,
126	}	126	}
127		127
128	var result_list = ArrayList(Buffer).init(global_allocator);	128	var result_list = ArrayList(ArrayListSentineled(u8, 0)).init(global_allocator);
129	defer result_list.deinit();	129	defer result_list.deinit();
130		130
131	try expandNode(root, &result_list);	131	try expandNode(root, &result_list);
132		132
133	try output.resize(0);	133	try output.resize(0);
134	for (result_list.toSliceConst()) \|buf, i\| {	134	for (result_list.span()) \|buf, i\| {
135	if (i != 0) {	135	if (i != 0) {
136	try output.appendByte(' ');	136	try output.append(' ');
137	}	137	}
138	try output.append(buf.toSliceConst());	138	try output.appendSlice(buf.span());
139	}	139	}
140	}	140	}
141		141
142	const ExpandNodeError = error{OutOfMemory};	142	const ExpandNodeError = error{OutOfMemory};
143		143
144	fn expandNode(node: Node, output: *ArrayList(Buffer)) ExpandNodeError!void {	144	fn expandNode(node: Node, output: *ArrayList(ArrayListSentineled(u8, 0))) ExpandNodeError!void {
145	assert(output.len == 0);	145	assert(output.len == 0);
146	switch (node) {	146	switch (node) {
147	Node.Scalar => \|scalar\| {	147	Node.Scalar => \|scalar\| {
148	try output.append(try Buffer.init(global_allocator, scalar));	148	try output.append(try ArrayListSentineled(u8, 0).init(global_allocator, scalar));
149	},	149	},
150	Node.Combine => \|pair\| {	150	Node.Combine => \|pair\| {
151	const a_node = pair[0];	151	const a_node = pair[0];
152	const b_node = pair[1];	152	const b_node = pair[1];
153		153
154	var child_list_a = ArrayList(Buffer).init(global_allocator);	154	var child_list_a = ArrayList(ArrayListSentineled(u8, 0)).init(global_allocator);
155	try expandNode(a_node, &child_list_a);	155	try expandNode(a_node, &child_list_a);
156		156
157	var child_list_b = ArrayList(Buffer).init(global_allocator);	157	var child_list_b = ArrayList(ArrayListSentineled(u8, 0)).init(global_allocator);
158	try expandNode(b_node, &child_list_b);	158	try expandNode(b_node, &child_list_b);
159		159
160	for (child_list_a.toSliceConst()) \|buf_a\| {	160	for (child_list_a.span()) \|buf_a\| {
161	for (child_list_b.toSliceConst()) \|buf_b\| {	161	for (child_list_b.span()) \|buf_b\| {
162	var combined_buf = try Buffer.initFromBuffer(buf_a);	162	var combined_buf = try ArrayListSentineled(u8, 0).initFromBuffer(buf_a);
163	try combined_buf.append(buf_b.toSliceConst());	163	try combined_buf.appendSlice(buf_b.span());
164	try output.append(combined_buf);	164	try output.append(combined_buf);
165	}	165	}
166	}	166	}
167	},	167	},
168	Node.List => \|list\| {	168	Node.List => \|list\| {
169	for (list.toSliceConst()) \|child_node\| {	169	for (list.span()) \|child_node\| {
170	var child_list = ArrayList(Buffer).init(global_allocator);	170	var child_list = ArrayList(ArrayListSentineled(u8, 0)).init(global_allocator);
171	try expandNode(child_node, &child_list);	171	try expandNode(child_node, &child_list);
172		172
173	for (child_list.toSliceConst()) \|buf\| {	173	for (child_list.span()) \|buf\| {
174	try output.append(buf);	174	try output.append(buf);
175	}	175	}
176	}	176	}
...	@@ -187,17 +187,17 @@ pub fn main() !void {	...	@@ -187,17 +187,17 @@ pub fn main() !void {
187		187
188	global_allocator = &arena.allocator;	188	global_allocator = &arena.allocator;
189		189
190	var stdin_buf = try Buffer.initSize(global_allocator, 0);	190	var stdin_buf = try ArrayListSentineled(u8, 0).initSize(global_allocator, 0);
191	defer stdin_buf.deinit();	191	defer stdin_buf.deinit();
192		192
193	var stdin_adapter = stdin_file.inStream();	193	var stdin_adapter = stdin_file.inStream();
194	try stdin_adapter.stream.readAllBuffer(&stdin_buf, maxInt(usize));	194	try stdin_adapter.stream.readAllBuffer(&stdin_buf, maxInt(usize));
195		195
196	var result_buf = try Buffer.initSize(global_allocator, 0);	196	var result_buf = try ArrayListSentineled(u8, 0).initSize(global_allocator, 0);
197	defer result_buf.deinit();	197	defer result_buf.deinit();
198		198
199	try expandString(stdin_buf.toSlice(), &result_buf);	199	try expandString(stdin_buf.span(), &result_buf);
200	try stdout_file.write(result_buf.toSliceConst());	200	try stdout_file.write(result_buf.span());
201	}	201	}
202		202
203	test "invalid inputs" {	203	test "invalid inputs" {
...	@@ -218,7 +218,7 @@ test "invalid inputs" {	...	@@ -218,7 +218,7 @@ test "invalid inputs" {
218	}	218	}
219		219
220	fn expectError(test_input: []const u8, expected_err: anyerror) void {	220	fn expectError(test_input: []const u8, expected_err: anyerror) void {
221	var output_buf = Buffer.initSize(global_allocator, 0) catch unreachable;	221	var output_buf = ArrayListSentineled(u8, 0).initSize(global_allocator, 0) catch unreachable;
222	defer output_buf.deinit();	222	defer output_buf.deinit();
223		223
224	testing.expectError(expected_err, expandString(test_input, &output_buf));	224	testing.expectError(expected_err, expandString(test_input, &output_buf));
...	@@ -251,10 +251,10 @@ test "valid inputs" {	...	@@ -251,10 +251,10 @@ test "valid inputs" {
251	}	251	}
252		252
253	fn expectExpansion(test_input: []const u8, expected_result: []const u8) void {	253	fn expectExpansion(test_input: []const u8, expected_result: []const u8) void {
254	var result = Buffer.initSize(global_allocator, 0) catch unreachable;	254	var result = ArrayListSentineled(u8, 0).initSize(global_allocator, 0) catch unreachable;
255	defer result.deinit();	255	defer result.deinit();
256		256
257	expandString(test_input, &result) catch unreachable;	257	expandString(test_input, &result) catch unreachable;
258		258
259	testing.expectEqualSlices(u8, expected_result, result.toSlice());	259	testing.expectEqualSlices(u8, expected_result, result.span());
260	}	260	}

test/standalone/guess_number/main.zig+1-1

...	@@ -17,7 +17,7 @@ pub fn main() !void {	...	@@ -17,7 +17,7 @@ pub fn main() !void {
17	const seed = std.mem.readIntNative(u64, &seed_bytes);	17	const seed = std.mem.readIntNative(u64, &seed_bytes);
18	var prng = std.rand.DefaultPrng.init(seed);	18	var prng = std.rand.DefaultPrng.init(seed);
19		19
20	const answer = prng.random.range(u8, 0, 100) + 1;	20	const answer = prng.random.intRangeLessThan(u8, 0, 100) + 1;
21		21
22	while (true) {	22	while (true) {
23	try stdout.print("\nGuess a number between 1 and 100: ", .{});	23	try stdout.print("\nGuess a number between 1 and 100: ", .{});

test/tests.zig+32-33

 @@ -4,7 +4,6 @@ const debug = std.debug;
 const warn = debug.warn;
 const build = std.build;
 const CrossTarget = std.zig.CrossTarget;
-const Buffer = std.Buffer;
 const io = std.io;
 const fs = std.fs;
 const mem = std.mem;
 @@ -583,7 +582,7 @@ pub const StackTracesContext = struct {
             warn("Test {}/{} {}...", .{ self.test_index + 1, self.context.test_index, self.name });
-            const child = std.ChildProcess.init(args.toSliceConst(), b.allocator) catch unreachable;
+            const child = std.ChildProcess.init(args.span(), b.allocator) catch unreachable;
             defer child.deinit();
             child.stdin_behavior = .Ignore;
 @@ -592,7 +591,7 @@ pub const StackTracesContext = struct {
             child.env_map = b.env_map;
             if (b.verbose) {
-                printInvocation(args.toSliceConst());
+                printInvocation(args.span());
             }
             child.spawn() catch |err| debug.panic("Unable to spawn {}: {}\n", .{ full_exe_path, @errorName(err) });
 @@ -614,23 +613,23 @@ pub const StackTracesContext = struct {
                             code,
                             expect_code,
                         });
-                        printInvocation(args.toSliceConst());
+                        printInvocation(args.span());
                         return error.TestFailed;
                     }
                 },
                 .Signal => |signum| {
                     warn("Process {} terminated on signal {}\n", .{ full_exe_path, signum });
-                    printInvocation(args.toSliceConst());
+                    printInvocation(args.span());
                     return error.TestFailed;
                 },
                 .Stopped => |signum| {
                     warn("Process {} stopped on signal {}\n", .{ full_exe_path, signum });
-                    printInvocation(args.toSliceConst());
+                    printInvocation(args.span());
                     return error.TestFailed;
                 },
                 .Unknown => |code| {
                     warn("Process {} terminated unexpectedly with error code {}\n", .{ full_exe_path, code });
-                    printInvocation(args.toSliceConst());
+                    printInvocation(args.span());
                     return error.TestFailed;
                 },
             }
 @@ -640,7 +639,7 @@ pub const StackTracesContext = struct {
             // - replace address with symbolic string
             // - skip empty lines
             const got: []const u8 = got_result: {
-                var buf = try Buffer.initSize(b.allocator, 0);
+                var buf = ArrayList(u8).init(b.allocator);
                 defer buf.deinit();
                 if (stderr.len != 0 and stderr[stderr.len - 1] == '\n') stderr = stderr[0 .. stderr.len - 1];
                 var it = mem.separate(stderr, "\n");
 @@ -652,21 +651,21 @@ pub const StackTracesContext = struct {
                     var pos: usize = if (std.Target.current.os.tag == .windows) 2 else 0;
                     for (delims) |delim, i| {
                         marks[i] = mem.indexOfPos(u8, line, pos, delim) orelse {
-                            try buf.append(line);
+                            try buf.appendSlice(line);
-                            try buf.append("\n");
+                            try buf.appendSlice("\n");
                             continue :process_lines;
                         };
                         pos = marks[i] + delim.len;
                     }
                     pos = mem.lastIndexOfScalar(u8, line[0..marks[0]], fs.path.sep) orelse {
-                        try buf.append(line);
+                        try buf.appendSlice(line);
-                        try buf.append("\n");
+                        try buf.appendSlice("\n");
                         continue :process_lines;
                     };
-                    try buf.append(line[pos + 1 .. marks[2] + delims[2].len]);
+                    try buf.appendSlice(line[pos + 1 .. marks[2] + delims[2].len]);
-                    try buf.append(" [address]");
+                    try buf.appendSlice(" [address]");
-                    try buf.append(line[marks[3]..]);
+                    try buf.appendSlice(line[marks[3]..]);
-                    try buf.append("\n");
+                    try buf.appendSlice("\n");
                 }
                 break :got_result buf.toOwnedSlice();
             };
 @@ -785,7 +784,7 @@ pub const CompileErrorContext = struct {
             } else {
                 try zig_args.append("build-obj");
             }
-            const root_src_basename = self.case.sources.toSliceConst()[0].filename;
+            const root_src_basename = self.case.sources.span()[0].filename;
             try zig_args.append(self.write_src.getOutputPath(root_src_basename));
             zig_args.append("--name") catch unreachable;
 @@ -809,10 +808,10 @@ pub const CompileErrorContext = struct {
             warn("Test {}/{} {}...", .{ self.test_index + 1, self.context.test_index, self.name });
             if (b.verbose) {
-                printInvocation(zig_args.toSliceConst());
+                printInvocation(zig_args.span());
             }
-            const child = std.ChildProcess.init(zig_args.toSliceConst(), b.allocator) catch unreachable;
+            const child = std.ChildProcess.init(zig_args.span(), b.allocator) catch unreachable;
             defer child.deinit();
             child.env_map = b.env_map;
 @@ -822,11 +821,11 @@ pub const CompileErrorContext = struct {
             child.spawn() catch |err| debug.panic("Unable to spawn {}: {}\n", .{ zig_args.items[0], @errorName(err) });
-            var stdout_buf = Buffer.initNull(b.allocator);
+            var stdout_buf = ArrayList(u8).init(b.allocator);
-            var stderr_buf = Buffer.initNull(b.allocator);
+            var stderr_buf = ArrayList(u8).init(b.allocator);
-            child.stdout.?.inStream().readAllBuffer(&stdout_buf, max_stdout_size) catch unreachable;
+            child.stdout.?.inStream().readAllArrayList(&stdout_buf, max_stdout_size) catch unreachable;
-            child.stderr.?.inStream().readAllBuffer(&stderr_buf, max_stdout_size) catch unreachable;
+            child.stderr.?.inStream().readAllArrayList(&stderr_buf, max_stdout_size) catch unreachable;
             const term = child.wait() catch |err| {
                 debug.panic("Unable to spawn {}: {}\n", .{ zig_args.items[0], @errorName(err) });
 @@ -834,19 +833,19 @@ pub const CompileErrorContext = struct {
             switch (term) {
                 .Exited => |code| {
                     if (code == 0) {
-                        printInvocation(zig_args.toSliceConst());
+                        printInvocation(zig_args.span());
                         return error.CompilationIncorrectlySucceeded;
                     }
                 },
                 else => {
                     warn("Process {} terminated unexpectedly\n", .{b.zig_exe});
-                    printInvocation(zig_args.toSliceConst());
+                    printInvocation(zig_args.span());
                     return error.TestFailed;
                 },
             }
-            const stdout = stdout_buf.toSliceConst();
+            const stdout = stdout_buf.span();
-            const stderr = stderr_buf.toSliceConst();
+            const stderr = stderr_buf.span();
             if (stdout.len != 0) {
                 warn(
 @@ -875,12 +874,12 @@ pub const CompileErrorContext = struct {
                 if (!ok) {
                     warn("\n======== Expected these compile errors: ========\n", .{});
-                    for (self.case.expected_errors.toSliceConst()) |expected| {
+                    for (self.case.expected_errors.span()) |expected| {
                         warn("{}\n", .{expected});
                     }
                 }
             } else {
-                for (self.case.expected_errors.toSliceConst()) |expected| {
+                for (self.case.expected_errors.span()) |expected| {
                     if (mem.indexOf(u8, stderr, expected) == null) {
                         warn(
                             \\
 @@ -980,7 +979,7 @@ pub const CompileErrorContext = struct {
             if (mem.indexOf(u8, annotated_case_name, filter) == null) return;
         }
         const write_src = b.addWriteFiles();
-        for (case.sources.toSliceConst()) |src_file| {
+        for (case.sources.span()) |src_file| {
             write_src.add(src_file.filename, src_file.source);
         }
 @@ -1027,7 +1026,7 @@ pub const StandaloneContext = struct {
             zig_args.append("--verbose") catch unreachable;
         }
-        const run_cmd = b.addSystemCommand(zig_args.toSliceConst());
+        const run_cmd = b.addSystemCommand(zig_args.span());
         const log_step = b.addLog("PASS {}\n", .{annotated_case_name});
         log_step.step.dependOn(&run_cmd.step);
 @@ -1127,7 +1126,7 @@ pub const GenHContext = struct {
             const full_h_path = self.obj.getOutputHPath();
             const actual_h = try io.readFileAlloc(b.allocator, full_h_path);
-            for (self.case.expected_lines.toSliceConst()) |expected_line| {
+            for (self.case.expected_lines.span()) |expected_line| {
                 if (mem.indexOf(u8, actual_h, expected_line) == null) {
                     warn(
                         \\
 @@ -1188,7 +1187,7 @@ pub const GenHContext = struct {
         }
         const write_src = b.addWriteFiles();
-        for (case.sources.toSliceConst()) |src_file| {
+        for (case.sources.span()) |src_file| {
             write_src.add(src_file.filename, src_file.source);
         }

test/translate_c.zig+39

...	@@ -2808,4 +2808,43 @@ pub fn addCases(cases: *tests.TranslateCContext) void {	...	@@ -2808,4 +2808,43 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
2808	\\ return if (x > y) x else y;	2808	\\ return if (x > y) x else y;
2809	\\}	2809	\\}
2810	});	2810	});
		2811
		2812	cases.add("string concatenation in macros",
		2813	\\#define FOO "hello"
		2814	\\#define BAR FOO " world"
		2815	\\#define BAZ "oh, " FOO
		2816	, &[_][]const u8{
		2817	\\pub const FOO = "hello";
		2818	,
		2819	\\pub const BAR = FOO ++ " world";
		2820	,
		2821	\\pub const BAZ = "oh, " ++ FOO;
		2822	});
		2823
		2824	cases.add("string concatenation in macros: two defines",
		2825	\\#define FOO "hello"
		2826	\\#define BAZ " world"
		2827	\\#define BAR FOO BAZ
		2828	, &[_][]const u8{
		2829	\\pub const FOO = "hello";
		2830	,
		2831	\\pub const BAZ = " world";
		2832	,
		2833	\\pub const BAR = FOO ++ BAZ;
		2834	});
		2835
		2836	cases.add("string concatenation in macros: two strings",
		2837	\\#define FOO "a" "b"
		2838	\\#define BAR FOO "c"
		2839	, &[_][]const u8{
		2840	\\pub const FOO = "a" ++ "b";
		2841	,
		2842	\\pub const BAR = FOO ++ "c";
		2843	});
		2844
		2845	cases.add("string concatenation in macros: three strings",
		2846	\\#define FOO "a" "b" "c"
		2847	, &[_][]const u8{
		2848	\\pub const FOO = "a" ++ ("b" ++ "c");
		2849	});
2811	}	2850	}

tools/merge_anal_dumps.zig+12-12

tools/process_headers.zig+4-4

tools/update_clang_options.zig+37-13

 @@ -96,19 +96,19 @@ const known_options = [_]KnownOpt{
     },
     .{
         .name = "E",
-        .ident = "preprocess",
+        .ident = "pp_or_asm",
     },
     .{
         .name = "preprocess",
-        .ident = "preprocess",
+        .ident = "pp_or_asm",
     },
     .{
         .name = "S",
-        .ident = "driver_punt",
+        .ident = "pp_or_asm",
     },
     .{
         .name = "assemble",
-        .ident = "driver_punt",
+        .ident = "pp_or_asm",
     },
     .{
         .name = "O1",
 @@ -175,20 +175,44 @@ const known_options = [_]KnownOpt{
         .ident = "verbose_cmds",
     },
     .{
-        .name = "fexceptions",
+        .name = "L",
-        .ident = "exceptions",
+        .ident = "lib_dir",
+    },
+    .{
+        .name = "library-directory",
+        .ident = "lib_dir",
+    },
+    .{
+        .name = "mcpu",
+        .ident = "mcpu",
+    },
+    .{
+        .name = "march",
+        .ident = "mcpu",
+    },
+    .{
+        .name = "mtune",
+        .ident = "mcpu",
+    },
+    .{
+        .name = "MD",
+        .ident = "dep_file",
+    },
+    .{
+        .name = "MV",
+        .ident = "dep_file",
     },
     .{
-        .name = "fno-exceptions",
+        .name = "MF",
-        .ident = "no_exceptions",
+        .ident = "dep_file",
     },
     .{
-        .name = "frtti",
+        .name = "F",
-        .ident = "rtti",
+        .ident = "framework_dir",
     },
     .{
-        .name = "fno-rtti",
+        .name = "framework",
-        .ident = "no_rtti",
+        .ident = "framework",
     },
 };
 @@ -239,7 +263,7 @@ pub fn main() anyerror!void {
         try std.fmt.allocPrint(allocator, "-I={}/clang/include/clang/Driver", .{llvm_src_root}),
     };
-    const child_result = try std.ChildProcess.exec2(.{
+    const child_result = try std.ChildProcess.exec(.{
         .allocator = allocator,
         .argv = &child_args,
         .max_output_bytes = 100 * 1024 * 1024,

tools/update_glibc.zig+7-7

author	LeRoyce Pearson <leroycepearson@geemili.xyz> 2020-04-02 21:46:48-06:00
committer	LeRoyce Pearson <leroycepearson@geemili.xyz> 2020-04-02 21:46:48-06:00
log	35c462caf0c0763c14d0f1303197c86a63c51f03
tree	46591490be3dcf41f664c411385b62de9b1326d2
parent	457f557c37947af6ce90a82a70e08e59526af0dc
parent	e7f555ca550cc73288adbdf4ec8d0e4abbc7a987

...	@@ -72,7 +72,7 @@ const BinaryElfOutput = struct {	...	@@ -72,7 +72,7 @@ const BinaryElfOutput = struct {
72	newSegment.binaryOffset = 0;	72	newSegment.binaryOffset = 0;
73	newSegment.firstSection = null;	73	newSegment.firstSection = null;
74		74
75	for (self.sections.toSlice()) \|section\| {	75	for (self.sections.span()) \|section\| {
76	if (sectionWithinSegment(section, phdr)) {	76	if (sectionWithinSegment(section, phdr)) {
77	if (section.segment) \|sectionSegment\| {	77	if (section.segment) \|sectionSegment\| {
78	if (sectionSegment.elfOffset > newSegment.elfOffset) {	78	if (sectionSegment.elfOffset > newSegment.elfOffset) {
...	@@ -92,7 +92,7 @@ const BinaryElfOutput = struct {	...	@@ -92,7 +92,7 @@ const BinaryElfOutput = struct {
92	}	92	}
93	}	93	}
94		94
95	sort.sort(*BinaryElfSegment, self.segments.toSlice(), segmentSortCompare);	95	sort.sort(*BinaryElfSegment, self.segments.span(), segmentSortCompare);
96		96
97	if (self.segments.len > 0) {	97	if (self.segments.len > 0) {
98	const firstSegment = self.segments.at(0);	98	const firstSegment = self.segments.at(0);
...	@@ -105,19 +105,19 @@ const BinaryElfOutput = struct {	...	@@ -105,19 +105,19 @@ const BinaryElfOutput = struct {
105		105
106	const basePhysicalAddress = firstSegment.physicalAddress;	106	const basePhysicalAddress = firstSegment.physicalAddress;
107		107
108	for (self.segments.toSlice()) \|segment\| {	108	for (self.segments.span()) \|segment\| {
109	segment.binaryOffset = segment.physicalAddress - basePhysicalAddress;	109	segment.binaryOffset = segment.physicalAddress - basePhysicalAddress;
110	}	110	}
111	}	111	}
112	}	112	}
113		113
114	for (self.sections.toSlice()) \|section\| {	114	for (self.sections.span()) \|section\| {
115	if (section.segment) \|segment\| {	115	if (section.segment) \|segment\| {
116	section.binaryOffset = segment.binaryOffset + (section.elfOffset - segment.elfOffset);	116	section.binaryOffset = segment.binaryOffset + (section.elfOffset - segment.elfOffset);
117	}	117	}
118	}	118	}
119		119
120	sort.sort(*BinaryElfSection, self.sections.toSlice(), sectionSortCompare);	120	sort.sort(*BinaryElfSection, self.sections.span(), sectionSortCompare);
121		121
122	return self;	122	return self;
123	}	123	}
...	@@ -165,7 +165,7 @@ fn emitRaw(allocator: *Allocator, elf_path: []const u8, raw_path: []const u8) !v	...	@@ -165,7 +165,7 @@ fn emitRaw(allocator: *Allocator, elf_path: []const u8, raw_path: []const u8) !v
165	var binary_elf_output = try BinaryElfOutput.parse(allocator, elf_file);	165	var binary_elf_output = try BinaryElfOutput.parse(allocator, elf_file);
166	defer binary_elf_output.deinit();	166	defer binary_elf_output.deinit();
167		167
168	for (binary_elf_output.sections.toSlice()) \|section\| {	168	for (binary_elf_output.sections.span()) \|section\| {
169	try writeBinaryElfSection(elf_file, out_file, section);	169	try writeBinaryElfSection(elf_file, out_file, section);
170	}	170	}
171	}	171	}

...	@@ -82,7 +82,7 @@ const Die = struct {	...	@@ -82,7 +82,7 @@ const Die = struct {
82	};	82	};
83		83
84	fn getAttr(self: const Die, id: u64) ?const FormValue {	84	fn getAttr(self: const Die, id: u64) ?const FormValue {
85	for (self.attrs.toSliceConst()) \|*attr\| {	85	for (self.attrs.span()) \|*attr\| {
86	if (attr.id == id) return &attr.value;	86	if (attr.id == id) return &attr.value;
87	}	87	}
88	return null;	88	return null;
...	@@ -375,7 +375,7 @@ fn parseFormValue(allocator: *mem.Allocator, in_stream: var, form_id: u64, is_64	...	@@ -375,7 +375,7 @@ fn parseFormValue(allocator: *mem.Allocator, in_stream: var, form_id: u64, is_64
375	}	375	}
376		376
377	fn getAbbrevTableEntry(abbrev_table: const AbbrevTable, abbrev_code: u64) ?const AbbrevTableEntry {	377	fn getAbbrevTableEntry(abbrev_table: const AbbrevTable, abbrev_code: u64) ?const AbbrevTableEntry {
378	for (abbrev_table.toSliceConst()) \|*table_entry\| {	378	for (abbrev_table.span()) \|*table_entry\| {
379	if (table_entry.abbrev_code == abbrev_code) return table_entry;	379	if (table_entry.abbrev_code == abbrev_code) return table_entry;
380	}	380	}
381	return null;	381	return null;
...	@@ -399,7 +399,7 @@ pub const DwarfInfo = struct {	...	@@ -399,7 +399,7 @@ pub const DwarfInfo = struct {
399	}	399	}
400		400
401	fn getSymbolName(di: *DwarfInfo, address: u64) ?[]const u8 {	401	fn getSymbolName(di: *DwarfInfo, address: u64) ?[]const u8 {
402	for (di.func_list.toSliceConst()) \|*func\| {	402	for (di.func_list.span()) \|*func\| {
403	if (func.pc_range) \|range\| {	403	if (func.pc_range) \|range\| {
404	if (address >= range.start and address < range.end) {	404	if (address >= range.start and address < range.end) {
405	return func.name;	405	return func.name;
...	@@ -588,7 +588,7 @@ pub const DwarfInfo = struct {	...	@@ -588,7 +588,7 @@ pub const DwarfInfo = struct {
588	}	588	}
589		589
590	fn findCompileUnit(di: DwarfInfo, target_address: u64) !const CompileUnit {	590	fn findCompileUnit(di: DwarfInfo, target_address: u64) !const CompileUnit {
591	for (di.compile_unit_list.toSlice()) \|*compile_unit\| {	591	for (di.compile_unit_list.span()) \|*compile_unit\| {
592	if (compile_unit.pc_range) \|range\| {	592	if (compile_unit.pc_range) \|range\| {
593	if (target_address >= range.start and target_address < range.end) return compile_unit;	593	if (target_address >= range.start and target_address < range.end) return compile_unit;
594	}	594	}
...	@@ -636,7 +636,7 @@ pub const DwarfInfo = struct {	...	@@ -636,7 +636,7 @@ pub const DwarfInfo = struct {
636	/// Gets an already existing AbbrevTable given the abbrev_offset, or if not found,	636	/// Gets an already existing AbbrevTable given the abbrev_offset, or if not found,
637	/// seeks in the stream and parses it.	637	/// seeks in the stream and parses it.
638	fn getAbbrevTable(di: DwarfInfo, abbrev_offset: u64) !const AbbrevTable {	638	fn getAbbrevTable(di: DwarfInfo, abbrev_offset: u64) !const AbbrevTable {
639	for (di.abbrev_table_list.toSlice()) \|*header\| {	639	for (di.abbrev_table_list.span()) \|*header\| {
640	if (header.offset == abbrev_offset) {	640	if (header.offset == abbrev_offset) {
641	return &header.table;	641	return &header.table;
642	}	642	}
...	@@ -690,7 +690,7 @@ pub const DwarfInfo = struct {	...	@@ -690,7 +690,7 @@ pub const DwarfInfo = struct {
690	.attrs = ArrayList(Die.Attr).init(di.allocator()),	690	.attrs = ArrayList(Die.Attr).init(di.allocator()),
691	};	691	};
692	try result.attrs.resize(table_entry.attrs.len);	692	try result.attrs.resize(table_entry.attrs.len);
693	for (table_entry.attrs.toSliceConst()) \|attr, i\| {	693	for (table_entry.attrs.span()) \|attr, i\| {
694	result.attrs.items[i] = Die.Attr{	694	result.attrs.items[i] = Die.Attr{
695	.id = attr.attr_id,	695	.id = attr.attr_id,
696	.value = try parseFormValue(di.allocator(), in_stream, attr.form_id, is_64),	696	.value = try parseFormValue(di.allocator(), in_stream, attr.form_id, is_64),
...	@@ -757,7 +757,7 @@ pub const DwarfInfo = struct {	...	@@ -757,7 +757,7 @@ pub const DwarfInfo = struct {
757	}	757	}
758		758
759	var file_entries = ArrayList(FileEntry).init(di.allocator());	759	var file_entries = ArrayList(FileEntry).init(di.allocator());
760	var prog = LineNumberProgram.init(default_is_stmt, include_directories.toSliceConst(), &file_entries, target_address);	760	var prog = LineNumberProgram.init(default_is_stmt, include_directories.span(), &file_entries, target_address);
761		761
762	while (true) {	762	while (true) {
763	const file_name = try in.readUntilDelimiterAlloc(di.allocator(), 0, math.maxInt(usize));	763	const file_name = try in.readUntilDelimiterAlloc(di.allocator(), 0, math.maxInt(usize));

...	@@ -5,6 +5,7 @@ const assert = std.debug.assert;	...	@@ -5,6 +5,7 @@ const assert = std.debug.assert;
5	const math = std.math;	5	const math = std.math;
6	const meta = std.meta;	6	const meta = std.meta;
7	const trait = meta.trait;	7	const trait = meta.trait;
		8	const testing = std.testing;
8		9
9	pub const Packing = enum {	10	pub const Packing = enum {
10	/// Pack data to byte alignment	11	/// Pack data to byte alignment
...	@@ -273,7 +274,7 @@ pub fn Serializer(comptime endian: builtin.Endian, comptime packing: Packing, co	...	@@ -273,7 +274,7 @@ pub fn Serializer(comptime endian: builtin.Endian, comptime packing: Packing, co
273	if (comptime trait.hasFn("serialize")(T)) return T.serialize(value, self);	274	if (comptime trait.hasFn("serialize")(T)) return T.serialize(value, self);
274		275
275	if (comptime trait.isPacked(T) and packing != .Bit) {	276	if (comptime trait.isPacked(T) and packing != .Bit) {
276	var packed_serializer = Serializer(endian, .Bit, Error).init(self.out_stream);	277	var packed_serializer = Serializer(endian, .Bit, OutStreamType).init(self.out_stream);
277	try packed_serializer.serialize(value);	278	try packed_serializer.serialize(value);
278	try packed_serializer.flush();	279	try packed_serializer.flush();
279	return;	280	return;
...	@@ -364,28 +365,28 @@ fn testIntSerializerDeserializer(comptime endian: builtin.Endian, comptime packi	...	@@ -364,28 +365,28 @@ fn testIntSerializerDeserializer(comptime endian: builtin.Endian, comptime packi
364		365
365	var data_mem: [total_bytes]u8 = undefined;	366	var data_mem: [total_bytes]u8 = undefined;
366	var out = io.fixedBufferStream(&data_mem);	367	var out = io.fixedBufferStream(&data_mem);
367	var serializer = serializer(endian, packing, out.outStream());	368	var _serializer = serializer(endian, packing, out.outStream());
368		369
369	var in = io.fixedBufferStream(&data_mem);	370	var in = io.fixedBufferStream(&data_mem);
370	var deserializer = Deserializer(endian, packing, in.inStream());	371	var _deserializer = deserializer(endian, packing, in.inStream());
371		372
372	comptime var i = 0;	373	comptime var i = 0;
373	inline while (i <= max_test_bitsize) : (i += 1) {	374	inline while (i <= max_test_bitsize) : (i += 1) {
374	const U = std.meta.IntType(false, i);	375	const U = std.meta.IntType(false, i);
375	const S = std.meta.IntType(true, i);	376	const S = std.meta.IntType(true, i);
376	try serializer.serializeInt(@as(U, i));	377	try _serializer.serializeInt(@as(U, i));
377	if (i != 0) try serializer.serializeInt(@as(S, -1)) else try serializer.serialize(@as(S, 0));	378	if (i != 0) try _serializer.serializeInt(@as(S, -1)) else try _serializer.serialize(@as(S, 0));
378	}	379	}
379	try serializer.flush();	380	try _serializer.flush();
380		381
381	i = 0;	382	i = 0;
382	inline while (i <= max_test_bitsize) : (i += 1) {	383	inline while (i <= max_test_bitsize) : (i += 1) {
383	const U = std.meta.IntType(false, i);	384	const U = std.meta.IntType(false, i);
384	const S = std.meta.IntType(true, i);	385	const S = std.meta.IntType(true, i);
385	const x = try deserializer.deserializeInt(U);	386	const x = try _deserializer.deserializeInt(U);
386	const y = try deserializer.deserializeInt(S);	387	const y = try _deserializer.deserializeInt(S);
387	expect(x == @as(U, i));	388	testing.expect(x == @as(U, i));
388	if (i != 0) expect(y == @as(S, -1)) else expect(y == 0);	389	if (i != 0) testing.expect(y == @as(S, -1)) else testing.expect(y == 0);
389	}	390	}
390		391
391	const u8_bit_count = comptime meta.bitCount(u8);	392	const u8_bit_count = comptime meta.bitCount(u8);
...	@@ -395,7 +396,7 @@ fn testIntSerializerDeserializer(comptime endian: builtin.Endian, comptime packi	...	@@ -395,7 +396,7 @@ fn testIntSerializerDeserializer(comptime endian: builtin.Endian, comptime packi
395	const extra_packed_byte = @boolToInt(total_bits % u8_bit_count > 0);	396	const extra_packed_byte = @boolToInt(total_bits % u8_bit_count > 0);
396	const total_packed_bytes = (total_bits / u8_bit_count) + extra_packed_byte;	397	const total_packed_bytes = (total_bits / u8_bit_count) + extra_packed_byte;
397		398
398	expect(in.pos == if (packing == .Bit) total_packed_bytes else total_bytes);	399	testing.expect(in.pos == if (packing == .Bit) total_packed_bytes else total_bytes);
399		400
400	//Verify that empty error set works with serializer.	401	//Verify that empty error set works with serializer.
401	//deserializer is covered by FixedBufferStream	402	//deserializer is covered by FixedBufferStream
...	@@ -421,35 +422,35 @@ fn testIntSerializerDeserializerInfNaN(	...	@@ -421,35 +422,35 @@ fn testIntSerializerDeserializerInfNaN(
421	var data_mem: [mem_size]u8 = undefined;	422	var data_mem: [mem_size]u8 = undefined;
422		423
423	var out = io.fixedBufferStream(&data_mem);	424	var out = io.fixedBufferStream(&data_mem);
424	var serializer = serializer(endian, packing, out.outStream());	425	var _serializer = serializer(endian, packing, out.outStream());
425		426
426	var in = io.fixedBufferStream(&data_mem);	427	var in = io.fixedBufferStream(&data_mem);
427	var deserializer = deserializer(endian, packing, in.inStream());	428	var _deserializer = deserializer(endian, packing, in.inStream());
428		429
429	//@TODO: isInf/isNan not currently implemented for f128.	430	//@TODO: isInf/isNan not currently implemented for f128.
430	try serializer.serialize(std.math.nan(f16));	431	try _serializer.serialize(std.math.nan(f16));
431	try serializer.serialize(std.math.inf(f16));	432	try _serializer.serialize(std.math.inf(f16));
432	try serializer.serialize(std.math.nan(f32));	433	try _serializer.serialize(std.math.nan(f32));
433	try serializer.serialize(std.math.inf(f32));	434	try _serializer.serialize(std.math.inf(f32));
434	try serializer.serialize(std.math.nan(f64));	435	try _serializer.serialize(std.math.nan(f64));
435	try serializer.serialize(std.math.inf(f64));	436	try _serializer.serialize(std.math.inf(f64));
436	//try serializer.serialize(std.math.nan(f128));	437	//try serializer.serialize(std.math.nan(f128));
437	//try serializer.serialize(std.math.inf(f128));	438	//try serializer.serialize(std.math.inf(f128));
438	const nan_check_f16 = try deserializer.deserialize(f16);	439	const nan_check_f16 = try _deserializer.deserialize(f16);
439	const inf_check_f16 = try deserializer.deserialize(f16);	440	const inf_check_f16 = try _deserializer.deserialize(f16);
440	const nan_check_f32 = try deserializer.deserialize(f32);	441	const nan_check_f32 = try _deserializer.deserialize(f32);
441	deserializer.alignToByte();	442	_deserializer.alignToByte();
442	const inf_check_f32 = try deserializer.deserialize(f32);	443	const inf_check_f32 = try _deserializer.deserialize(f32);
443	const nan_check_f64 = try deserializer.deserialize(f64);	444	const nan_check_f64 = try _deserializer.deserialize(f64);
444	const inf_check_f64 = try deserializer.deserialize(f64);	445	const inf_check_f64 = try _deserializer.deserialize(f64);
445	//const nan_check_f128 = try deserializer.deserialize(f128);	446	//const nan_check_f128 = try deserializer.deserialize(f128);
446	//const inf_check_f128 = try deserializer.deserialize(f128);	447	//const inf_check_f128 = try deserializer.deserialize(f128);
447	expect(std.math.isNan(nan_check_f16));	448	testing.expect(std.math.isNan(nan_check_f16));
448	expect(std.math.isInf(inf_check_f16));	449	testing.expect(std.math.isInf(inf_check_f16));
449	expect(std.math.isNan(nan_check_f32));	450	testing.expect(std.math.isNan(nan_check_f32));
450	expect(std.math.isInf(inf_check_f32));	451	testing.expect(std.math.isInf(inf_check_f32));
451	expect(std.math.isNan(nan_check_f64));	452	testing.expect(std.math.isNan(nan_check_f64));
452	expect(std.math.isInf(inf_check_f64));	453	testing.expect(std.math.isInf(inf_check_f64));
453	//expect(std.math.isNan(nan_check_f128));	454	//expect(std.math.isNan(nan_check_f128));
454	//expect(std.math.isInf(inf_check_f128));	455	//expect(std.math.isInf(inf_check_f128));
455	}	456	}
...	@@ -461,8 +462,8 @@ test "Serializer/Deserializer Int: Inf/NaN" {	...	@@ -461,8 +462,8 @@ test "Serializer/Deserializer Int: Inf/NaN" {
461	try testIntSerializerDeserializerInfNaN(.Little, .Bit);	462	try testIntSerializerDeserializerInfNaN(.Little, .Bit);
462	}	463	}
463		464
464	fn testAlternateSerializer(self: var, serializer: var) !void {	465	fn testAlternateSerializer(self: var, _serializer: var) !void {
465	try serializer.serialize(self.f_f16);	466	try _serializer.serialize(self.f_f16);
466	}	467	}
467		468
468	fn testSerializerDeserializer(comptime endian: builtin.Endian, comptime packing: io.Packing) !void {	469	fn testSerializerDeserializer(comptime endian: builtin.Endian, comptime packing: io.Packing) !void {
...	@@ -502,8 +503,8 @@ fn testSerializerDeserializer(comptime endian: builtin.Endian, comptime packing:	...	@@ -502,8 +503,8 @@ fn testSerializerDeserializer(comptime endian: builtin.Endian, comptime packing:
502	f_f16: f16,	503	f_f16: f16,
503	f_unused_u32: u32,	504	f_unused_u32: u32,
504		505
505	pub fn deserialize(self: *@This(), deserializer: var) !void {	506	pub fn deserialize(self: *@This(), _deserializer: var) !void {
506	try deserializer.deserializeInto(&self.f_f16);	507	try _deserializer.deserializeInto(&self.f_f16);
507	self.f_unused_u32 = 47;	508	self.f_unused_u32 = 47;
508	}	509	}
509		510
...	@@ -550,15 +551,15 @@ fn testSerializerDeserializer(comptime endian: builtin.Endian, comptime packing:	...	@@ -550,15 +551,15 @@ fn testSerializerDeserializer(comptime endian: builtin.Endian, comptime packing:
550		551
551	var data_mem: [@sizeOf(MyStruct)]u8 = undefined;	552	var data_mem: [@sizeOf(MyStruct)]u8 = undefined;
552	var out = io.fixedBufferStream(&data_mem);	553	var out = io.fixedBufferStream(&data_mem);
553	var serializer = serializer(endian, packing, out.outStream());	554	var _serializer = serializer(endian, packing, out.outStream());
554		555
555	var in = io.fixedBufferStream(&data_mem);	556	var in = io.fixedBufferStream(&data_mem);
556	var deserializer = deserializer(endian, packing, in.inStream());	557	var _deserializer = deserializer(endian, packing, in.inStream());
557		558
558	try serializer.serialize(my_inst);	559	try _serializer.serialize(my_inst);
559		560
560	const my_copy = try deserializer.deserialize(MyStruct);	561	const my_copy = try _deserializer.deserialize(MyStruct);
561	expect(meta.eql(my_copy, my_inst));	562	testing.expect(meta.eql(my_copy, my_inst));
562	}	563	}
563		564
564	test "Serializer/Deserializer generic" {	565	test "Serializer/Deserializer generic" {
...	@@ -584,18 +585,18 @@ fn testBadData(comptime endian: builtin.Endian, comptime packing: io.Packing) !v	...	@@ -584,18 +585,18 @@ fn testBadData(comptime endian: builtin.Endian, comptime packing: io.Packing) !v
584	};	585	};
585		586
586	var data_mem: [4]u8 = undefined;	587	var data_mem: [4]u8 = undefined;
587	var out = io.fixedBufferStream.init(&data_mem);	588	var out = io.fixedBufferStream(&data_mem);
588	var serializer = serializer(endian, packing, out.outStream());	589	var _serializer = serializer(endian, packing, out.outStream());
589		590
590	var in = io.fixedBufferStream(&data_mem);	591	var in = io.fixedBufferStream(&data_mem);
591	var deserializer = deserializer(endian, packing, in.inStream());	592	var _deserializer = deserializer(endian, packing, in.inStream());
592		593
593	try serializer.serialize(@as(u14, 3));	594	try _serializer.serialize(@as(u14, 3));
594	expectError(error.InvalidEnumTag, deserializer.deserialize(A));	595	testing.expectError(error.InvalidEnumTag, _deserializer.deserialize(A));
595	out.pos = 0;	596	out.pos = 0;
596	try serializer.serialize(@as(u14, 3));	597	try _serializer.serialize(@as(u14, 3));
597	try serializer.serialize(@as(u14, 88));	598	try _serializer.serialize(@as(u14, 88));
598	expectError(error.InvalidEnumTag, deserializer.deserialize(C));	599	testing.expectError(error.InvalidEnumTag, _deserializer.deserialize(C));
599	}	600	}
600		601
601	test "Deserializer bad data" {	602	test "Deserializer bad data" {

...	@@ -22,7 +22,7 @@ pub fn lookup(vername: []const u8, name: []const u8) usize {	...	@@ -22,7 +22,7 @@ pub fn lookup(vername: []const u8, name: []const u8) usize {
22	}) {	22	}) {
23	const this_ph = @intToPtr(*elf.Phdr, ph_addr);	23	const this_ph = @intToPtr(*elf.Phdr, ph_addr);
24	switch (this_ph.p_type) {	24	switch (this_ph.p_type) {
25	// On WSL1 as well as older kernels, the VDSO ELF image is pre-linked in the upper half	25	// On WSL1 as well as older kernels, the VDSO ELF image is pre-linked in the upper half
26	// of the memory space (e.g. p_vaddr = 0xffffffffff700000 on WSL1).	26	// of the memory space (e.g. p_vaddr = 0xffffffffff700000 on WSL1).
27	// Wrapping operations are used on this line as well as subsequent calculations relative to base	27	// Wrapping operations are used on this line as well as subsequent calculations relative to base
28	// (lines 47, 78) to ensure no overflow check is tripped.	28	// (lines 47, 78) to ensure no overflow check is tripped.
...	@@ -70,7 +70,7 @@ pub fn lookup(vername: []const u8, name: []const u8) usize {	...	@@ -70,7 +70,7 @@ pub fn lookup(vername: []const u8, name: []const u8) usize {
70	if (0 == (@as(u32, 1) << @intCast(u5, syms[i].st_info >> 4) & OK_BINDS)) continue;	70	if (0 == (@as(u32, 1) << @intCast(u5, syms[i].st_info >> 4) & OK_BINDS)) continue;
71	if (0 == syms[i].st_shndx) continue;	71	if (0 == syms[i].st_shndx) continue;
72	const sym_name = @ptrCast([*:0]const u8, strings + syms[i].st_name);	72	const sym_name = @ptrCast([*:0]const u8, strings + syms[i].st_name);
73	if (!mem.eql(u8, name, mem.toSliceConst(u8, sym_name))) continue;	73	if (!mem.eql(u8, name, mem.spanZ(sym_name))) continue;
74	if (maybe_versym) \|versym\| {	74	if (maybe_versym) \|versym\| {
75	if (!checkver(maybe_verdef.?, versym[i], vername, strings))	75	if (!checkver(maybe_verdef.?, versym[i], vername, strings))
76	continue;	76	continue;
...	@@ -93,5 +93,5 @@ fn checkver(def_arg: *elf.Verdef, vsym_arg: i32, vername: []const u8, strings: [	...	@@ -93,5 +93,5 @@ fn checkver(def_arg: *elf.Verdef, vsym_arg: i32, vername: []const u8, strings: [
93	}	93	}
94	const aux = @intToPtr(*elf.Verdaux, @ptrToInt(def) + def.vd_aux);	94	const aux = @intToPtr(*elf.Verdaux, @ptrToInt(def) + def.vd_aux);
95	const vda_name = @ptrCast([*:0]const u8, strings + aux.vda_name);	95	const vda_name = @ptrCast([*:0]const u8, strings + aux.vda_name);
96	return mem.eql(u8, vername, mem.toSliceConst(u8, vda_name));	96	return mem.eql(u8, vername, mem.spanZ(vda_name));
97	}	97	}

...	@@ -18,8 +18,8 @@ const AtomicOrder = builtin.AtomicOrder;	...	@@ -18,8 +18,8 @@ const AtomicOrder = builtin.AtomicOrder;
18		18
19	test "makePath, put some files in it, deleteTree" {	19	test "makePath, put some files in it, deleteTree" {
20	try fs.cwd().makePath("os_test_tmp" ++ fs.path.sep_str ++ "b" ++ fs.path.sep_str ++ "c");	20	try fs.cwd().makePath("os_test_tmp" ++ fs.path.sep_str ++ "b" ++ fs.path.sep_str ++ "c");
21	try io.writeFile("os_test_tmp" ++ fs.path.sep_str ++ "b" ++ fs.path.sep_str ++ "c" ++ fs.path.sep_str ++ "file.txt", "nonsense");	21	try fs.cwd().writeFile("os_test_tmp" ++ fs.path.sep_str ++ "b" ++ fs.path.sep_str ++ "c" ++ fs.path.sep_str ++ "file.txt", "nonsense");
22	try io.writeFile("os_test_tmp" ++ fs.path.sep_str ++ "b" ++ fs.path.sep_str ++ "file2.txt", "blah");	22	try fs.cwd().writeFile("os_test_tmp" ++ fs.path.sep_str ++ "b" ++ fs.path.sep_str ++ "file2.txt", "blah");
23	try fs.cwd().deleteTree("os_test_tmp");	23	try fs.cwd().deleteTree("os_test_tmp");
24	if (fs.cwd().openDir("os_test_tmp", .{})) \|dir\| {	24	if (fs.cwd().openDir("os_test_tmp", .{})) \|dir\| {
25	@panic("expected error");	25	@panic("expected error");
...	@@ -36,8 +36,8 @@ test "access file" {	...	@@ -36,8 +36,8 @@ test "access file" {
36	expect(err == error.FileNotFound);	36	expect(err == error.FileNotFound);
37	}	37	}
38		38
39	try io.writeFile("os_test_tmp" ++ fs.path.sep_str ++ "file.txt", "");	39	try fs.cwd().writeFile("os_test_tmp" ++ fs.path.sep_str ++ "file.txt", "");
40	try os.access("os_test_tmp" ++ fs.path.sep_str ++ "file.txt", os.F_OK);	40	try fs.cwd().access("os_test_tmp" ++ fs.path.sep_str ++ "file.txt", .{});
41	try fs.cwd().deleteTree("os_test_tmp");	41	try fs.cwd().deleteTree("os_test_tmp");
42	}	42	}
43		43
...	@@ -65,12 +65,12 @@ test "sendfile" {	...	@@ -65,12 +65,12 @@ test "sendfile" {
65	},	65	},
66	};	66	};
67		67
68	var src_file = try dir.createFileC("sendfile1.txt", .{ .read = true });	68	var src_file = try dir.createFileZ("sendfile1.txt", .{ .read = true });
69	defer src_file.close();	69	defer src_file.close();
70		70
71	try src_file.writevAll(&vecs);	71	try src_file.writevAll(&vecs);
72		72
73	var dest_file = try dir.createFileC("sendfile2.txt", .{ .read = true });	73	var dest_file = try dir.createFileZ("sendfile2.txt", .{ .read = true });
74	defer dest_file.close();	74	defer dest_file.close();
75		75
76	const header1 = "header1\n";	76	const header1 = "header1\n";
...	@@ -192,12 +192,12 @@ test "AtomicFile" {	...	@@ -192,12 +192,12 @@ test "AtomicFile" {
192	\\ this is a test file	192	\\ this is a test file
193	;	193	;
194	{	194	{
195	var af = try fs.AtomicFile.init(test_out_file, File.default_mode);	195	var af = try fs.cwd().atomicFile(test_out_file, .{});
196	defer af.deinit();	196	defer af.deinit();
197	try af.file.writeAll(test_content);	197	try af.file.writeAll(test_content);
198	try af.finish();	198	try af.finish();
199	}	199	}
200	const content = try io.readFileAlloc(testing.allocator, test_out_file);	200	const content = try fs.cwd().readFileAlloc(testing.allocator, test_out_file, 9999);
201	defer testing.allocator.free(content);	201	defer testing.allocator.free(content);
202	expect(mem.eql(u8, content, test_content));	202	expect(mem.eql(u8, content, test_content));
203		203

...	@@ -119,7 +119,7 @@ pub fn OpenFileW(	...	@@ -119,7 +119,7 @@ pub fn OpenFileW(
119		119
120	var result: HANDLE = undefined;	120	var result: HANDLE = undefined;
121		121
122	const path_len_bytes = math.cast(u16, mem.toSliceConst(u16, sub_path_w).len * 2) catch \|err\| switch (err) {	122	const path_len_bytes = math.cast(u16, mem.lenZ(sub_path_w) * 2) catch \|err\| switch (err) {
123	error.Overflow => return error.NameTooLong,	123	error.Overflow => return error.NameTooLong,
124	};	124	};
125	var nt_name = UNICODE_STRING{	125	var nt_name = UNICODE_STRING{
...	@@ -697,7 +697,7 @@ pub fn CreateDirectoryW(	...	@@ -697,7 +697,7 @@ pub fn CreateDirectoryW(
697	sub_path_w: [*:0]const u16,	697	sub_path_w: [*:0]const u16,
698	sa: ?*SECURITY_ATTRIBUTES,	698	sa: ?*SECURITY_ATTRIBUTES,
699	) CreateDirectoryError!HANDLE {	699	) CreateDirectoryError!HANDLE {
700	const path_len_bytes = math.cast(u16, mem.toSliceConst(u16, sub_path_w).len * 2) catch \|err\| switch (err) {	700	const path_len_bytes = math.cast(u16, mem.lenZ(sub_path_w) * 2) catch \|err\| switch (err) {
701	error.Overflow => return error.NameTooLong,	701	error.Overflow => return error.NameTooLong,
702	};	702	};
703	var nt_name = UNICODE_STRING{	703	var nt_name = UNICODE_STRING{
...	@@ -905,7 +905,7 @@ pub fn WSAStartup(majorVersion: u8, minorVersion: u8) !ws2_32.WSADATA {	...	@@ -905,7 +905,7 @@ pub fn WSAStartup(majorVersion: u8, minorVersion: u8) !ws2_32.WSADATA {
905	var wsadata: ws2_32.WSADATA = undefined;	905	var wsadata: ws2_32.WSADATA = undefined;
906	return switch (ws2_32.WSAStartup((@as(WORD, minorVersion) << 8) \| majorVersion, &wsadata)) {	906	return switch (ws2_32.WSAStartup((@as(WORD, minorVersion) << 8) \| majorVersion, &wsadata)) {
907	0 => wsadata,	907	0 => wsadata,
908	else => \|err\| unexpectedWSAError(@intToEnum(WinsockError, err)),	908	else => \|err\| unexpectedWSAError(@intToEnum(ws2_32.WinsockError, @intCast(u16, err))),
909	};	909	};
910	}	910	}
911		911
...	@@ -1226,7 +1226,7 @@ pub fn nanoSecondsToFileTime(ns: i64) FILETIME {	...	@@ -1226,7 +1226,7 @@ pub fn nanoSecondsToFileTime(ns: i64) FILETIME {
1226	}	1226	}
1227		1227
1228	pub fn cStrToPrefixedFileW(s: [*:0]const u8) ![PATH_MAX_WIDE:0]u16 {	1228	pub fn cStrToPrefixedFileW(s: [*:0]const u8) ![PATH_MAX_WIDE:0]u16 {
1229	return sliceToPrefixedFileW(mem.toSliceConst(u8, s));	1229	return sliceToPrefixedFileW(mem.spanZ(s));
1230	}	1230	}
1231		1231
1232	pub fn sliceToPrefixedFileW(s: []const u8) ![PATH_MAX_WIDE:0]u16 {	1232	pub fn sliceToPrefixedFileW(s: []const u8) ![PATH_MAX_WIDE:0]u16 {
...	@@ -1304,7 +1304,7 @@ pub fn unexpectedError(err: Win32Error) std.os.UnexpectedError {	...	@@ -1304,7 +1304,7 @@ pub fn unexpectedError(err: Win32Error) std.os.UnexpectedError {
1304	return error.Unexpected;	1304	return error.Unexpected;
1305	}	1305	}
1306		1306
1307	pub fn unexpectedWSAError(err: WinsockError) std.os.UnexpectedError {	1307	pub fn unexpectedWSAError(err: ws2_32.WinsockError) std.os.UnexpectedError {
1308	return unexpectedError(@intToEnum(Win32Error, @enumToInt(err)));	1308	return unexpectedError(@intToEnum(Win32Error, @enumToInt(err)));
1309	}	1309	}
1310		1310

...	@@ -59,7 +59,7 @@ pub const Random = struct {	...	@@ -59,7 +59,7 @@ pub const Random = struct {
59	return @bitCast(T, unsigned_result);	59	return @bitCast(T, unsigned_result);
60	}	60	}
61		61
62	/// Constant-time implementation off ::uintLessThan.	62	/// Constant-time implementation off `uintLessThan`.
63	/// The results of this function may be biased.	63	/// The results of this function may be biased.
64	pub fn uintLessThanBiased(r: *Random, comptime T: type, less_than: T) T {	64	pub fn uintLessThanBiased(r: *Random, comptime T: type, less_than: T) T {
65	comptime assert(T.is_signed == false);	65	comptime assert(T.is_signed == false);
...	@@ -73,13 +73,13 @@ pub const Random = struct {	...	@@ -73,13 +73,13 @@ pub const Random = struct {
73	}	73	}
74		74
75	/// Returns an evenly distributed random unsigned integer `0 <= i < less_than`.	75	/// Returns an evenly distributed random unsigned integer `0 <= i < less_than`.
76	/// This function assumes that the underlying ::fillFn produces evenly distributed values.	76	/// This function assumes that the underlying `fillFn` produces evenly distributed values.
77	/// Within this assumption, the runtime of this function is exponentially distributed.	77	/// Within this assumption, the runtime of this function is exponentially distributed.
78	/// If ::fillFn were backed by a true random generator,	78	/// If `fillFn` were backed by a true random generator,
79	/// the runtime of this function would technically be unbounded.	79	/// the runtime of this function would technically be unbounded.
80	/// However, if ::fillFn is backed by any evenly distributed pseudo random number generator,	80	/// However, if `fillFn` is backed by any evenly distributed pseudo random number generator,
81	/// this function is guaranteed to return.	81	/// this function is guaranteed to return.
82	/// If you need deterministic runtime bounds, use `::uintLessThanBiased`.	82	/// If you need deterministic runtime bounds, use `uintLessThanBiased`.
83	pub fn uintLessThan(r: *Random, comptime T: type, less_than: T) T {	83	pub fn uintLessThan(r: *Random, comptime T: type, less_than: T) T {
84	comptime assert(T.is_signed == false);	84	comptime assert(T.is_signed == false);
85	comptime assert(T.bit_count <= 64); // TODO: workaround: LLVM ERROR: Unsupported library call operation!	85	comptime assert(T.bit_count <= 64); // TODO: workaround: LLVM ERROR: Unsupported library call operation!
...	@@ -116,7 +116,7 @@ pub const Random = struct {	...	@@ -116,7 +116,7 @@ pub const Random = struct {
116	return @intCast(T, m >> Small.bit_count);	116	return @intCast(T, m >> Small.bit_count);
117	}	117	}
118		118
119	/// Constant-time implementation off ::uintAtMost.	119	/// Constant-time implementation off `uintAtMost`.
120	/// The results of this function may be biased.	120	/// The results of this function may be biased.
121	pub fn uintAtMostBiased(r: *Random, comptime T: type, at_most: T) T {	121	pub fn uintAtMostBiased(r: *Random, comptime T: type, at_most: T) T {
122	assert(T.is_signed == false);	122	assert(T.is_signed == false);
...	@@ -128,7 +128,7 @@ pub const Random = struct {	...	@@ -128,7 +128,7 @@ pub const Random = struct {
128	}	128	}
129		129
130	/// Returns an evenly distributed random unsigned integer `0 <= i <= at_most`.	130	/// Returns an evenly distributed random unsigned integer `0 <= i <= at_most`.
131	/// See ::uintLessThan, which this function uses in most cases,	131	/// See `uintLessThan`, which this function uses in most cases,
132	/// for commentary on the runtime of this function.	132	/// for commentary on the runtime of this function.
133	pub fn uintAtMost(r: *Random, comptime T: type, at_most: T) T {	133	pub fn uintAtMost(r: *Random, comptime T: type, at_most: T) T {
134	assert(T.is_signed == false);	134	assert(T.is_signed == false);
...	@@ -139,7 +139,7 @@ pub const Random = struct {	...	@@ -139,7 +139,7 @@ pub const Random = struct {
139	return r.uintLessThan(T, at_most + 1);	139	return r.uintLessThan(T, at_most + 1);
140	}	140	}
141		141
142	/// Constant-time implementation off ::intRangeLessThan.	142	/// Constant-time implementation off `intRangeLessThan`.
143	/// The results of this function may be biased.	143	/// The results of this function may be biased.
144	pub fn intRangeLessThanBiased(r: *Random, comptime T: type, at_least: T, less_than: T) T {	144	pub fn intRangeLessThanBiased(r: *Random, comptime T: type, at_least: T, less_than: T) T {
145	assert(at_least < less_than);	145	assert(at_least < less_than);
...	@@ -157,7 +157,7 @@ pub const Random = struct {	...	@@ -157,7 +157,7 @@ pub const Random = struct {
157	}	157	}
158		158
159	/// Returns an evenly distributed random integer `at_least <= i < less_than`.	159	/// Returns an evenly distributed random integer `at_least <= i < less_than`.
160	/// See ::uintLessThan, which this function uses in most cases,	160	/// See `uintLessThan`, which this function uses in most cases,
161	/// for commentary on the runtime of this function.	161	/// for commentary on the runtime of this function.
162	pub fn intRangeLessThan(r: *Random, comptime T: type, at_least: T, less_than: T) T {	162	pub fn intRangeLessThan(r: *Random, comptime T: type, at_least: T, less_than: T) T {
163	assert(at_least < less_than);	163	assert(at_least < less_than);
...	@@ -174,7 +174,7 @@ pub const Random = struct {	...	@@ -174,7 +174,7 @@ pub const Random = struct {
174	}	174	}
175	}	175	}
176		176
177	/// Constant-time implementation off ::intRangeAtMostBiased.	177	/// Constant-time implementation off `intRangeAtMostBiased`.
178	/// The results of this function may be biased.	178	/// The results of this function may be biased.
179	pub fn intRangeAtMostBiased(r: *Random, comptime T: type, at_least: T, at_most: T) T {	179	pub fn intRangeAtMostBiased(r: *Random, comptime T: type, at_least: T, at_most: T) T {
180	assert(at_least <= at_most);	180	assert(at_least <= at_most);
...	@@ -192,7 +192,7 @@ pub const Random = struct {	...	@@ -192,7 +192,7 @@ pub const Random = struct {
192	}	192	}
193		193
194	/// Returns an evenly distributed random integer `at_least <= i <= at_most`.	194	/// Returns an evenly distributed random integer `at_least <= i <= at_most`.
195	/// See ::uintLessThan, which this function uses in most cases,	195	/// See `uintLessThan`, which this function uses in most cases,
196	/// for commentary on the runtime of this function.	196	/// for commentary on the runtime of this function.
197	pub fn intRangeAtMost(r: *Random, comptime T: type, at_least: T, at_most: T) T {	197	pub fn intRangeAtMost(r: *Random, comptime T: type, at_least: T, at_most: T) T {
198	assert(at_least <= at_most);	198	assert(at_least <= at_most);
...	@@ -209,15 +209,9 @@ pub const Random = struct {	...	@@ -209,15 +209,9 @@ pub const Random = struct {
209	}	209	}
210	}	210	}
211		211
212	/// TODO: deprecated. use ::boolean or ::int instead.	212	pub const scalar = @compileError("deprecated; use boolean() or int() instead");
213	pub fn scalar(r: *Random, comptime T: type) T {
214	return if (T == bool) r.boolean() else r.int(T);
215	}
216		213
217	/// TODO: deprecated. renamed to ::intRangeLessThan	214	pub const range = @compileError("deprecated; use intRangeLessThan()");
218	pub fn range(r: *Random, comptime T: type, start: T, end: T) T {
219	return r.intRangeLessThan(T, start, end);
220	}
221		215
222	/// Return a floating point value evenly distributed in the range [0, 1).	216	/// Return a floating point value evenly distributed in the range [0, 1).
223	pub fn float(r: *Random, comptime T: type) T {	217	pub fn float(r: *Random, comptime T: type) T {

...	@@ -116,7 +116,7 @@ pub fn main() !void {	...	@@ -116,7 +116,7 @@ pub fn main() !void {
116	if (builder.validateUserInputDidItFail())	116	if (builder.validateUserInputDidItFail())
117	return usageAndErr(builder, true, stderr_stream);	117	return usageAndErr(builder, true, stderr_stream);
118		118
119	builder.make(targets.toSliceConst()) catch \|err\| {	119	builder.make(targets.span()) catch \|err\| {
120	switch (err) {	120	switch (err) {
121	error.InvalidStepName => {	121	error.InvalidStepName => {
122	return usageAndErr(builder, true, stderr_stream);	122	return usageAndErr(builder, true, stderr_stream);
...	@@ -151,7 +151,7 @@ fn usage(builder: *Builder, already_ran_build: bool, out_stream: var) !void {	...	@@ -151,7 +151,7 @@ fn usage(builder: *Builder, already_ran_build: bool, out_stream: var) !void {
151	, .{builder.zig_exe});	151	, .{builder.zig_exe});
152		152
153	const allocator = builder.allocator;	153	const allocator = builder.allocator;
154	for (builder.top_level_steps.toSliceConst()) \|top_level_step\| {	154	for (builder.top_level_steps.span()) \|top_level_step\| {
155	const name = if (&top_level_step.step == builder.default_step)	155	const name = if (&top_level_step.step == builder.default_step)
156	try fmt.allocPrint(allocator, "{} (default)", .{top_level_step.step.name})	156	try fmt.allocPrint(allocator, "{} (default)", .{top_level_step.step.name})
157	else	157	else
...	@@ -174,7 +174,7 @@ fn usage(builder: *Builder, already_ran_build: bool, out_stream: var) !void {	...	@@ -174,7 +174,7 @@ fn usage(builder: *Builder, already_ran_build: bool, out_stream: var) !void {
174	if (builder.available_options_list.len == 0) {	174	if (builder.available_options_list.len == 0) {
175	try out_stream.print(" (none)\n", .{});	175	try out_stream.print(" (none)\n", .{});
176	} else {	176	} else {
177	for (builder.available_options_list.toSliceConst()) \|option\| {	177	for (builder.available_options_list.span()) \|option\| {
178	const name = try fmt.allocPrint(allocator, " -D{}=[{}]", .{	178	const name = try fmt.allocPrint(allocator, " -D{}=[{}]", .{
179	option.name,	179	option.name,
180	Builder.typeIdName(option.type_id),	180	Builder.typeIdName(option.type_id),

...	@@ -495,17 +495,19 @@ pub const CrossTarget = struct {	...	@@ -495,17 +495,19 @@ pub const CrossTarget = struct {
495	return self.isNativeCpu() and self.isNativeOs() and self.abi == null;	495	return self.isNativeCpu() and self.isNativeOs() and self.abi == null;
496	}	496	}
497		497
498	pub fn zigTriple(self: CrossTarget, allocator: *mem.Allocator) error{OutOfMemory}![:0]u8 {	498	pub fn zigTriple(self: CrossTarget, allocator: *mem.Allocator) error{OutOfMemory}![]u8 {
499	if (self.isNative()) {	499	if (self.isNative()) {
500	return mem.dupeZ(allocator, u8, "native");	500	return mem.dupe(allocator, u8, "native");
501	}	501	}
502		502
503	const arch_name = if (self.cpu_arch) \|arch\| @tagName(arch) else "native";	503	const arch_name = if (self.cpu_arch) \|arch\| @tagName(arch) else "native";
504	const os_name = if (self.os_tag) \|os_tag\| @tagName(os_tag) else "native";	504	const os_name = if (self.os_tag) \|os_tag\| @tagName(os_tag) else "native";
505		505
506	var result = try std.Buffer.allocPrint(allocator, "{}-{}", .{ arch_name, os_name });	506	var result = std.ArrayList(u8).init(allocator);
507	defer result.deinit();	507	defer result.deinit();
508		508
		509	try result.outStream().print("{}-{}", .{ arch_name, os_name });
		510
509	// The zig target syntax does not allow specifying a max os version with no min, so	511	// The zig target syntax does not allow specifying a max os version with no min, so
510	// if either are present, we need the min.	512	// if either are present, we need the min.
511	if (self.os_version_min != null or self.os_version_max != null) {	513	if (self.os_version_min != null or self.os_version_max != null) {
...	@@ -532,13 +534,13 @@ pub const CrossTarget = struct {	...	@@ -532,13 +534,13 @@ pub const CrossTarget = struct {
532	return result.toOwnedSlice();	534	return result.toOwnedSlice();
533	}	535	}
534		536
535	pub fn allocDescription(self: CrossTarget, allocator: *mem.Allocator) ![:0]u8 {	537	pub fn allocDescription(self: CrossTarget, allocator: *mem.Allocator) ![]u8 {
536	// TODO is there anything else worthy of the description that is not	538	// TODO is there anything else worthy of the description that is not
537	// already captured in the triple?	539	// already captured in the triple?
538	return self.zigTriple(allocator);	540	return self.zigTriple(allocator);
539	}	541	}
540		542
541	pub fn linuxTriple(self: CrossTarget, allocator: *mem.Allocator) ![:0]u8 {	543	pub fn linuxTriple(self: CrossTarget, allocator: *mem.Allocator) ![]u8 {
542	return Target.linuxTripleSimple(allocator, self.getCpuArch(), self.getOsTag(), self.getAbi());	544	return Target.linuxTripleSimple(allocator, self.getCpuArch(), self.getOsTag(), self.getAbi());
543	}	545	}
544		546
...	@@ -549,7 +551,7 @@ pub const CrossTarget = struct {	...	@@ -549,7 +551,7 @@ pub const CrossTarget = struct {
549	pub const VcpkgLinkage = std.builtin.LinkMode;	551	pub const VcpkgLinkage = std.builtin.LinkMode;
550		552
551	/// Returned slice must be freed by the caller.	553	/// Returned slice must be freed by the caller.
552	pub fn vcpkgTriplet(self: CrossTarget, allocator: *mem.Allocator, linkage: VcpkgLinkage) ![:0]u8 {	554	pub fn vcpkgTriplet(self: CrossTarget, allocator: *mem.Allocator, linkage: VcpkgLinkage) ![]u8 {
553	const arch = switch (self.getCpuArch()) {	555	const arch = switch (self.getCpuArch()) {
554	.i386 => "x86",	556	.i386 => "x86",
555	.x86_64 => "x64",	557	.x86_64 => "x64",
...	@@ -580,7 +582,7 @@ pub const CrossTarget = struct {	...	@@ -580,7 +582,7 @@ pub const CrossTarget = struct {
580	.Dynamic => "",	582	.Dynamic => "",
581	};	583	};
582		584
583	return std.fmt.allocPrint0(allocator, "{}-{}{}", .{ arch, os, static_suffix });	585	return std.fmt.allocPrint(allocator, "{}-{}{}", .{ arch, os, static_suffix });
584	}	586	}
585		587
586	pub const Executor = union(enum) {	588	pub const Executor = union(enum) {
...	@@ -763,7 +765,15 @@ test "CrossTarget.parse" {	...	@@ -763,7 +765,15 @@ test "CrossTarget.parse" {
763		765
764	const text = try cross_target.zigTriple(std.testing.allocator);	766	const text = try cross_target.zigTriple(std.testing.allocator);
765	defer std.testing.allocator.free(text);	767	defer std.testing.allocator.free(text);
766	std.testing.expectEqualSlices(u8, "native-native-gnu.2.1.1", text);	768
		769	var buf: [256]u8 = undefined;
		770	const triple = std.fmt.bufPrint(
		771	buf[0..],
		772	"native-native-{}.2.1.1",
		773	.{@tagName(std.Target.current.abi)},
		774	) catch unreachable;
		775
		776	std.testing.expectEqualSlices(u8, triple, text);
767	}	777	}
768	{	778	{
769	const cross_target = try CrossTarget.parse(.{	779	const cross_target = try CrossTarget.parse(.{

...	@@ -119,7 +119,7 @@ pub const NativePaths = struct {	...	@@ -119,7 +119,7 @@ pub const NativePaths = struct {
119	}	119	}
120		120
121	fn deinitArray(array: *ArrayList([:0]u8)) void {	121	fn deinitArray(array: *ArrayList([:0]u8)) void {
122	for (array.toSlice()) \|item\| {	122	for (array.span()) \|item\| {
123	array.allocator.free(item);	123	array.allocator.free(item);
124	}	124	}
125	array.deinit();	125	array.deinit();
...	@@ -201,7 +201,7 @@ pub const NativeTargetInfo = struct {	...	@@ -201,7 +201,7 @@ pub const NativeTargetInfo = struct {
201	switch (Target.current.os.tag) {	201	switch (Target.current.os.tag) {
202	.linux => {	202	.linux => {
203	const uts = std.os.uname();	203	const uts = std.os.uname();
204	const release = mem.toSliceConst(u8, &uts.release);	204	const release = mem.spanZ(&uts.release);
205	// The release field may have several other fields after the	205	// The release field may have several other fields after the
206	// kernel version	206	// kernel version
207	const kernel_version = if (mem.indexOfScalar(u8, release, '-')) \|pos\|	207	const kernel_version = if (mem.indexOfScalar(u8, release, '-')) \|pos\|
...	@@ -265,7 +265,7 @@ pub const NativeTargetInfo = struct {	...	@@ -265,7 +265,7 @@ pub const NativeTargetInfo = struct {
265	// The osproductversion sysctl was introduced first with	265	// The osproductversion sysctl was introduced first with
266	// High Sierra, thankfully that's also the baseline that Zig	266	// High Sierra, thankfully that's also the baseline that Zig
267	// supports	267	// supports
268	std.os.sysctlbynameC(	268	std.os.sysctlbynameZ(
269	"kern.osproductversion",	269	"kern.osproductversion",
270	&product_version,	270	&product_version,
271	&size,	271	&size,
...	@@ -460,7 +460,7 @@ pub const NativeTargetInfo = struct {	...	@@ -460,7 +460,7 @@ pub const NativeTargetInfo = struct {
460	return result;	460	return result;
461	}	461	}
462		462
463	const env_file = std.fs.openFileAbsoluteC("/usr/bin/env", .{}) catch \|err\| switch (err) {	463	const env_file = std.fs.openFileAbsoluteZ("/usr/bin/env", .{}) catch \|err\| switch (err) {
464	error.NoSpaceLeft => unreachable,	464	error.NoSpaceLeft => unreachable,
465	error.NameTooLong => unreachable,	465	error.NameTooLong => unreachable,
466	error.PathAlreadyExists => unreachable,	466	error.PathAlreadyExists => unreachable,
...	@@ -515,7 +515,7 @@ pub const NativeTargetInfo = struct {	...	@@ -515,7 +515,7 @@ pub const NativeTargetInfo = struct {
515		515
516	fn glibcVerFromSO(so_path: [:0]const u8) !std.builtin.Version {	516	fn glibcVerFromSO(so_path: [:0]const u8) !std.builtin.Version {
517	var link_buf: [std.os.PATH_MAX]u8 = undefined;	517	var link_buf: [std.os.PATH_MAX]u8 = undefined;
518	const link_name = std.os.readlinkC(so_path.ptr, &link_buf) catch \|err\| switch (err) {	518	const link_name = std.os.readlinkZ(so_path.ptr, &link_buf) catch \|err\| switch (err) {
519	error.AccessDenied => return error.GnuLibCVersionUnavailable,	519	error.AccessDenied => return error.GnuLibCVersionUnavailable,
520	error.FileSystem => return error.FileSystem,	520	error.FileSystem => return error.FileSystem,
521	error.SymLinkLoop => return error.SymLinkLoop,	521	error.SymLinkLoop => return error.SymLinkLoop,
...	@@ -625,9 +625,10 @@ pub const NativeTargetInfo = struct {	...	@@ -625,9 +625,10 @@ pub const NativeTargetInfo = struct {
625	const p_offset = elfInt(is_64, need_bswap, ph32.p_offset, ph64.p_offset);	625	const p_offset = elfInt(is_64, need_bswap, ph32.p_offset, ph64.p_offset);
626	const p_filesz = elfInt(is_64, need_bswap, ph32.p_filesz, ph64.p_filesz);	626	const p_filesz = elfInt(is_64, need_bswap, ph32.p_filesz, ph64.p_filesz);
627	if (p_filesz > result.dynamic_linker.buffer.len) return error.NameTooLong;	627	if (p_filesz > result.dynamic_linker.buffer.len) return error.NameTooLong;
628	_ = try preadMin(file, result.dynamic_linker.buffer[0..p_filesz], p_offset, p_filesz);	628	const filesz = @intCast(usize, p_filesz);
629	// PT_INTERP includes a null byte in p_filesz.	629	_ = try preadMin(file, result.dynamic_linker.buffer[0..filesz], p_offset, filesz);
630	const len = p_filesz - 1;	630	// PT_INTERP includes a null byte in filesz.
		631	const len = filesz - 1;
631	// dynamic_linker.max_byte is "max", not "len".	632	// dynamic_linker.max_byte is "max", not "len".
632	// We know it will fit in u8 because we check against dynamic_linker.buffer.len above.	633	// We know it will fit in u8 because we check against dynamic_linker.buffer.len above.
633	result.dynamic_linker.max_byte = @intCast(u8, len - 1);	634	result.dynamic_linker.max_byte = @intCast(u8, len - 1);
...	@@ -648,7 +649,7 @@ pub const NativeTargetInfo = struct {	...	@@ -648,7 +649,7 @@ pub const NativeTargetInfo = struct {
648	{	649	{
649	var dyn_off = elfInt(is_64, need_bswap, ph32.p_offset, ph64.p_offset);	650	var dyn_off = elfInt(is_64, need_bswap, ph32.p_offset, ph64.p_offset);
650	const p_filesz = elfInt(is_64, need_bswap, ph32.p_filesz, ph64.p_filesz);	651	const p_filesz = elfInt(is_64, need_bswap, ph32.p_filesz, ph64.p_filesz);
651	const dyn_size: u64 = if (is_64) @sizeOf(elf.Elf64_Dyn) else @sizeOf(elf.Elf32_Dyn);	652	const dyn_size: usize = if (is_64) @sizeOf(elf.Elf64_Dyn) else @sizeOf(elf.Elf32_Dyn);
652	const dyn_num = p_filesz / dyn_size;	653	const dyn_num = p_filesz / dyn_size;
653	var dyn_buf: [16 * @sizeOf(elf.Elf64_Dyn)]u8 align(@alignOf(elf.Elf64_Dyn)) = undefined;	654	var dyn_buf: [16 * @sizeOf(elf.Elf64_Dyn)]u8 align(@alignOf(elf.Elf64_Dyn)) = undefined;
654	var dyn_i: usize = 0;	655	var dyn_i: usize = 0;
...	@@ -739,7 +740,7 @@ pub const NativeTargetInfo = struct {	...	@@ -739,7 +740,7 @@ pub const NativeTargetInfo = struct {
739	);	740	);
740	const sh_name_off = elfInt(is_64, need_bswap, sh32.sh_name, sh64.sh_name);	741	const sh_name_off = elfInt(is_64, need_bswap, sh32.sh_name, sh64.sh_name);
741	// TODO this pointer cast should not be necessary	742	// TODO this pointer cast should not be necessary
742	const sh_name = mem.toSliceConst(u8, @ptrCast([*:0]u8, shstrtab[sh_name_off..].ptr));	743	const sh_name = mem.spanZ(@ptrCast([*:0]u8, shstrtab[sh_name_off..].ptr));
743	if (mem.eql(u8, sh_name, ".dynstr")) {	744	if (mem.eql(u8, sh_name, ".dynstr")) {
744	break :find_dyn_str .{	745	break :find_dyn_str .{
745	.offset = elfInt(is_64, need_bswap, sh32.sh_offset, sh64.sh_offset),	746	.offset = elfInt(is_64, need_bswap, sh32.sh_offset, sh64.sh_offset),
...	@@ -754,7 +755,10 @@ pub const NativeTargetInfo = struct {	...	@@ -754,7 +755,10 @@ pub const NativeTargetInfo = struct {
754	const strtab_read_len = try preadMin(file, &strtab_buf, ds.offset, shstrtab_len);	755	const strtab_read_len = try preadMin(file, &strtab_buf, ds.offset, shstrtab_len);
755	const strtab = strtab_buf[0..strtab_read_len];	756	const strtab = strtab_buf[0..strtab_read_len];
756	// TODO this pointer cast should not be necessary	757	// TODO this pointer cast should not be necessary
757	const rpath_list = mem.toSliceConst(u8, @ptrCast([*:0]u8, strtab[rpoff..].ptr));	758	const rpoff_usize = std.math.cast(usize, rpoff) catch \|err\| switch (err) {
		759	error.Overflow => return error.InvalidElfFile,
		760	};
		761	const rpath_list = mem.spanZ(@ptrCast([*:0]u8, strtab[rpoff_usize..].ptr));
758	var it = mem.tokenize(rpath_list, ":");	762	var it = mem.tokenize(rpath_list, ":");
759	while (it.next()) \|rpath\| {	763	while (it.next()) \|rpath\| {
760	var dir = fs.cwd().openDir(rpath, .{}) catch \|err\| switch (err) {	764	var dir = fs.cwd().openDir(rpath, .{}) catch \|err\| switch (err) {
...	@@ -779,7 +783,7 @@ pub const NativeTargetInfo = struct {	...	@@ -779,7 +783,7 @@ pub const NativeTargetInfo = struct {
779	defer dir.close();	783	defer dir.close();
780		784
781	var link_buf: [std.os.PATH_MAX]u8 = undefined;	785	var link_buf: [std.os.PATH_MAX]u8 = undefined;
782	const link_name = std.os.readlinkatC(	786	const link_name = std.os.readlinkatZ(
783	dir.fd,	787	dir.fd,
784	glibc_so_basename,	788	glibc_so_basename,
785	&link_buf,	789	&link_buf,
...	@@ -814,7 +818,7 @@ pub const NativeTargetInfo = struct {	...	@@ -814,7 +818,7 @@ pub const NativeTargetInfo = struct {
814	}	818	}
815		819
816	fn preadMin(file: fs.File, buf: []u8, offset: u64, min_read_len: usize) !usize {	820	fn preadMin(file: fs.File, buf: []u8, offset: u64, min_read_len: usize) !usize {
817	var i: u64 = 0;	821	var i: usize = 0;
818	while (i < min_read_len) {	822	while (i < min_read_len) {
819	const len = file.pread(buf[i .. buf.len - i], offset + i) catch \|err\| switch (err) {	823	const len = file.pread(buf[i .. buf.len - i], offset + i) catch \|err\| switch (err) {
820	error.OperationAborted => unreachable, // Windows-only	824	error.OperationAborted => unreachable, // Windows-only

...	@@ -25,10 +25,10 @@ pub async fn renderToLlvm(comp: Compilation, fn_val: Value.Fn, code: *ir.Code)	...	@@ -25,10 +25,10 @@ pub async fn renderToLlvm(comp: Compilation, fn_val: Value.Fn, code: *ir.Code)
25		25
26	const context = llvm_handle.node.data;	26	const context = llvm_handle.node.data;
27		27
28	const module = llvm.ModuleCreateWithNameInContext(comp.name.toSliceConst(), context) orelse return error.OutOfMemory;	28	const module = llvm.ModuleCreateWithNameInContext(comp.name.span(), context) orelse return error.OutOfMemory;
29	defer llvm.DisposeModule(module);	29	defer llvm.DisposeModule(module);
30		30
31	llvm.SetTarget(module, comp.llvm_triple.toSliceConst());	31	llvm.SetTarget(module, comp.llvm_triple.span());
32	llvm.SetDataLayout(module, comp.target_layout_str);	32	llvm.SetDataLayout(module, comp.target_layout_str);
33		33
34	if (comp.target.getObjectFormat() == .coff) {	34	if (comp.target.getObjectFormat() == .coff) {
...	@@ -45,7 +45,7 @@ pub async fn renderToLlvm(comp: Compilation, fn_val: Value.Fn, code: *ir.Code)	...	@@ -45,7 +45,7 @@ pub async fn renderToLlvm(comp: Compilation, fn_val: Value.Fn, code: *ir.Code)
45		45
46	// Don't use ZIG_VERSION_STRING here. LLVM misparses it when it includes	46	// Don't use ZIG_VERSION_STRING here. LLVM misparses it when it includes
47	// the git revision.	47	// the git revision.
48	const producer = try std.Buffer.allocPrint(&code.arena.allocator, "zig {}.{}.{}", .{	48	const producer = try std.fmt.allocPrintZ(&code.arena.allocator, "zig {}.{}.{}", .{
49	@as(u32, c.ZIG_VERSION_MAJOR),	49	@as(u32, c.ZIG_VERSION_MAJOR),
50	@as(u32, c.ZIG_VERSION_MINOR),	50	@as(u32, c.ZIG_VERSION_MINOR),
51	@as(u32, c.ZIG_VERSION_PATCH),	51	@as(u32, c.ZIG_VERSION_PATCH),
...	@@ -54,15 +54,15 @@ pub async fn renderToLlvm(comp: Compilation, fn_val: Value.Fn, code: *ir.Code)	...	@@ -54,15 +54,15 @@ pub async fn renderToLlvm(comp: Compilation, fn_val: Value.Fn, code: *ir.Code)
54	const runtime_version = 0;	54	const runtime_version = 0;
55	const compile_unit_file = llvm.CreateFile(	55	const compile_unit_file = llvm.CreateFile(
56	dibuilder,	56	dibuilder,
57	comp.name.toSliceConst(),	57	comp.name.span(),
58	comp.root_package.root_src_dir.toSliceConst(),	58	comp.root_package.root_src_dir.span(),
59	) orelse return error.OutOfMemory;	59	) orelse return error.OutOfMemory;
60	const is_optimized = comp.build_mode != .Debug;	60	const is_optimized = comp.build_mode != .Debug;
61	const compile_unit = llvm.CreateCompileUnit(	61	const compile_unit = llvm.CreateCompileUnit(
62	dibuilder,	62	dibuilder,
63	DW.LANG_C99,	63	DW.LANG_C99,
64	compile_unit_file,	64	compile_unit_file,
65	producer.toSliceConst(),	65	producer,
66	is_optimized,	66	is_optimized,
67	flags,	67	flags,
68	runtime_version,	68	runtime_version,
...	@@ -109,14 +109,14 @@ pub async fn renderToLlvm(comp: Compilation, fn_val: Value.Fn, code: *ir.Code)	...	@@ -109,14 +109,14 @@ pub async fn renderToLlvm(comp: Compilation, fn_val: Value.Fn, code: *ir.Code)
109	if (llvm.TargetMachineEmitToFile(	109	if (llvm.TargetMachineEmitToFile(
110	comp.target_machine,	110	comp.target_machine,
111	module,	111	module,
112	output_path.toSliceConst(),	112	output_path.span(),
113	llvm.EmitBinary,	113	llvm.EmitBinary,
114	&err_msg,	114	&err_msg,
115	is_debug,	115	is_debug,
116	is_small,	116	is_small,
117	)) {	117	)) {
118	if (std.debug.runtime_safety) {	118	if (std.debug.runtime_safety) {
119	std.debug.panic("unable to write object file {}: {s}\n", .{ output_path.toSliceConst(), err_msg });	119	std.debug.panic("unable to write object file {}: {s}\n", .{ output_path.span(), err_msg });
120	}	120	}
121	return error.WritingObjectFileFailed;	121	return error.WritingObjectFileFailed;
122	}	122	}
...	@@ -127,7 +127,7 @@ pub async fn renderToLlvm(comp: Compilation, fn_val: Value.Fn, code: *ir.Code)	...	@@ -127,7 +127,7 @@ pub async fn renderToLlvm(comp: Compilation, fn_val: Value.Fn, code: *ir.Code)
127	llvm.DumpModule(ofile.module);	127	llvm.DumpModule(ofile.module);
128	}	128	}
129	if (comp.verbose_link) {	129	if (comp.verbose_link) {
130	std.debug.warn("created {}\n", .{output_path.toSliceConst()});	130	std.debug.warn("created {}\n", .{output_path.span()});
131	}	131	}
132	}	132	}
133		133
...	@@ -150,7 +150,7 @@ pub fn renderToLlvmModule(ofile: ObjectFile, fn_val: Value.Fn, code: *ir.Code)	...	@@ -150,7 +150,7 @@ pub fn renderToLlvmModule(ofile: ObjectFile, fn_val: Value.Fn, code: *ir.Code)
150	const llvm_fn_type = try fn_val.base.typ.getLlvmType(ofile.arena, ofile.context);	150	const llvm_fn_type = try fn_val.base.typ.getLlvmType(ofile.arena, ofile.context);
151	const llvm_fn = llvm.AddFunction(	151	const llvm_fn = llvm.AddFunction(
152	ofile.module,	152	ofile.module,
153	fn_val.symbol_name.toSliceConst(),	153	fn_val.symbol_name.span(),
154	llvm_fn_type,	154	llvm_fn_type,
155	) orelse return error.OutOfMemory;	155	) orelse return error.OutOfMemory;
156		156
...	@@ -211,7 +211,7 @@ pub fn renderToLlvmModule(ofile: ObjectFile, fn_val: Value.Fn, code: *ir.Code)	...	@@ -211,7 +211,7 @@ pub fn renderToLlvmModule(ofile: ObjectFile, fn_val: Value.Fn, code: *ir.Code)
211	const cur_ret_ptr = if (fn_type_normal.return_type.handleIsPtr()) llvm.GetParam(llvm_fn, 0) else null;	211	const cur_ret_ptr = if (fn_type_normal.return_type.handleIsPtr()) llvm.GetParam(llvm_fn, 0) else null;
212		212
213	// build all basic blocks	213	// build all basic blocks
214	for (code.basic_block_list.toSlice()) \|bb\| {	214	for (code.basic_block_list.span()) \|bb\| {
215	bb.llvm_block = llvm.AppendBasicBlockInContext(	215	bb.llvm_block = llvm.AppendBasicBlockInContext(
216	ofile.context,	216	ofile.context,
217	llvm_fn,	217	llvm_fn,
...	@@ -226,7 +226,7 @@ pub fn renderToLlvmModule(ofile: ObjectFile, fn_val: Value.Fn, code: *ir.Code)	...	@@ -226,7 +226,7 @@ pub fn renderToLlvmModule(ofile: ObjectFile, fn_val: Value.Fn, code: *ir.Code)
226	// TODO set up error return tracing	226	// TODO set up error return tracing
227	// TODO allocate temporary stack values	227	// TODO allocate temporary stack values
228		228
229	const var_list = fn_type.non_key.Normal.variable_list.toSliceConst();	229	const var_list = fn_type.non_key.Normal.variable_list.span();
230	// create debug variable declarations for variables and allocate all local variables	230	// create debug variable declarations for variables and allocate all local variables
231	for (var_list) \|var_scope, i\| {	231	for (var_list) \|var_scope, i\| {
232	const var_type = switch (var_scope.data) {	232	const var_type = switch (var_scope.data) {
...	@@ -306,9 +306,9 @@ pub fn renderToLlvmModule(ofile: ObjectFile, fn_val: Value.Fn, code: *ir.Code)	...	@@ -306,9 +306,9 @@ pub fn renderToLlvmModule(ofile: ObjectFile, fn_val: Value.Fn, code: *ir.Code)
306	//}	306	//}
307	}	307	}
308		308
309	for (code.basic_block_list.toSlice()) \|current_block\| {	309	for (code.basic_block_list.span()) \|current_block\| {
310	llvm.PositionBuilderAtEnd(ofile.builder, current_block.llvm_block);	310	llvm.PositionBuilderAtEnd(ofile.builder, current_block.llvm_block);
311	for (current_block.instruction_list.toSlice()) \|instruction\| {	311	for (current_block.instruction_list.span()) \|instruction\| {
312	if (instruction.ref_count == 0 and !instruction.hasSideEffects()) continue;	312	if (instruction.ref_count == 0 and !instruction.hasSideEffects()) continue;
313		313
314	instruction.llvm_value = try instruction.render(ofile, fn_val);	314	instruction.llvm_value = try instruction.render(ofile, fn_val);

...	@@ -3,7 +3,7 @@ const Scope = @import("scope.zig").Scope;	...	@@ -3,7 +3,7 @@ const Scope = @import("scope.zig").Scope;
3	const Compilation = @import("compilation.zig").Compilation;	3	const Compilation = @import("compilation.zig").Compilation;
4	const ObjectFile = @import("codegen.zig").ObjectFile;	4	const ObjectFile = @import("codegen.zig").ObjectFile;
5	const llvm = @import("llvm.zig");	5	const llvm = @import("llvm.zig");
6	const Buffer = std.Buffer;	6	const ArrayListSentineled = std.ArrayListSentineled;
7	const assert = std.debug.assert;	7	const assert = std.debug.assert;
8		8
9	/// Values are ref-counted, heap-allocated, and copy-on-write	9	/// Values are ref-counted, heap-allocated, and copy-on-write
...	@@ -131,9 +131,9 @@ pub const Value = struct {	...	@@ -131,9 +131,9 @@ pub const Value = struct {
131		131
132	/// The main external name that is used in the .o file.	132	/// The main external name that is used in the .o file.
133	/// TODO https://github.com/ziglang/zig/issues/265	133	/// TODO https://github.com/ziglang/zig/issues/265
134	symbol_name: Buffer,	134	symbol_name: ArrayListSentineled(u8, 0),
135		135
136	pub fn create(comp: Compilation, fn_type: Type.Fn, symbol_name: Buffer) !*FnProto {	136	pub fn create(comp: Compilation, fn_type: Type.Fn, symbol_name: ArrayListSentineled(u8, 0)) !*FnProto {
137	const self = try comp.gpa().create(FnProto);	137	const self = try comp.gpa().create(FnProto);
138	self.* = FnProto{	138	self.* = FnProto{
139	.base = Value{	139	.base = Value{
...	@@ -156,7 +156,7 @@ pub const Value = struct {	...	@@ -156,7 +156,7 @@ pub const Value = struct {
156	const llvm_fn_type = try self.base.typ.getLlvmType(ofile.arena, ofile.context);	156	const llvm_fn_type = try self.base.typ.getLlvmType(ofile.arena, ofile.context);
157	const llvm_fn = llvm.AddFunction(	157	const llvm_fn = llvm.AddFunction(
158	ofile.module,	158	ofile.module,
159	self.symbol_name.toSliceConst(),	159	self.symbol_name.span(),
160	llvm_fn_type,	160	llvm_fn_type,
161	) orelse return error.OutOfMemory;	161	) orelse return error.OutOfMemory;
162		162
...	@@ -171,7 +171,7 @@ pub const Value = struct {	...	@@ -171,7 +171,7 @@ pub const Value = struct {
171		171
172	/// The main external name that is used in the .o file.	172	/// The main external name that is used in the .o file.
173	/// TODO https://github.com/ziglang/zig/issues/265	173	/// TODO https://github.com/ziglang/zig/issues/265
174	symbol_name: Buffer,	174	symbol_name: ArrayListSentineled(u8, 0),
175		175
176	/// parent should be the top level decls or container decls	176	/// parent should be the top level decls or container decls
177	fndef_scope: *Scope.FnDef,	177	fndef_scope: *Scope.FnDef,
...	@@ -183,13 +183,13 @@ pub const Value = struct {	...	@@ -183,13 +183,13 @@ pub const Value = struct {
183	block_scope: ?*Scope.Block,	183	block_scope: ?*Scope.Block,
184		184
185	/// Path to the object file that contains this function	185	/// Path to the object file that contains this function
186	containing_object: Buffer,	186	containing_object: ArrayListSentineled(u8, 0),
187		187
188	link_set_node: std.TailQueue(?Value.Fn).Node,	188	link_set_node: std.TailQueue(?Value.Fn).Node,
189		189
190	/// Creates a Fn value with 1 ref	190	/// Creates a Fn value with 1 ref
191	/// Takes ownership of symbol_name	191	/// Takes ownership of symbol_name
192	pub fn create(comp: Compilation, fn_type: Type.Fn, fndef_scope: Scope.FnDef, symbol_name: Buffer) !Fn {	192	pub fn create(comp: Compilation, fn_type: Type.Fn, fndef_scope: Scope.FnDef, symbol_name: ArrayListSentineled(u8, 0)) !Fn {
193	const link_set_node = try comp.gpa().create(Compilation.FnLinkSet.Node);	193	const link_set_node = try comp.gpa().create(Compilation.FnLinkSet.Node);
194	link_set_node.* = Compilation.FnLinkSet.Node{	194	link_set_node.* = Compilation.FnLinkSet.Node{
195	.data = null,	195	.data = null,
...	@@ -209,7 +209,7 @@ pub const Value = struct {	...	@@ -209,7 +209,7 @@ pub const Value = struct {
209	.child_scope = &fndef_scope.base,	209	.child_scope = &fndef_scope.base,
210	.block_scope = null,	210	.block_scope = null,
211	.symbol_name = symbol_name,	211	.symbol_name = symbol_name,
212	.containing_object = Buffer.initNull(comp.gpa()),	212	.containing_object = ArrayListSentineled(u8, 0).initNull(comp.gpa()),
213	.link_set_node = link_set_node,	213	.link_set_node = link_set_node,
214	};	214	};
215	fn_type.base.base.ref();	215	fn_type.base.base.ref();
...	@@ -241,7 +241,7 @@ pub const Value = struct {	...	@@ -241,7 +241,7 @@ pub const Value = struct {
241	const llvm_fn_type = try self.base.typ.getLlvmType(ofile.arena, ofile.context);	241	const llvm_fn_type = try self.base.typ.getLlvmType(ofile.arena, ofile.context);
242	const llvm_fn = llvm.AddFunction(	242	const llvm_fn = llvm.AddFunction(
243	ofile.module,	243	ofile.module,
244	self.symbol_name.toSliceConst(),	244	self.symbol_name.span(),
245	llvm_fn_type,	245	llvm_fn_type,
246	) orelse return error.OutOfMemory;	246	) orelse return error.OutOfMemory;
247		247

...	@@ -183,13 +183,13 @@ const Dump = struct {	...	@@ -183,13 +183,13 @@ const Dump = struct {
183	try mergeSameStrings(&self.zig_version, zig_version);	183	try mergeSameStrings(&self.zig_version, zig_version);
184	try mergeSameStrings(&self.root_name, root_name);	184	try mergeSameStrings(&self.root_name, root_name);
185		185
186	for (params.get("builds").?.value.Array.toSliceConst()) \|json_build\| {	186	for (params.get("builds").?.value.Array.span()) \|json_build\| {
187	const target = json_build.Object.get("target").?.value.String;	187	const target = json_build.Object.get("target").?.value.String;
188	try self.targets.append(target);	188	try self.targets.append(target);
189	}	189	}
190		190
191	// Merge files. If the string matches, it's the same file.	191	// Merge files. If the string matches, it's the same file.
192	const other_files = root.Object.get("files").?.value.Array.toSliceConst();	192	const other_files = root.Object.get("files").?.value.Array.span();
193	var other_file_to_mine = std.AutoHashMap(usize, usize).init(self.a());	193	var other_file_to_mine = std.AutoHashMap(usize, usize).init(self.a());
194	for (other_files) \|other_file, i\| {	194	for (other_files) \|other_file, i\| {
195	const gop = try self.file_map.getOrPut(other_file.String);	195	const gop = try self.file_map.getOrPut(other_file.String);
...	@@ -201,7 +201,7 @@ const Dump = struct {	...	@@ -201,7 +201,7 @@ const Dump = struct {
201	}	201	}
202		202
203	// Merge AST nodes. If the file id, line, and column all match, it's the same AST node.	203	// Merge AST nodes. If the file id, line, and column all match, it's the same AST node.
204	const other_ast_nodes = root.Object.get("astNodes").?.value.Array.toSliceConst();	204	const other_ast_nodes = root.Object.get("astNodes").?.value.Array.span();
205	var other_ast_node_to_mine = std.AutoHashMap(usize, usize).init(self.a());	205	var other_ast_node_to_mine = std.AutoHashMap(usize, usize).init(self.a());
206	for (other_ast_nodes) \|other_ast_node_json, i\| {	206	for (other_ast_nodes) \|other_ast_node_json, i\| {
207	const other_file_id = jsonObjInt(other_ast_node_json, "file");	207	const other_file_id = jsonObjInt(other_ast_node_json, "file");
...	@@ -221,9 +221,9 @@ const Dump = struct {	...	@@ -221,9 +221,9 @@ const Dump = struct {
221	// convert fields lists	221	// convert fields lists
222	for (other_ast_nodes) \|other_ast_node_json, i\| {	222	for (other_ast_nodes) \|other_ast_node_json, i\| {
223	const my_node_index = other_ast_node_to_mine.get(i).?.value;	223	const my_node_index = other_ast_node_to_mine.get(i).?.value;
224	const my_node = &self.node_list.toSlice()[my_node_index];	224	const my_node = &self.node_list.span()[my_node_index];
225	if (other_ast_node_json.Object.get("fields")) \|fields_json_kv\| {	225	if (other_ast_node_json.Object.get("fields")) \|fields_json_kv\| {
226	const other_fields = fields_json_kv.value.Array.toSliceConst();	226	const other_fields = fields_json_kv.value.Array.span();
227	my_node.fields = try self.a().alloc(usize, other_fields.len);	227	my_node.fields = try self.a().alloc(usize, other_fields.len);
228	for (other_fields) \|other_field_index, field_i\| {	228	for (other_fields) \|other_field_index, field_i\| {
229	const other_index = @intCast(usize, other_field_index.Integer);	229	const other_index = @intCast(usize, other_field_index.Integer);
...	@@ -233,7 +233,7 @@ const Dump = struct {	...	@@ -233,7 +233,7 @@ const Dump = struct {
233	}	233	}
234		234
235	// Merge errors. If the AST Node matches, it's the same error value.	235	// Merge errors. If the AST Node matches, it's the same error value.
236	const other_errors = root.Object.get("errors").?.value.Array.toSliceConst();	236	const other_errors = root.Object.get("errors").?.value.Array.span();
237	var other_error_to_mine = std.AutoHashMap(usize, usize).init(self.a());	237	var other_error_to_mine = std.AutoHashMap(usize, usize).init(self.a());
238	for (other_errors) \|other_error_json, i\| {	238	for (other_errors) \|other_error_json, i\| {
239	const other_src_id = jsonObjInt(other_error_json, "src");	239	const other_src_id = jsonObjInt(other_error_json, "src");
...	@@ -253,7 +253,7 @@ const Dump = struct {	...	@@ -253,7 +253,7 @@ const Dump = struct {
253	// First we identify all the simple types and merge those.	253	// First we identify all the simple types and merge those.
254	// Example: void, type, noreturn	254	// Example: void, type, noreturn
255	// We can also do integers and floats.	255	// We can also do integers and floats.
256	const other_types = root.Object.get("types").?.value.Array.toSliceConst();	256	const other_types = root.Object.get("types").?.value.Array.span();
257	var other_types_to_mine = std.AutoHashMap(usize, usize).init(self.a());	257	var other_types_to_mine = std.AutoHashMap(usize, usize).init(self.a());
258	for (other_types) \|other_type_json, i\| {	258	for (other_types) \|other_type_json, i\| {
259	const type_kind = jsonObjInt(other_type_json, "kind");	259	const type_kind = jsonObjInt(other_type_json, "kind");
...	@@ -336,7 +336,7 @@ const Dump = struct {	...	@@ -336,7 +336,7 @@ const Dump = struct {
336		336
337	try jw.objectField("builds");	337	try jw.objectField("builds");
338	try jw.beginArray();	338	try jw.beginArray();
339	for (self.targets.toSliceConst()) \|target\| {	339	for (self.targets.span()) \|target\| {
340	try jw.arrayElem();	340	try jw.arrayElem();
341	try jw.beginObject();	341	try jw.beginObject();
342	try jw.objectField("target");	342	try jw.objectField("target");
...	@@ -349,7 +349,7 @@ const Dump = struct {	...	@@ -349,7 +349,7 @@ const Dump = struct {
349		349
350	try jw.objectField("types");	350	try jw.objectField("types");
351	try jw.beginArray();	351	try jw.beginArray();
352	for (self.type_list.toSliceConst()) \|t\| {	352	for (self.type_list.span()) \|t\| {
353	try jw.arrayElem();	353	try jw.arrayElem();
354	try jw.beginObject();	354	try jw.beginObject();
355		355
...	@@ -379,7 +379,7 @@ const Dump = struct {	...	@@ -379,7 +379,7 @@ const Dump = struct {
379		379
380	try jw.objectField("errors");	380	try jw.objectField("errors");
381	try jw.beginArray();	381	try jw.beginArray();
382	for (self.error_list.toSliceConst()) \|zig_error\| {	382	for (self.error_list.span()) \|zig_error\| {
383	try jw.arrayElem();	383	try jw.arrayElem();
384	try jw.beginObject();	384	try jw.beginObject();
385		385
...	@@ -395,7 +395,7 @@ const Dump = struct {	...	@@ -395,7 +395,7 @@ const Dump = struct {
395		395
396	try jw.objectField("astNodes");	396	try jw.objectField("astNodes");
397	try jw.beginArray();	397	try jw.beginArray();
398	for (self.node_list.toSliceConst()) \|node\| {	398	for (self.node_list.span()) \|node\| {
399	try jw.arrayElem();	399	try jw.arrayElem();
400	try jw.beginObject();	400	try jw.beginObject();
401		401
...	@@ -425,7 +425,7 @@ const Dump = struct {	...	@@ -425,7 +425,7 @@ const Dump = struct {
425		425
426	try jw.objectField("files");	426	try jw.objectField("files");
427	try jw.beginArray();	427	try jw.beginArray();
428	for (self.file_list.toSliceConst()) \|file\| {	428	for (self.file_list.span()) \|file\| {
429	try jw.arrayElem();	429	try jw.arrayElem();
430	try jw.emitString(file);	430	try jw.emitString(file);
431	}	431	}

...	@@ -324,7 +324,7 @@ pub fn main() !void {	...	@@ -324,7 +324,7 @@ pub fn main() !void {
324	},	324	},
325	.os = .linux,	325	.os = .linux,
326	};	326	};
327	search: for (search_paths.toSliceConst()) \|search_path\| {	327	search: for (search_paths.span()) \|search_path\| {
328	var sub_path: []const []const u8 = undefined;	328	var sub_path: []const []const u8 = undefined;
329	switch (vendor) {	329	switch (vendor) {
330	.musl => {	330	.musl => {
...	@@ -414,13 +414,13 @@ pub fn main() !void {	...	@@ -414,13 +414,13 @@ pub fn main() !void {
414	try contents_list.append(contents);	414	try contents_list.append(contents);
415	}	415	}
416	}	416	}
417	std.sort.sort(*Contents, contents_list.toSlice(), Contents.hitCountLessThan);	417	std.sort.sort(*Contents, contents_list.span(), Contents.hitCountLessThan);
418	var best_contents = contents_list.popOrNull().?;	418	var best_contents = contents_list.popOrNull().?;
419	if (best_contents.hit_count > 1) {	419	if (best_contents.hit_count > 1) {
420	// worth it to make it generic	420	// worth it to make it generic
421	const full_path = try std.fs.path.join(allocator, &[_][]const u8{ out_dir, generic_name, path_kv.key });	421	const full_path = try std.fs.path.join(allocator, &[_][]const u8{ out_dir, generic_name, path_kv.key });
422	try std.fs.cwd().makePath(std.fs.path.dirname(full_path).?);	422	try std.fs.cwd().makePath(std.fs.path.dirname(full_path).?);
423	try std.io.writeFile(full_path, best_contents.bytes);	423	try std.fs.cwd().writeFile(full_path, best_contents.bytes);
424	best_contents.is_generic = true;	424	best_contents.is_generic = true;
425	while (contents_list.popOrNull()) \|contender\| {	425	while (contents_list.popOrNull()) \|contender\| {
426	if (contender.hit_count > 1) {	426	if (contender.hit_count > 1) {
...	@@ -447,7 +447,7 @@ pub fn main() !void {	...	@@ -447,7 +447,7 @@ pub fn main() !void {
447	});	447	});
448	const full_path = try std.fs.path.join(allocator, &[_][]const u8{ out_dir, out_subpath, path_kv.key });	448	const full_path = try std.fs.path.join(allocator, &[_][]const u8{ out_dir, out_subpath, path_kv.key });
449	try std.fs.cwd().makePath(std.fs.path.dirname(full_path).?);	449	try std.fs.cwd().makePath(std.fs.path.dirname(full_path).?);
450	try std.io.writeFile(full_path, contents.bytes);	450	try std.fs.cwd().writeFile(full_path, contents.bytes);
451	}	451	}
452	}	452	}
453	}	453	}

...	@@ -223,15 +223,15 @@ pub fn main() !void {	...	@@ -223,15 +223,15 @@ pub fn main() !void {
223	var list = std.ArrayList([]const u8).init(allocator);	223	var list = std.ArrayList([]const u8).init(allocator);
224	var it = global_fn_set.iterator();	224	var it = global_fn_set.iterator();
225	while (it.next()) \|kv\| try list.append(kv.key);	225	while (it.next()) \|kv\| try list.append(kv.key);
226	std.sort.sort([]const u8, list.toSlice(), strCmpLessThan);	226	std.sort.sort([]const u8, list.span(), strCmpLessThan);
227	break :blk list.toSliceConst();	227	break :blk list.span();
228	};	228	};
229	const global_ver_list = blk: {	229	const global_ver_list = blk: {
230	var list = std.ArrayList([]const u8).init(allocator);	230	var list = std.ArrayList([]const u8).init(allocator);
231	var it = global_ver_set.iterator();	231	var it = global_ver_set.iterator();
232	while (it.next()) \|kv\| try list.append(kv.key);	232	while (it.next()) \|kv\| try list.append(kv.key);
233	std.sort.sort([]const u8, list.toSlice(), versionLessThan);	233	std.sort.sort([]const u8, list.span(), versionLessThan);
234	break :blk list.toSliceConst();	234	break :blk list.span();
235	};	235	};
236	{	236	{
237	const vers_txt_path = try fs.path.join(allocator, &[_][]const u8{ glibc_out_dir, "vers.txt" });	237	const vers_txt_path = try fs.path.join(allocator, &[_][]const u8{ glibc_out_dir, "vers.txt" });
...	@@ -264,13 +264,13 @@ pub fn main() !void {	...	@@ -264,13 +264,13 @@ pub fn main() !void {
264	for (abi_lists) \|*abi_list, abi_index\| {	264	for (abi_lists) \|*abi_list, abi_index\| {
265	const kv = target_functions.get(@ptrToInt(abi_list)).?;	265	const kv = target_functions.get(@ptrToInt(abi_list)).?;
266	const fn_vers_list = &kv.value.fn_vers_list;	266	const fn_vers_list = &kv.value.fn_vers_list;
267	for (kv.value.list.toSliceConst()) \|*ver_fn\| {	267	for (kv.value.list.span()) \|*ver_fn\| {
268	const gop = try fn_vers_list.getOrPut(ver_fn.name);	268	const gop = try fn_vers_list.getOrPut(ver_fn.name);
269	if (!gop.found_existing) {	269	if (!gop.found_existing) {
270	gop.kv.value = std.ArrayList(usize).init(allocator);	270	gop.kv.value = std.ArrayList(usize).init(allocator);
271	}	271	}
272	const ver_index = global_ver_set.get(ver_fn.ver).?.value;	272	const ver_index = global_ver_set.get(ver_fn.ver).?.value;
273	if (std.mem.indexOfScalar(usize, gop.kv.value.toSliceConst(), ver_index) == null) {	273	if (std.mem.indexOfScalar(usize, gop.kv.value.span(), ver_index) == null) {
274	try gop.kv.value.append(ver_index);	274	try gop.kv.value.append(ver_index);
275	}	275	}
276	}	276	}
...	@@ -297,7 +297,7 @@ pub fn main() !void {	...	@@ -297,7 +297,7 @@ pub fn main() !void {
297	try abilist_txt.writeByte('\n');	297	try abilist_txt.writeByte('\n');
298	continue;	298	continue;
299	};	299	};
300	for (kv.value.toSliceConst()) \|ver_index, it_i\| {	300	for (kv.value.span()) \|ver_index, it_i\| {
301	if (it_i != 0) try abilist_txt.writeByte(' ');	301	if (it_i != 0) try abilist_txt.writeByte(' ');
302	try abilist_txt.print("{d}", .{ver_index});	302	try abilist_txt.print("{d}", .{ver_index});
303	}	303	}

Merge branch 'master' into feature-file-locks