From: Nico Weber <thakis@chromium.org>
Date: Thu, 3 Aug 2017 20:13:45 +0000 (-0400)
Subject: Merge recent changes from LLVM's lib/Support/Atomic.cpp
X-Git-Tag: android-x86-7.1-r1~27
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fexternal-swiftshader.git;a=commitdiff_plain;h=ea74eb1ab8c81382a33723dbad9f82d16f0bc372

Merge recent changes from LLVM's lib/Support/Atomic.cpp

In particular, https://reviews.llvm.org/D36281

Bug: chromium:495204
Change-Id: I48afb5b8dd594ce1b43c6ca9fb20638d40119236
Reviewed-on: https://swiftshader-review.googlesource.com/11248
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nico Weber <thakis@google.com>
---

diff --git a/third_party/llvm-subzero/lib/Support/Atomic.cpp b/third_party/llvm-subzero/lib/Support/Atomic.cpp
index 80550e2b4..7328a9305 100644
--- a/third_party/llvm-subzero/lib/Support/Atomic.cpp
+++ b/third_party/llvm-subzero/lib/Support/Atomic.cpp
@@ -17,7 +17,9 @@
 using namespace llvm;
 
 #if defined(_MSC_VER)
-#include <Intrin.h>
+#include <intrin.h>
+
+// We must include windows.h after intrin.h.
 #include <windows.h>
 #undef MemoryFence
 #endif