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

Fix build with LLVM ToT

Browse Source
This commit is contained in:
Matt Pharr
2011-11-04 07:06:15 -07:00
parent ba9bb3338f
commit 5fc8df3e55
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ispc.cpp
View File

@@ -211,7 +211,11 @@ std::string
Target::GetTripleString() const { Target::GetTripleString() const {
llvm::Triple triple; llvm::Triple triple;
// Start with the host triple as the default // Start with the host triple as the default
#if defined(LLVM_3_1) || defined(LLVM_3_1svn)
triple.setTriple(llvm::sys::getDefaultTargetTriple());
#else
triple.setTriple(llvm::sys::getHostTriple()); triple.setTriple(llvm::sys::getHostTriple());
#endif
// And override the arch in the host triple based on what the user // And override the arch in the host triple based on what the user
// specified. Here we need to deal with the fact that LLVM uses one // specified. Here we need to deal with the fact that LLVM uses one

7
module.cpp
View File

@@ -1114,8 +1114,13 @@ Module::execPreprocessor(const char* infilename, llvm::raw_string_ostream* ostre
clang::TargetOptions &options = inst.getTargetOpts(); clang::TargetOptions &options = inst.getTargetOpts();
llvm::Triple triple(module->getTargetTriple()); llvm::Triple triple(module->getTargetTriple());
if (triple.getTriple().empty()) if (triple.getTriple().empty()) {
#if defined(LLVM_3_1) || defined(LLVM_3_1svn)
triple.setTriple(llvm::sys::getDefaultTargetTriple());
#else
triple.setTriple(llvm::sys::getHostTriple()); triple.setTriple(llvm::sys::getHostTriple());
#endif
}
options.Triple = triple.getTriple(); options.Triple = triple.getTriple();
clang::TargetInfo *target = clang::TargetInfo *target =