From 8f84212855115799def2106e8b3a807c766058ed Mon Sep 17 00:00:00 2001
From: David Rubin <daviru007@icloud.com>
Date: Fri, 26 Jul 2024 14:44:38 -0700
Subject: [PATCH] riscv: make multi-threaded enabled compilation the default

---
 src/Package/Module.zig | 2 +-
 src/target.zig         | 3 +--
 test/behavior/if.zig   | 1 -
 test/behavior/null.zig | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Package/Module.zig b/src/Package/Module.zig
index 371b8e9816..02d9921016 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 9b7e12408e..6ff9e69e61 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 be8b6ac228..69ad917e6a 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 653003b8f0..9815389838 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();