6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-10-25 10:27:04 +00:00
Code Issues Projects Releases Wiki Activity

Minimal changes for LLVM to compile under VS11.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@151849 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Michael J. Spencer
2012-03-01 22:42:52 +00:00
parent b2930b92d3
commit 647c0ce48c
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/modules/HandleLLVMOptions.cmake
View File

@@ -136,6 +136,10 @@ endif()
if( MSVC ) if( MSVC )
include(ChooseMSVCCRT) include(ChooseMSVCCRT)
if( MSVC11 )
add_llvm_definitions(-D_VARIADIC_MAX=10)
endif()
# Add definitions that make MSVC much less annoying. # Add definitions that make MSVC much less annoying.
add_llvm_definitions( add_llvm_definitions(
# For some reason MS wants to deprecate a bunch of standard functions... # For some reason MS wants to deprecate a bunch of standard functions...

2
lib/CodeGen/AsmPrinter/DwarfDebug.cpp
View File

@@ -530,7 +530,7 @@ unsigned DwarfDebug::GetOrCreateSourceID(StringRef FileName,
std::map<std::pair<std::string, std::string>, unsigned>::iterator I; std::map<std::pair<std::string, std::string>, unsigned>::iterator I;
bool NewlyInserted; bool NewlyInserted;
tie(I, NewlyInserted) = SourceIdMap.insert(Entry); llvm::tie(I, NewlyInserted) = SourceIdMap.insert(Entry);
if (!NewlyInserted) if (!NewlyInserted)
return I->second; return I->second;

4
lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
View File

@@ -36,6 +36,10 @@
#define GET_SUBTARGETINFO_MC_DESC #define GET_SUBTARGETINFO_MC_DESC
#include "X86GenSubtargetInfo.inc" #include "X86GenSubtargetInfo.inc"
#if _MSC_VER
#include <intrin.h>
#endif
using namespace llvm; using namespace llvm;