From: Reid Kleckner <reid@kleckner.net>
Date: Tue, 6 May 2014 00:57:33 +0000 (+0000)
Subject: Include intrin.h before windows.h as a workaround for the x64 self-host
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=9331beb9100842bfff92a21c2949c482c525617d;p=oota-llvm.git

Include intrin.h before windows.h as a workaround for the x64 self-host

On x64, windows.h doesn't include intrin.h for intrinsics.  It just
declares them in the global namespace and uses them, expecting the
compiler to lower it as a builtin.  We basically need to do this in
clang, eventually.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@208023 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Support/Atomic.cpp b/lib/Support/Atomic.cpp
index 9559ad72957..2ef32b08ef2 100644
--- a/lib/Support/Atomic.cpp
+++ b/lib/Support/Atomic.cpp
@@ -17,6 +17,7 @@
 using namespace llvm;
 
 #if defined(_MSC_VER)
+#include <Intrin.h>
 #include <windows.h>
 #undef MemoryFence
 #endif