Revert "Revert "Merge pull request #17637 from jacobly0/x86_64-test-std""

This reverts commit 6f0198cadbe29294f2bf3153a27beebd64377566.

3 files changed, 10 insertions, 0 deletions

diff --git a/lib/std/Thread/Condition.zig b/lib/std/Thread/Condition.zig
index 898fc14520..549ea623dd 100644
--- a/lib/std/Thread/Condition.zig
+++ b/lib/std/Thread/Condition.zig
@@ -369,6 +369,8 @@ test "Condition - signal" {
         return error.SkipZigTest;
     }
 
+    if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
+
     const num_threads = 4;
 
     const SignalTest = struct {
@@ -498,6 +500,8 @@ test "Condition - broadcasting" {
         return error.SkipZigTest;
     }
 
+    if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
+
     const num_threads = 10;
 
     const BroadcastTest = struct {
@@ -565,6 +569,8 @@ test "Condition - broadcasting - wake all threads" {
         return error.SkipZigTest;
     }
 
+    if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
+
     var num_runs: usize = 1;
     const num_threads = 10;
 
diff --git a/lib/std/Thread/Mutex.zig b/lib/std/Thread/Mutex.zig
index 0f618516b5..c6416113b5 100644
--- a/lib/std/Thread/Mutex.zig
+++ b/lib/std/Thread/Mutex.zig
@@ -289,6 +289,8 @@ test "Mutex - many contended" {
         return error.SkipZigTest;
     }
 
+    if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
+
     const num_threads = 4;
     const num_increments = 1000;
 
diff --git a/lib/std/Thread/RwLock.zig b/lib/std/Thread/RwLock.zig
index e77db10abb..2cd101f913 100644
--- a/lib/std/Thread/RwLock.zig
+++ b/lib/std/Thread/RwLock.zig
@@ -297,6 +297,8 @@ test "RwLock - concurrent access" {
     if (builtin.single_threaded)
         return;
 
+    if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
+
     const num_writers: usize = 2;
     const num_readers: usize = 4;
     const num_writes: usize = 10000;