mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-17 06:49:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

cc,wasi: use wasi_libc.CRTFile directly instead of WasiExecModel

Browse Source
This commit is contained in:
Jakub Konka 2021-06-09 10:23:46 +02:00
parent bf568ec62a
commit 9f8de83d93
5 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Compilation.zig
View File

@ -603,11 +603,6 @@ pub const ClangPreprocessorMode = enum {
stdout,
};
pub const WasiExecModel = enum {
command,
reactor,
};
pub const InitOptions = struct {
zig_lib_directory: Directory,
local_cache_directory: Directory,
@ -731,7 +726,7 @@ pub const InitOptions = struct {
test_name_prefix: ?[]const u8 = null,
subsystem: ?std.Target.SubSystem = null,
/// WASI-only. Type of WASI execution model ("command" or "reactor").
wasi_exec_model: ?WasiExecModel = null,
wasi_exec_model: ?wasi_libc.CRTFile = null,
};
fn addPackageTableToCacheHash(
@ -1449,14 +1444,8 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation {
.wasi_libc_crt_file = crt_file,
});
}
const crt_file: wasi_libc.CRTFile = if (comp.bin_file.options.wasi_exec_model) |exec_model| crt_file: {
switch (exec_model) {
.command => break :crt_file wasi_libc.CRTFile.crt1_command_o,
.reactor => break :crt_file wasi_libc.CRTFile.crt1_reactor_o,
}
} else .crt1_o;
comp.work_queue.writeAssumeCapacity(&[_]Job{
.{ .wasi_libc_crt_file = crt_file },
.{ .wasi_libc_crt_file = comp.bin_file.options.wasi_exec_model orelse .crt1_o },
.{ .wasi_libc_crt_file = .libc_a },
});
}

2
src/link.zig
View File

@ -119,7 +119,7 @@ pub const Options = struct {
libc_installation: ?*const LibCInstallation,
/// WASI-only. Type of WASI execution model ("command" or "reactor").
wasi_exec_model: ?Compilation.WasiExecModel = null,
wasi_exec_model: ?wasi_libc.CRTFile = null,
pub fn effectiveOutputMode(options: Options) std.builtin.OutputMode {
return if (options.use_lld) .Obj else options.output_mode;

12
src/link/Wasm.zig
View File

@ -684,7 +684,7 @@ fn linkWithLLD(self: *Wasm, comp: *Compilation) !void {
// Reactor execution model does not have _start so lld doesn't look for it.
if (self.base.options.wasi_exec_model) |exec_model| blk: {
if (exec_model != .reactor) break :blk;
if (exec_model != .crt1_reactor_o) break :blk;
try argv.append("--no-entry");
}
} else {
@ -698,12 +698,6 @@ fn linkWithLLD(self: *Wasm, comp: *Compilation) !void {
});
if (target.os.tag == .wasi) {
const crt_name = if (self.base.options.wasi_exec_model) |exec_model|
try std.fmt.allocPrint(arena, "crt1-{s}.o", .{@tagName(exec_model)})
else
"crt1.o";
try argv.append(try comp.get_libc_crt_file(arena, crt_name));
const is_exe_or_dyn_lib = self.base.options.output_mode == .Exe or
(self.base.options.output_mode == .Lib and self.base.options.link_mode == .Dynamic);
if (is_exe_or_dyn_lib) {
@ -727,6 +721,10 @@ fn linkWithLLD(self: *Wasm, comp: *Compilation) !void {
}
if (self.base.options.link_libc) {
try argv.append(try comp.get_libc_crt_file(
arena,
wasi_libc.crtFileFullName(self.base.options.wasi_exec_model orelse .crt1_o),
));
try argv.append(try comp.get_libc_crt_file(arena, "libc.a"));
}
}

6
src/main.zig
View File

@ -613,7 +613,7 @@ fn buildOutputType(
var subsystem: ?std.Target.SubSystem = null;
var major_subsystem_version: ?u32 = null;
var minor_subsystem_version: ?u32 = null;
var wasi_exec_model: ?Compilation.WasiExecModel = null;
var wasi_exec_model: ?wasi_libc.CRTFile = null;
var system_libs = std.ArrayList([]const u8).init(gpa);
defer system_libs.deinit();
@ -1257,9 +1257,9 @@ fn buildOutputType(
.strip => strip = true,
.exec_model => {
if (std.mem.eql(u8, it.only_arg, "reactor")) {
wasi_exec_model = Compilation.WasiExecModel.reactor;
wasi_exec_model = .crt1_reactor_o;
} else if (std.mem.eql(u8, it.only_arg, "command")) {
wasi_exec_model = Compilation.WasiExecModel.command;
wasi_exec_model = .crt1_command_o;
}
},
}

9
src/wasi_libc.zig
View File

@ -45,6 +45,15 @@ pub fn emulatedLibCRFileLibName(crt_file: CRTFile) []const u8 {
};
}
pub fn crtFileFullName(crt_file: CRTFile) []const u8 {
return switch (crt_file) {
.crt1_o => "crt1.o",
.crt1_reactor_o => "crt1-reactor.o",
.crt1_command_o => "crt1-command.o",
else => unreachable,
};
}
pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void {
if (!build_options.have_llvm) {
return error.ZigCompilerNotBuiltWithLLVMExtensions;