Nixyri/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-01-10 20:21:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

bootstrap: fix build

Browse Source
This commit is contained in:
Jacob Young 2024-07-07 13:18:53 -04:00
parent bdae01ab04
commit 166402c16b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/std/Thread.zig
View File

@ -280,12 +280,13 @@ pub fn getCurrentId() Id {
pub const CpuCountError = error{
PermissionDenied,
SystemResources,
Unsupported,
Unexpected,
};
/// Returns the platforms view on the number of logical CPU cores available.
pub fn getCpuCount() CpuCountError!usize {
return Impl.getCpuCount();
return try Impl.getCpuCount();
}
/// Configuration options for hints on how to spawn threads.
@ -782,6 +783,10 @@ const WasiThreadImpl = struct {
return tls_thread_id;
}
fn getCpuCount() error{Unsupported}!noreturn {
return error.Unsupported;
}
fn getHandle(self: Impl) ThreadHandle {
return self.thread.tid.load(.seq_cst);
}

2
src/link.zig
View File

@ -538,7 +538,7 @@ pub const File = struct {
pub fn flush(base: *File, arena: Allocator, tid: Zcu.PerThread.Id, prog_node: std.Progress.Node) FlushError!void {
if (build_options.only_c) {
assert(base.tag == .c);
return @as(*C, @fieldParentPtr("base", base)).flush(arena, prog_node);
return @as(*C, @fieldParentPtr("base", base)).flush(arena, tid, prog_node);
}
const comp = base.comp;
if (comp.clang_preprocessor_mode == .yes or comp.clang_preprocessor_mode == .pch) {