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

fix for build fail after llvm commit 214781

Browse Source
This commit is contained in:
Anton Mitrokhin
2014-08-06 11:56:35 +04:00
parent dd07e2a457
commit bfad04d648
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ispc.cpp
View File

@@ -57,10 +57,13 @@
#include <llvm/IR/Module.h> #include <llvm/IR/Module.h>
#include <llvm/IR/Instructions.h> #include <llvm/IR/Instructions.h>
#endif #endif
#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>
#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>
#include <llvm/IR/DIBuilder.h> #include <llvm/IR/DIBuilder.h>
#else #else // LLVM 3.2, 3.3, 3.4
#include <llvm/DebugInfo.h> #include <llvm/DebugInfo.h>
#include <llvm/DIBuilder.h> #include <llvm/DIBuilder.h>
#endif #endif
@@ -656,8 +659,12 @@ Target::Target(const char *arch, const char *cpu, const char *isa, bool pic) :
// Initialize TargetData/DataLayout in 3 steps. // Initialize TargetData/DataLayout in 3 steps.
// 1. Get default data layout first // 1. Get default data layout first
std::string dl_string; std::string dl_string;
dl_string = m_targetMachine->getDataLayout()->getStringRepresentation();
#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
dl_string = m_targetMachine->getDataLayout()->getStringRepresentation();
#endif
// 2. Adjust for generic // 2. Adjust for generic
if (m_isa == Target::GENERIC) { if (m_isa == Target::GENERIC) {
// <16 x i1> vectors only need 16 bit / 2 byte alignment, so add // <16 x i1> vectors only need 16 bit / 2 byte alignment, so add
@@ -677,6 +684,7 @@ Target::Target(const char *arch, const char *cpu, const char *isa, bool pic) :
// This indicates if we are compiling for 32 bit platform // This indicates if we are compiling for 32 bit platform
// and can assume 32 bit runtime. // and can assume 32 bit runtime.
// FIXME: all generic targets are handled as 64 bit, which is incorrect. // FIXME: all generic targets are handled as 64 bit, which is incorrect.
this->m_is32Bit = (getDataLayout()->getPointerSize() == 4); this->m_is32Bit = (getDataLayout()->getPointerSize() == 4);
#if !defined(LLVM_3_2) #if !defined(LLVM_3_2)