From f41e58d015eec5fa595b4df8af3cf6a2b598bb02 Mon Sep 17 00:00:00 2001
From: kprotty <kbutcher6200@gmail.com>
Date: Thu, 7 Nov 2019 15:51:20 -0600
Subject: fix SpinLock.yield for pull/3626

---
 lib/std/spinlock.zig | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/std/spinlock.zig b/lib/std/spinlock.zig
index 55b92f51d1..f69aae1bec 100644
--- a/lib/std/spinlock.zig
+++ b/lib/std/spinlock.zig
@@ -32,11 +32,8 @@ pub const SpinLock = struct {
         var i = iterations;
         while (i != 0) : (i -= 1) {
             switch (builtin.arch) {
-                .i386, .x86_64 => asm volatile("pause" ::: "memory"),
-                // .arm, .aarch64 => asm volatile("yield"),
-                //
-                // Causes CI to fail
-                // See: https://github.com/ziglang/zig/pull/3585#issuecomment-549962765
+                .i386, .x86_64 => asm volatile("pause"),
+                .arm, .aarch64 => asm volatile("yield"),
                 else => time.sleep(0),
             }
         }
-- 
cgit v1.2.3