| commit | c06d11cde34d3ae5fa4564dc255e47a212037e1f | [log] [tgz] |
|---|---|---|
| author | Nicolas Capens <capn@google.com> | Wed Mar 15 14:17:33 2017 -0400 |
| committer | Nicolas Capens <capn@google.com> | Thu Mar 16 15:49:52 2017 +0000 |
| tree | 73551bf7d5b0efd7aceb5670d8d6cfbdc2b9657b | |
| parent | 38182314999cc26c6510fbb5d6372fda8847c1b8 [diff] |
Fix Visual Studio 2017 compilation. When building with VC++ 2017 RC and its default header files the intrin.h header file is less aggressively included by Windows headers. This causes build breaks on Chrome x64 builds with VC++ 2017 RC when X86MCTargetDesc.cpp uses __cpuid without first including its header. https://github.com/google/swiftshader/pull/2 Change-Id: I664d7b509e0517b7621d41312ccdd0d3de60de84 Reviewed-on: https://swiftshader-review.googlesource.com/8951 Reviewed-by: Alexis Hétu <sugoi@google.com> Tested-by: Nicolas Capens <capn@google.com>
diff --git a/third_party/LLVM/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp b/third_party/LLVM/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp index f98d5e3..4156074 100644 --- a/third_party/LLVM/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp +++ b/third_party/LLVM/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
@@ -35,6 +35,10 @@ #define GET_SUBTARGETINFO_MC_DESC #include "X86GenSubtargetInfo.inc" +#ifdef _MSC_VER +#include <intrin.h> +#endif + using namespace llvm;