diff --git a/src/Package/Module.zig b/src/Package/Module.zig index 371b8e98160d42953d5ad4e3d3f17c595752d8d3..02d9921016d4b13c1c518fae89983054e0f3d81a 100644 --- a/src/Package/Module.zig +++ b/src/Package/Module.zig @@ -159,7 +159,7 @@ pub fn create(arena: Allocator, options: CreateOptions) !*Package.Module { if (options.inherited.single_threaded) |x| break :b x; if (options.parent) |p| break :b p.single_threaded; - break :b target_util.defaultSingleThreaded(target, zig_backend); + break :b target_util.defaultSingleThreaded(target); }; const error_tracing = b: { diff --git a/src/target.zig b/src/target.zig index 9b7e12408ee3fa8ffbc8ad192abc36e519921864..6ff9e69e614cd3425b567ca23fca57d943ad9aab 100644 --- a/src/target.zig +++ b/src/target.zig @@ -60,10 +60,9 @@ pub fn alwaysSingleThreaded(target: std.Target) bool { return false; } -pub fn defaultSingleThreaded(target: std.Target, backend: std.builtin.CompilerBackend) bool { +pub fn defaultSingleThreaded(target: std.Target) bool { switch (target.cpu.arch) { .wasm32, .wasm64 => return true, - .riscv64 => if (backend == .stage2_riscv64) return true, else => {}, } switch (target.os.tag) { diff --git a/test/behavior/if.zig b/test/behavior/if.zig index be8b6ac228a4f28690aa2f4d591681e7619b7488..69ad917e6aea8abb0610bc6ec96773d5e800026f 100644 --- a/test/behavior/if.zig +++ b/test/behavior/if.zig @@ -118,7 +118,6 @@ test "if peer expressions inferred optional type" { if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO - if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest; var self: []const u8 = "abcdef"; var index: usize = 0; diff --git a/test/behavior/null.zig b/test/behavior/null.zig index 653003b8f0c53762e68930b8ee78ce61dd24e002..98153898382a9845edf9fd9fdf61881d68cc8e73 100644 --- a/test/behavior/null.zig +++ b/test/behavior/null.zig @@ -53,7 +53,6 @@ test "maybe return" { if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO - if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest; try maybeReturnImpl(); try comptime maybeReturnImpl();