Commit 4e4722a65e3bc3d6bb4518df3082ffea7c2a7c5d | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2021-06-07 11:02:11+02:00
committer	Jakub Konka <kubkon@jakubkonka.com> 2021-06-09 01:25:38+02:00
log	4e4722a65e3bc3d6bb4518df3082ffea7c2a7c5d
tree	02bf3ff87229ec8df06bd8296050e318e1cb90cc
parent	93a4403271ef62d8ae2cd10f58cc23d4b7bbdf4d

cc,wasi: build referenced-only emulated components

Move parsing of system libs into `main.zig` next to where we decide
if we should link libC, and, if targeting WASI, if the specified
libname equals one of the emulated components, save it on the side
and remove it from the system libs. Then, build *only* those parts
of WASI libc that were preserved in the previous step.

This also fixes building of different crt1 bits needed to support
reactors and commands.

5 files changed, 227 insertions(+), 154 deletions(-)

src/Compilation.zig+31-12

 @@ -203,8 +203,8 @@ const Job = union(enum) {
     /// needed when not linking libc and using LLVM for code generation because it generates
     /// calls to, for example, memcpy and memset.
     zig_libc: void,
-    /// WASI libc sysroot
+    /// one of WASI libc static objects
-    wasi_libc_sysroot: void,
+    wasi_libc_crt_file: wasi_libc.CRTFile,
     /// Use stage1 C++ code to compile zig code into an object file.
     stage1_module: void,
 @@ -279,7 +279,7 @@ pub const MiscTask = enum {
     libcxx,
     libcxxabi,
     libtsan,
-    wasi_libc_sysroot,
+    wasi_libc_crt_file,
     compiler_rt,
     libssp,
     zig_libc,
 @@ -646,6 +646,12 @@ pub const InitOptions = struct {
     framework_dirs: []const []const u8 = &[0][]const u8{},
     frameworks: []const []const u8 = &[0][]const u8{},
     system_libs: []const []const u8 = &[0][]const u8{},
+    /// These correspond to the WASI libc emulated subcomponents including:
+    /// * process clocks
+    /// * getpid
+    /// * mman
+    /// * signal
+    wasi_emulated_libs: []const []const u8 = &[0][]const u8{},
     link_libc: bool = false,
     link_libcpp: bool = false,
     link_libunwind: bool = false,
 @@ -1286,6 +1292,7 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation {
             .framework_dirs = options.framework_dirs,
             .system_libs = system_libs,
             .syslibroot = darwin_options.syslibroot,
+            .wasi_emulated_libs = options.wasi_emulated_libs,
             .lib_dirs = options.lib_dirs,
             .rpath_list = options.rpath_list,
             .strip = strip,
 @@ -1426,8 +1433,19 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation {
                 },
             });
         }
-        if (comp.wantBuildWasiLibcSysrootFromSource()) {
+        if (comp.wantBuildWasiLibcFromSource()) {
-            try comp.work_queue.write(&[_]Job{.{ .wasi_libc_sysroot = {} }});
+            try comp.work_queue.ensureUnusedCapacity(6); // worst-case we need all components
+            const wasi_emulated_libs = comp.bin_file.options.wasi_emulated_libs;
+            for (wasi_emulated_libs) |lib_name| {
+                comp.work_queue.writeItemAssumeCapacity(.{
+                    .wasi_libc_crt_file = wasi_libc.getEmulatedLibCRTFile(lib_name).?,
+                });
+            }
+            // TODO add logic deciding which crt1 we want here.
+            comp.work_queue.writeAssumeCapacity(&[_]Job{
+                .{ .wasi_libc_crt_file = .crt1_o },
+                .{ .wasi_libc_crt_file = .libc_a },
+            });
         }
         if (comp.wantBuildMinGWFromSource()) {
             const static_lib_jobs = [_]Job{
 @@ -2169,12 +2187,12 @@ pub fn performAllTheWork(self: *Compilation) error{ TimerUnsupported, OutOfMemor
                 );
             };
         },
-        .wasi_libc_sysroot => {
+        .wasi_libc_crt_file => |crt_file| {
-            wasi_libc.buildWasiLibcSysroot(self) catch |err| {
+            wasi_libc.buildCRTFile(self, crt_file) catch |err| {
                 // TODO Surface more error details.
                 try self.setMiscFailure(
-                    .wasi_libc_sysroot,
+                    .wasi_libc_crt_file,
-                    "unable to build WASI libc sysroot: {s}",
+                    "unable to build WASI libc CRT file: {s}",
                     .{@errorName(err)},
                 );
             };
 @@ -3303,7 +3321,7 @@ pub fn get_libc_crt_file(comp: *Compilation, arena: *Allocator, basename: []cons
     if (comp.wantBuildGLibCFromSource() or
         comp.wantBuildMuslFromSource() or
         comp.wantBuildMinGWFromSource() or
-        comp.wantBuildWasiLibcSysrootFromSource())
+        comp.wantBuildWasiLibcFromSource())
     {
         return comp.crt_files.get(basename).?.full_object_path;
     }
 @@ -3343,8 +3361,9 @@ fn wantBuildMuslFromSource(comp: Compilation) bool {
         !comp.getTarget().isWasm();
 }
-fn wantBuildWasiLibcSysrootFromSource(comp: Compilation) bool {
+fn wantBuildWasiLibcFromSource(comp: Compilation) bool {
-    return comp.wantBuildLibCFromSource() and comp.getTarget().isWasm();
+    return comp.wantBuildLibCFromSource() and comp.getTarget().isWasm() and
+        comp.getTarget().os.tag == .wasi;
 }
 fn wantBuildMinGWFromSource(comp: Compilation) bool {

src/link.zig+1

...	@@ -110,6 +110,7 @@ pub const Options = struct {	...	@@ -110,6 +110,7 @@ pub const Options = struct {
110	framework_dirs: []const []const u8,	110	framework_dirs: []const []const u8,
111	frameworks: []const []const u8,	111	frameworks: []const []const u8,
112	system_libs: std.StringArrayHashMapUnmanaged(void),	112	system_libs: std.StringArrayHashMapUnmanaged(void),
		113	wasi_emulated_libs: []const []const u8,
113	lib_dirs: []const []const u8,	114	lib_dirs: []const []const u8,
114	rpath_list: []const []const u8,	115	rpath_list: []const []const u8,
115		116

src/link/Wasm.zig+8-7

...	@@ -699,18 +699,19 @@ fn linkWithLLD(self: Wasm, comp: Compilation) !void {	...	@@ -699,18 +699,19 @@ fn linkWithLLD(self: Wasm, comp: Compilation) !void {
699		699
700	if (link_in_crt) {	700	if (link_in_crt) {
701	// TODO work out if we want standard crt, a reactor or a command	701	// TODO work out if we want standard crt, a reactor or a command
702	try argv.append(try comp.get_libc_crt_file(arena, "crt.o"));	702	try argv.append(try comp.get_libc_crt_file(arena, "crt1.o"));
703	}	703	}
704		704
705	if (!is_obj) {	705	if (!is_obj) {
706	const system_libs = self.base.options.system_libs.keys();	706	const system_libs = self.base.options.system_libs.keys();
707	for (system_libs) \|link_lib\| {	707	for (system_libs) \|link_lib\| {
708	const full_name = try std.fmt.allocPrint(arena, "lib{s}.a", .{link_lib});	708	try argv.append(try std.fmt.allocPrint(arena, "-l{s}", .{link_lib}));
709	if (comp.crt_files.get(full_name)) \|crt\| {	709	}
710	try argv.append(crt.full_object_path);	710
711	} else {	711	const wasi_emulated_libs = self.base.options.wasi_emulated_libs;
712	try argv.append(try std.fmt.allocPrint(arena, "-l{s}", .{link_lib}));	712	for (wasi_emulated_libs) \|lib_name\| {
713	}	713	const full_lib_name = try std.fmt.allocPrint(arena, "lib{s}.a", .{lib_name});
		714	try argv.append(try comp.get_libc_crt_file(arena, full_lib_name));
714	}	715	}
715		716
716	if (self.base.options.link_libc) {	717	if (self.base.options.link_libc) {

src/main.zig+12

 @@ -15,6 +15,7 @@ const Package = @import("Package.zig");
 const build_options = @import("build_options");
 const introspect = @import("introspect.zig");
 const LibCInstallation = @import("libc_installation.zig").LibCInstallation;
+const wasi_libc = @import("wasi_libc.zig");
 const translate_c = @import("translate_c.zig");
 const Cache = @import("Cache.zig");
 const target_util = @import("target.zig");
 @@ -616,6 +617,9 @@ fn buildOutputType(
     var system_libs = std.ArrayList([]const u8).init(gpa);
     defer system_libs.deinit();
+    var wasi_emulated_libs = std.ArrayList([]const u8).init(gpa);
+    defer wasi_emulated_libs.deinit();
     var clang_argv = std.ArrayList([]const u8).init(gpa);
     defer clang_argv.deinit();
 @@ -1586,6 +1590,13 @@ fn buildOutputType(
             if (std.fs.path.isAbsolute(lib_name)) {
                 fatal("cannot use absolute path as a system library: {s}", .{lib_name});
             }
+            if (target_info.target.os.tag == .wasi) {
+                if (wasi_libc.getEmulatedLibCRTFile(lib_name)) |_| {
+                    try wasi_emulated_libs.append(lib_name);
+                    _ = system_libs.orderedRemove(i);
+                    continue;
+                }
+            }
             i += 1;
         }
     }
 @@ -1895,6 +1906,7 @@ fn buildOutputType(
         .framework_dirs = framework_dirs.items,
         .frameworks = frameworks.items,
         .system_libs = system_libs.items,
+        .wasi_emulated_libs = wasi_emulated_libs.items,
         .link_libc = link_libc,
         .link_libcpp = link_libcpp,
         .link_libunwind = link_libunwind,

src/wasi_libc.zig+175-135

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	const std = @import("std");	1	const std = @import("std");
		2	const mem = std.mem;
2	const path = std.fs.path;	3	const path = std.fs.path;
3		4
4	const Allocator = std.mem.Allocator;	5	const Allocator = std.mem.Allocator;
...	@@ -7,7 +8,34 @@ const build_options = @import("build_options");	...	@@ -7,7 +8,34 @@ const build_options = @import("build_options");
7	const target_util = @import("target.zig");	8	const target_util = @import("target.zig");
8	const musl = @import("musl.zig");	9	const musl = @import("musl.zig");
9		10
10	pub fn buildWasiLibcSysroot(comp: *Compilation) !void {	11	pub const CRTFile = enum {
		12	crt1_o,
		13	crt1_reactor_o,
		14	crt1_command_o,
		15	libc_a,
		16	libwasi_emulated_process_clocks_a,
		17	libwasi_emulated_getpid_a,
		18	libwasi_emulated_mman_a,
		19	libwasi_emulated_signal_a,
		20	};
		21
		22	pub fn getEmulatedLibCRTFile(lib_name: []const u8) ?CRTFile {
		23	if (mem.eql(u8, lib_name, "wasi-emulated-process-clocks")) {
		24	return .libwasi_emulated_process_clocks_a;
		25	}
		26	if (mem.eql(u8, lib_name, "wasi-emulated-getpid")) {
		27	return .libwasi_emulated_getpid_a;
		28	}
		29	if (mem.eql(u8, lib_name, "wasi-emulated-mman")) {
		30	return .libwasi_emulated_mman_a;
		31	}
		32	if (mem.eql(u8, lib_name, "wasi-emulated-signal")) {
		33	return .libwasi_emulated_signal_a;
		34	}
		35	return null;
		36	}
		37
		38	pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void {
11	if (!build_options.have_llvm) {	39	if (!build_options.have_llvm) {
12	return error.ZigCompilerNotBuiltWithLLVMExtensions;	40	return error.ZigCompilerNotBuiltWithLLVMExtensions;
13	}	41	}
...	@@ -17,176 +45,190 @@ pub fn buildWasiLibcSysroot(comp: *Compilation) !void {	...	@@ -17,176 +45,190 @@ pub fn buildWasiLibcSysroot(comp: *Compilation) !void {
17	defer arena_allocator.deinit();	45	defer arena_allocator.deinit();
18	const arena = &arena_allocator.allocator;	46	const arena = &arena_allocator.allocator;
19		47
20	{	48	switch (crt_file) {
21	// Compile crt sources.	49	.crt1_o => {
22	var args = std.ArrayList([]const u8).init(arena);
23	try addCCArgs(comp, arena, &args, false);
24	try addLibcBottomHalfIncludes(comp, arena, &args);
25
26	var crt_sources = std.ArrayList(Compilation.CSourceFile).init(arena);
27	for (crt_src_files) \|file_path\| {
28	try crt_sources.append(.{
29	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{
30	"libc", try sanitize(arena, file_path),
31	}),
32	.extra_flags = args.items,
33	});
34	}
35	try comp.build_crt_file("crt", .Obj, crt_sources.items);
36	}
37
38	{
39	// Compile WASI libc (sysroot).
40	var libc_sources = std.ArrayList(Compilation.CSourceFile).init(arena);
41
42	{
43	// Compile dlmalloc.
44	var args = std.ArrayList([]const u8).init(arena);	50	var args = std.ArrayList([]const u8).init(arena);
45	try addCCArgs(comp, arena, &args, true);	51	try addCCArgs(comp, arena, &args, false);
46	try args.appendSlice(&[_][]const u8{	52	try addLibcBottomHalfIncludes(comp, arena, &args);
47	"-I",	53	return comp.build_crt_file("crt1", .Obj, &[1]Compilation.CSourceFile{
48	try comp.zig_lib_directory.join(arena, &[_][]const u8{	54	.{
49	"libc",	55	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{
50	"wasi",	56	"libc", try sanitize(arena, crt1_src_file),
51	"dlmalloc",	57	}),
52	"include",	58	.extra_flags = args.items,
53	}),	59	},
54	});	60	});
55		61	},
56	for (dlmalloc_src_files) \|file_path\| {	62	.crt1_reactor_o => {
57	try libc_sources.append(.{	63	var args = std.ArrayList([]const u8).init(arena);
		64	try addCCArgs(comp, arena, &args, false);
		65	try addLibcBottomHalfIncludes(comp, arena, &args);
		66	return comp.build_crt_file("crt1-reactor", .Obj, &[1]Compilation.CSourceFile{
		67	.{
58	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{	68	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{
59	"libc", try sanitize(arena, file_path),	69	"libc", try sanitize(arena, crt1_reactor_src_file),
60	}),	70	}),
61	.extra_flags = args.items,	71	.extra_flags = args.items,
62	});	72	},
63	}	73	});
64	}	74	},
65		75	.crt1_command_o => {
66	{
67	// Compile libc-bottom-half.
68	var args = std.ArrayList([]const u8).init(arena);	76	var args = std.ArrayList([]const u8).init(arena);
69	try addCCArgs(comp, arena, &args, true);	77	try addCCArgs(comp, arena, &args, false);
70	try addLibcBottomHalfIncludes(comp, arena, &args);	78	try addLibcBottomHalfIncludes(comp, arena, &args);
71		79	return comp.build_crt_file("crt1-command", .Obj, &[1]Compilation.CSourceFile{
72	for (libc_bottom_half_src_files) \|file_path\| {	80	.{
73	try libc_sources.append(.{
74	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{	81	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{
75	"libc", try sanitize(arena, file_path),	82	"libc", try sanitize(arena, crt1_command_src_file),
76	}),	83	}),
77	.extra_flags = args.items,	84	.extra_flags = args.items,
		85	},
		86	});
		87	},
		88	.libc_a => {
		89	var libc_sources = std.ArrayList(Compilation.CSourceFile).init(arena);
		90
		91	{
		92	// Compile dlmalloc.
		93	var args = std.ArrayList([]const u8).init(arena);
		94	try addCCArgs(comp, arena, &args, true);
		95	try args.appendSlice(&[_][]const u8{
		96	"-I",
		97	try comp.zig_lib_directory.join(arena, &[_][]const u8{
		98	"libc",
		99	"wasi",
		100	"dlmalloc",
		101	"include",
		102	}),
78	});	103	});
		104
		105	for (dlmalloc_src_files) \|file_path\| {
		106	try libc_sources.append(.{
		107	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{
		108	"libc", try sanitize(arena, file_path),
		109	}),
		110	.extra_flags = args.items,
		111	});
		112	}
79	}	113	}
80	}
81		114
82	{	115	{
83	// Compile libc-top-half.	116	// Compile libc-bottom-half.
		117	var args = std.ArrayList([]const u8).init(arena);
		118	try addCCArgs(comp, arena, &args, true);
		119	try addLibcBottomHalfIncludes(comp, arena, &args);
		120
		121	for (libc_bottom_half_src_files) \|file_path\| {
		122	try libc_sources.append(.{
		123	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{
		124	"libc", try sanitize(arena, file_path),
		125	}),
		126	.extra_flags = args.items,
		127	});
		128	}
		129	}
		130
		131	{
		132	// Compile libc-top-half.
		133	var args = std.ArrayList([]const u8).init(arena);
		134	try addCCArgs(comp, arena, &args, true);
		135	try addLibcTopHalfIncludes(comp, arena, &args);
		136
		137	for (libc_top_half_src_files) \|file_path\| {
		138	try libc_sources.append(.{
		139	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{
		140	"libc", try sanitize(arena, file_path),
		141	}),
		142	.extra_flags = args.items,
		143	});
		144	}
		145	}
		146
		147	try comp.build_crt_file("c", .Lib, libc_sources.items);
		148	},
		149	.libwasi_emulated_process_clocks_a => {
84	var args = std.ArrayList([]const u8).init(arena);	150	var args = std.ArrayList([]const u8).init(arena);
85	try addCCArgs(comp, arena, &args, true);	151	try addCCArgs(comp, arena, &args, true);
86	try addLibcTopHalfIncludes(comp, arena, &args);	152	try addLibcBottomHalfIncludes(comp, arena, &args);
87		153
88	for (libc_top_half_src_files) \|file_path\| {	154	var emu_clocks_sources = std.ArrayList(Compilation.CSourceFile).init(arena);
89	try libc_sources.append(.{	155	for (emulated_process_clocks_src_files) \|file_path\| {
		156	try emu_clocks_sources.append(.{
90	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{	157	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{
91	"libc", try sanitize(arena, file_path),	158	"libc", try sanitize(arena, file_path),
92	}),	159	}),
93	.extra_flags = args.items,	160	.extra_flags = args.items,
94	});	161	});
95	}	162	}
96	}	163	try comp.build_crt_file("wasi-emulated-process-clocks", .Lib, emu_clocks_sources.items);
97		164	},
98	try comp.build_crt_file("c", .Lib, libc_sources.items);	165	.libwasi_emulated_getpid_a => {
99	}
100
101	{
102	// Compile emulated process clocks.
103	var args = std.ArrayList([]const u8).init(arena);
104	try addCCArgs(comp, arena, &args, true);
105	try addLibcBottomHalfIncludes(comp, arena, &args);
106
107	var emu_clocks_sources = std.ArrayList(Compilation.CSourceFile).init(arena);
108	for (emulated_process_clocks_src_files) \|file_path\| {
109	try emu_clocks_sources.append(.{
110	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{
111	"libc", try sanitize(arena, file_path),
112	}),
113	.extra_flags = args.items,
114	});
115	}
116	try comp.build_crt_file("wasi-emulated-process-clocks", .Lib, emu_clocks_sources.items);
117	}
118
119	{
120	// Compile emulated getpid.
121	var args = std.ArrayList([]const u8).init(arena);
122	try addCCArgs(comp, arena, &args, true);
123	try addLibcBottomHalfIncludes(comp, arena, &args);
124
125	var emu_getpid_sources = std.ArrayList(Compilation.CSourceFile).init(arena);
126	for (emulated_getpid_src_files) \|file_path\| {
127	try emu_getpid_sources.append(.{
128	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{
129	"libc", try sanitize(arena, file_path),
130	}),
131	.extra_flags = args.items,
132	});
133	}
134	try comp.build_crt_file("wasi-emulated-getpid", .Lib, emu_getpid_sources.items);
135	}
136
137	{
138	// Compile emulated mman.
139	var args = std.ArrayList([]const u8).init(arena);
140	try addCCArgs(comp, arena, &args, true);
141	try addLibcBottomHalfIncludes(comp, arena, &args);
142
143	var emu_mman_sources = std.ArrayList(Compilation.CSourceFile).init(arena);
144	for (emulated_mman_src_files) \|file_path\| {
145	try emu_mman_sources.append(.{
146	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{
147	"libc", try sanitize(arena, file_path),
148	}),
149	.extra_flags = args.items,
150	});
151	}
152	try comp.build_crt_file("wasi-emulated-mman", .Lib, emu_mman_sources.items);
153	}
154
155	{
156	// Compile emulated signals.
157	var emu_signal_sources = std.ArrayList(Compilation.CSourceFile).init(arena);
158
159	{
160	var args = std.ArrayList([]const u8).init(arena);	166	var args = std.ArrayList([]const u8).init(arena);
161	try addCCArgs(comp, arena, &args, true);	167	try addCCArgs(comp, arena, &args, true);
		168	try addLibcBottomHalfIncludes(comp, arena, &args);
162		169
163	for (emulated_signal_bottom_half_src_files) \|file_path\| {	170	var emu_getpid_sources = std.ArrayList(Compilation.CSourceFile).init(arena);
164	try emu_signal_sources.append(.{	171	for (emulated_getpid_src_files) \|file_path\| {
		172	try emu_getpid_sources.append(.{
165	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{	173	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{
166	"libc", try sanitize(arena, file_path),	174	"libc", try sanitize(arena, file_path),
167	}),	175	}),
168	.extra_flags = args.items,	176	.extra_flags = args.items,
169	});	177	});
170	}	178	}
171	}	179	try comp.build_crt_file("wasi-emulated-getpid", .Lib, emu_getpid_sources.items);
172		180	},
173	{	181	.libwasi_emulated_mman_a => {
174	var args = std.ArrayList([]const u8).init(arena);	182	var args = std.ArrayList([]const u8).init(arena);
175	try addCCArgs(comp, arena, &args, true);	183	try addCCArgs(comp, arena, &args, true);
176	try addLibcTopHalfIncludes(comp, arena, &args);	184	try addLibcBottomHalfIncludes(comp, arena, &args);
177	try args.append("-D_WASI_EMULATED_SIGNAL");
178		185
179	for (emulated_signal_top_half_src_files) \|file_path\| {	186	var emu_mman_sources = std.ArrayList(Compilation.CSourceFile).init(arena);
180	try emu_signal_sources.append(.{	187	for (emulated_mman_src_files) \|file_path\| {
		188	try emu_mman_sources.append(.{
181	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{	189	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{
182	"libc", try sanitize(arena, file_path),	190	"libc", try sanitize(arena, file_path),
183	}),	191	}),
184	.extra_flags = args.items,	192	.extra_flags = args.items,
185	});	193	});
186	}	194	}
187	}	195	try comp.build_crt_file("wasi-emulated-mman", .Lib, emu_mman_sources.items);
		196	},
		197	.libwasi_emulated_signal_a => {
		198	var emu_signal_sources = std.ArrayList(Compilation.CSourceFile).init(arena);
		199
		200	{
		201	var args = std.ArrayList([]const u8).init(arena);
		202	try addCCArgs(comp, arena, &args, true);
		203
		204	for (emulated_signal_bottom_half_src_files) \|file_path\| {
		205	try emu_signal_sources.append(.{
		206	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{
		207	"libc", try sanitize(arena, file_path),
		208	}),
		209	.extra_flags = args.items,
		210	});
		211	}
		212	}
188		213
189	try comp.build_crt_file("wasi-emulated-signal", .Lib, emu_signal_sources.items);	214	{
		215	var args = std.ArrayList([]const u8).init(arena);
		216	try addCCArgs(comp, arena, &args, true);
		217	try addLibcTopHalfIncludes(comp, arena, &args);
		218	try args.append("-D_WASI_EMULATED_SIGNAL");
		219
		220	for (emulated_signal_top_half_src_files) \|file_path\| {
		221	try emu_signal_sources.append(.{
		222	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{
		223	"libc", try sanitize(arena, file_path),
		224	}),
		225	.extra_flags = args.items,
		226	});
		227	}
		228	}
		229
		230	try comp.build_crt_file("wasi-emulated-signal", .Lib, emu_signal_sources.items);
		231	},
190	}	232	}
191	}	233	}
192		234
...	@@ -1084,11 +1126,9 @@ const libc_top_half_src_files = [_][]const u8{	...	@@ -1084,11 +1126,9 @@ const libc_top_half_src_files = [_][]const u8{
1084	"wasi/libc-top-half/sources/arc4random.c",	1126	"wasi/libc-top-half/sources/arc4random.c",
1085	};	1127	};
1086		1128
1087	const crt_src_files = &[_][]const u8{	1129	const crt1_src_file = "wasi/libc-bottom-half/crt/crt1.c";
1088	"wasi/libc-bottom-half/crt/crt1.c",	1130	const crt1_command_src_file = "wasi/libc-bottom-half/crt/crt1-command.c";
1089	"wasi/libc-bottom-half/crt/crt1-command.c",	1131	const crt1_reactor_src_file = "wasi/libc-bottom-half/crt/crt1-reactor.c";
1090	"wasi/libc-bottom-half/crt/crt1-reactor.c",
1091	};
1092		1132
1093	const emulated_process_clocks_src_files = &[_][]const u8{	1133	const emulated_process_clocks_src_files = &[_][]const u8{
1094	"wasi/libc-bottom-half/clocks/clock.c",	1134	"wasi/libc-bottom-half/clocks/clock.c",