From: Michael J. Spencer <bigcheesegs@gmail.com>
Date: Thu, 1 Mar 2012 22:42:52 +0000 (+0000)
Subject: Minimal changes for LLVM to compile under VS11.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=647c0ce48cdbefc22c221ffeb892e73ccd155009;p=oota-llvm.git

Minimal changes for LLVM to compile under VS11.

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

diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake
index 0a5c02f5ba5..3a10a861d67 100644
--- a/cmake/modules/HandleLLVMOptions.cmake
+++ b/cmake/modules/HandleLLVMOptions.cmake
@@ -136,6 +136,10 @@ endif()
 if( MSVC )
   include(ChooseMSVCCRT)
 
+  if( MSVC11 )
+    add_llvm_definitions(-D_VARIADIC_MAX=10)
+  endif()
+
   # Add definitions that make MSVC much less annoying.
   add_llvm_definitions(
     # For some reason MS wants to deprecate a bunch of standard functions...
diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index 920f82d01db..58e40e17c52 100644
--- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -530,7 +530,7 @@ unsigned DwarfDebug::GetOrCreateSourceID(StringRef FileName,
 
   std::map<std::pair<std::string, std::string>, unsigned>::iterator I;
   bool NewlyInserted;
-  tie(I, NewlyInserted) = SourceIdMap.insert(Entry);
+  llvm::tie(I, NewlyInserted) = SourceIdMap.insert(Entry);
   if (!NewlyInserted)
     return I->second;
 
diff --git a/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp b/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
index 5ca592d5ead..38c3401c73c 100644
--- a/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
+++ b/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
@@ -36,6 +36,10 @@
 #define GET_SUBTARGETINFO_MC_DESC
 #include "X86GenSubtargetInfo.inc"
 
+#if _MSC_VER
+#include <intrin.h>
+#endif
+
 using namespace llvm;