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/11248Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com> Tested-by: Nico Weber <thakis@google.com>

Merge recent changes from LLVM's lib/Support/Atomic.cpp
ea74eb1a · Nico Weber · Nico Weber · aadf3e13 · ea74eb1a
Commit ea74eb1a authored Aug 03, 2017 by Nico Weber Committed by Nico Weber Aug 03, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

Atomic.cpp third_party/llvm-subzero/lib/Support/Atomic.cpp +3 -1

No files found.
--- 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