summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorReid Kleckner <reid@kleckner.net>2014-05-06 00:57:33 +0000
committerReid Kleckner <reid@kleckner.net>2014-05-06 00:57:33 +0000
commit64c75a59c92cabbdfe795920337db2a82e9a8c1d (patch)
treeec051da54b9ae01c096c20e4ba3d05602ac78b9f /llvm/lib
parent1b1ec8bfe2c9da5592cc3ef32e93d184efa8451f (diff)
downloadbcm5719-llvm-64c75a59c92cabbdfe795920337db2a82e9a8c1d.tar.gz
bcm5719-llvm-64c75a59c92cabbdfe795920337db2a82e9a8c1d.zip
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. llvm-svn: 208023
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/Support/Atomic.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/llvm/lib/Support/Atomic.cpp b/llvm/lib/Support/Atomic.cpp
index 9559ad72957..2ef32b08ef2 100644
--- a/llvm/lib/Support/Atomic.cpp
+++ b/llvm/lib/Support/Atomic.cpp
@@ -17,6 +17,7 @@
using namespace llvm;
#if defined(_MSC_VER)
+#include <Intrin.h>
#include <windows.h>
#undef MemoryFence
#endif
OpenPOWER on IntegriCloud