| commit | ea74eb1ab8c81382a33723dbad9f82d16f0bc372 | [log] [tgz] |
|---|---|---|
| author | Nico Weber <thakis@chromium.org> | Thu Aug 03 16:13:45 2017 -0400 |
| committer | Nico Weber <thakis@google.com> | Thu Aug 03 21:16:34 2017 +0000 |
| tree | 1876d6451e81e8fa40d2b430e73de53b6ac01256 | |
| parent | aadf3e1325f17141d033947dd23020a852251d94 [diff] |
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 80550e2..7328a93 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