aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #945 from aguskov/master

Browse Source 
LLVM trunk fix: added getTargetLowering()
This commit is contained in:
Dmitry Babokin
2015-01-27 17:52:12 +03:00
parent 115c8020b1 7e88b42107
commit f49875d5cf
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ispc.cpp
View File

@@ -59,6 +59,9 @@
#endif #endif
#if !defined(LLVM_3_2) && !defined(LLVM_3_3) && !defined(LLVM_3_4) && !defined(LLVM_3_5) // LLVM 3.6+ #if !defined(LLVM_3_2) && !defined(LLVM_3_3) && !defined(LLVM_3_4) && !defined(LLVM_3_5) // LLVM 3.6+
#include <llvm/Target/TargetSubtargetInfo.h> #include <llvm/Target/TargetSubtargetInfo.h>
#if !defined(LLVM_3_6) // LLVM 3.7+
#include <llvm/Target/TargetLowering.h>
#endif
#endif #endif
#if !defined(LLVM_3_2) && !defined(LLVM_3_3) && !defined(LLVM_3_4) // LLVM 3.5+ #if !defined(LLVM_3_2) && !defined(LLVM_3_3) && !defined(LLVM_3_4) // LLVM 3.5+
#include <llvm/IR/DebugInfo.h> #include <llvm/IR/DebugInfo.h>
@@ -685,10 +688,12 @@ Target::Target(const char *arch, const char *cpu, const char *isa, bool pic) :
// 1. Get default data layout first // 1. Get default data layout first
std::string dl_string; std::string dl_string;
#if !defined(LLVM_3_2) && !defined(LLVM_3_3) && !defined(LLVM_3_4) && !defined(LLVM_3_5) // LLVM 3.6+ #if defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4) || defined(LLVM_3_5)
dl_string = m_targetMachine->getSubtargetImpl()->getDataLayout()->getStringRepresentation();
#else
dl_string = m_targetMachine->getDataLayout()->getStringRepresentation(); dl_string = m_targetMachine->getDataLayout()->getStringRepresentation();
#elif defined(LLVM_3_6)
dl_string = m_targetMachine->getSubtargetImpl()->getDataLayout()->getStringRepresentation();
#else // LLVM 3.7+
dl_string = m_targetMachine->getSubtargetImpl()->getTargetLowering()->getDataLayout()->getStringRepresentation();
#endif #endif
// 2. Adjust for generic // 2. Adjust for generic
if (m_isa == Target::GENERIC) { if (m_isa == Target::GENERIC) {