[llvm-commits] [llvm] r151849 - in /llvm/trunk: cmake/modules/HandleLLVMOptions.cmake lib/CodeGen/AsmPrinter/DwarfDebug.cpp lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp

[Michael J. Spencer]

Author: mspencer
Date: Thu Mar  1 16:42:52 2012
New Revision: 151849

URL: http://llvm.org/viewvc/llvm-project?rev=151849&view=rev
Log:
Minimal changes for LLVM to compile under VS11.

Modified:
    llvm/trunk/cmake/modules/HandleLLVMOptions.cmake
    llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
    llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp

Modified: llvm/trunk/cmake/modules/HandleLLVMOptions.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/HandleLLVMOptions.cmake?rev=151849&r1=151848&r2=151849&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/HandleLLVMOptions.cmake (original)
+++ llvm/trunk/cmake/modules/HandleLLVMOptions.cmake Thu Mar  1 16:42:52 2012
@@ -136,6 +136,10 @@
 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...

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=151849&r1=151848&r2=151849&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Thu Mar  1 16:42:52 2012
@@ -530,7 +530,7 @@
 
   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;
 

Modified: llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp?rev=151849&r1=151848&r2=151849&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp (original)
+++ llvm/trunk/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp Thu Mar  1 16:42:52 2012
@@ -36,6 +36,10 @@
 #define GET_SUBTARGETINFO_MC_DESC
 #include "X86GenSubtargetInfo.inc"
 
+#if _MSC_VER
+#include <intrin.h>
+#endif
+
 using namespace llvm;