From 7e88b42107cf6e05c84faa15050a1ac15ffb19d4 Mon Sep 17 00:00:00 2001 From: Andrey Guskov Date: Tue, 27 Jan 2015 17:41:27 +0300 Subject: [PATCH] LLVM trunk fix: added getTargetLowering() --- ispc.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ispc.cpp b/ispc.cpp index cf310f89..1e5c5e2d 100644 --- a/ispc.cpp +++ b/ispc.cpp @@ -59,6 +59,9 @@ #endif #if !defined(LLVM_3_2) && !defined(LLVM_3_3) && !defined(LLVM_3_4) && !defined(LLVM_3_5) // LLVM 3.6+ #include + #if !defined(LLVM_3_6) // LLVM 3.7+ + #include + #endif #endif #if !defined(LLVM_3_2) && !defined(LLVM_3_3) && !defined(LLVM_3_4) // LLVM 3.5+ #include @@ -685,10 +688,12 @@ Target::Target(const char *arch, const char *cpu, const char *isa, bool pic) : // 1. Get default data layout first std::string dl_string; -#if !defined(LLVM_3_2) && !defined(LLVM_3_3) && !defined(LLVM_3_4) && !defined(LLVM_3_5) // LLVM 3.6+ - dl_string = m_targetMachine->getSubtargetImpl()->getDataLayout()->getStringRepresentation(); -#else +#if defined(LLVM_3_2) || defined(LLVM_3_3) || defined(LLVM_3_4) || defined(LLVM_3_5) 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 // 2. Adjust for generic if (m_isa == Target::GENERIC) {