KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clover: remove pre llvm 3.5.0 compatibility code 

Acked-by: Francisco Jerez <currojerez@riseup.net>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
This commit is contained in:
EdB 2015-04-19 10:50:19 +02:00 committed by Tom Stellard
parent f39cd71618
commit c1485f4b7d
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/gallium/state_trackers/clover/llvm/invocation.cpp
View File

@ -29,21 +29,14 @@
#include <clang/Basic/TargetInfo.h>
#include <llvm/Bitcode/BitstreamWriter.h>
#include <llvm/Bitcode/ReaderWriter.h>
#if HAVE_LLVM < 0x0305
#include <llvm/Linker.h>
#else
#include <llvm/Linker/Linker.h>
#include <llvm/IR/DiagnosticInfo.h>
#include <llvm/IR/DiagnosticPrinter.h>
#endif
#include <llvm/IR/DerivedTypes.h>
#include <llvm/IR/LLVMContext.h>
#include <llvm/IR/Module.h>
#include <llvm/Support/SourceMgr.h>
#include <llvm/IRReader/IRReader.h>
#if HAVE_LLVM < 0x0305
#include <llvm/ADT/OwningPtr.h>
#endif
#if HAVE_LLVM >= 0x0307
#include <llvm/IR/LegacyPassManager.h>
#else
@ -328,9 +321,7 @@ namespace {
llvm::Function *kernel = *I;
export_list.push_back(kernel->getName().data());
}
#if HAVE_LLVM < 0x0305
PM.add(new llvm::DataLayout(mod));
#elif HAVE_LLVM < 0x0306
#if HAVE_LLVM < 0x0306
PM.add(new llvm::DataLayoutPass(mod));
#elif HAVE_LLVM < 0x0307
PM.add(new llvm::DataLayoutPass());
@ -356,11 +347,7 @@ namespace {
compat::vector<module::argument> args;
llvm::Function *kernel_func = mod->getFunction(kernel_name);
#if HAVE_LLVM < 0x0305
llvm::DataLayout TD(kernel_func->getParent()->getDataLayout());
#else
llvm::DataLayout TD(mod);
#endif
llvm::DataLayout TD(mod);
for (llvm::Function::const_arg_iterator I = kernel_func->arg_begin(),
E = kernel_func->arg_end(); I != E; ++I) {
@ -651,8 +638,6 @@ namespace {
return m;
}
#if HAVE_LLVM >= 0x0305
void
diagnostic_handler(const llvm::DiagnosticInfo &di, void *data) {
if (di.getSeverity() == llvm::DS_Error) {
@ -667,8 +652,6 @@ namespace {
}
}
#endif
void
init_targets() {
static bool targets_initialized = false;
@ -721,9 +704,7 @@ clover::compile_program_llvm(const compat::string &source,
llvm::LLVMContext llvm_ctx;
unsigned optimization_level;
#if HAVE_LLVM >= 0x0305
llvm_ctx.setDiagnosticHandler(diagnostic_handler, &r_log);
#endif
if (get_debug_flags() & DBG_CLC)
debug_log(source, ".cl");