zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/raa-eruanna/qzdoom into qzdoom

This commit is contained in:
Magnus Norddahl 2016-10-18 01:16:45 +02:00
parent df3f5ae882 f32a2547bc
commit 49b4860426
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/r_compiler/llvmdrawers.cpp
View File

@ -482,7 +482,7 @@ LLVMProgram::LLVMProgram()
mModule = std::make_unique<Module>("render", context()); mModule = std::make_unique<Module>("render", context());
mModule->setTargetTriple(targetTriple); mModule->setTargetTriple(targetTriple);
#if LLVM_VERSION_MAJOR < 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR < 9) #if LLVM_VERSION_MAJOR < 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR < 8)
mModule->setDataLayout(new DataLayout(*machine->getSubtargetImpl()->getDataLayout())); mModule->setDataLayout(new DataLayout(*machine->getSubtargetImpl()->getDataLayout()));
#else #else
mModule->setDataLayout(machine->createDataLayout()); mModule->setDataLayout(machine->createDataLayout());
@ -497,7 +497,7 @@ void LLVMProgram::CreateEE()
legacy::FunctionPassManager PerFunctionPasses(mModule.get()); legacy::FunctionPassManager PerFunctionPasses(mModule.get());
legacy::PassManager PerModulePasses; legacy::PassManager PerModulePasses;
#if LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 9) #if LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 8)
PerFunctionPasses.add(createTargetTransformInfoWrapperPass(machine->getTargetIRAnalysis())); PerFunctionPasses.add(createTargetTransformInfoWrapperPass(machine->getTargetIRAnalysis()));
PerModulePasses.add(createTargetTransformInfoWrapperPass(machine->getTargetIRAnalysis())); PerModulePasses.add(createTargetTransformInfoWrapperPass(machine->getTargetIRAnalysis()));
#endif #endif
@ -542,7 +542,7 @@ std::string LLVMProgram::DumpModule()
{ {
std::string str; std::string str;
llvm::raw_string_ostream stream(str); llvm::raw_string_ostream stream(str);
#if LLVM_VERSION_MAJOR < 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR < 9) #if LLVM_VERSION_MAJOR < 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR < 8)
mModule->print(stream, nullptr); mModule->print(stream, nullptr);
#else #else
mModule->print(stream, nullptr, false, true); mModule->print(stream, nullptr, false, true);