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

Fix built for LLVM2.9 and 3.1svn

Browse Source
This commit is contained in:
Matt Pharr
2011-12-06 08:08:41 -08:00
parent b22943b4a4
commit e2b6ed3db8
5 changed files with 46 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ispc.cpp
View File

@@ -241,11 +241,19 @@ Target::GetTargetMachine() const {
llvm::Reloc::Model relocModel = generatePIC ? llvm::Reloc::PIC_ :
llvm::Reloc::Default;
#if defined(LLVM_3_0svn) || defined(LLVM_3_1svn) || defined(LLVM_3_0)
#if defined(LLVM_3_1svn)
std::string featuresString = attributes;
llvm::TargetOptions options;
if (g->opt.fastMath == true)
options.UnsafeFPMath = 1;
llvm::TargetMachine *targetMachine =
target->createTargetMachine(triple, cpu, featuresString, options,
relocModel);
#elif defined(LLVM_3_0)
std::string featuresString = attributes;
llvm::TargetMachine *targetMachine =
target->createTargetMachine(triple, cpu, featuresString, relocModel);
#else
#else // LLVM 2.9
#ifdef ISPC_IS_APPLE
relocModel = llvm::Reloc::PIC_;
#endif // ISPC_IS_APPLE
@@ -255,7 +263,8 @@ Target::GetTargetMachine() const {
#ifndef ISPC_IS_WINDOWS
targetMachine->setRelocationModel(relocModel);
#endif // !ISPC_IS_WINDOWS
#endif
#endif // LLVM_2_9
assert(targetMachine != NULL);
targetMachine->setAsmVerbosityDefault(true);