aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorJohannes Obermayr <[email protected]>2012-12-20 20:56:17 +0100
committerTom Stellard <[email protected]>2013-01-04 21:05:09 +0000
commit05c143cc049a87c515ecdc5695e5912da60cf5cb (patch)
tree7fdb97c4a3816992f912e7750d4baac9a6debf34 /src/gallium
parent54f3a3e88d35c855c43c31ae7c915cfa55d1f5d7 (diff)
Support LLVM >= 3.2 on radeonsi and opencl.
Tom Stellard: - Backend now has same name for all LLVM versions - Add missing LLVM_VERSION_INT definition
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/radeon/radeon_llvm_emit.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
index 21661a05002..b889f029694 100644
--- a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
+++ b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
@@ -89,10 +89,17 @@ radeon_llvm_compile(LLVMModuleRef M, unsigned char ** bytes,
Triple AMDGPUTriple(sys::getDefaultTargetTriple());
+#if HAVE_LLVM == 0x0302
LLVMInitializeAMDGPUTargetInfo();
LLVMInitializeAMDGPUTarget();
LLVMInitializeAMDGPUTargetMC();
LLVMInitializeAMDGPUAsmPrinter();
+#else
+ LLVMInitializeR600TargetInfo();
+ LLVMInitializeR600Target();
+ LLVMInitializeR600TargetMC();
+ LLVMInitializeR600AsmPrinter();
+#endif
std::string err;
const Target * AMDGPUTarget = TargetRegistry::lookupTarget("r600", err);