Mesa (master): radeon: Remove HAVE_LLVM ifdefs
Tom Stellard
tstellar at kemper.freedesktop.org
Mon Apr 23 14:33:36 UTC 2012
Module: Mesa
Branch: master
Commit: 6e238bf27c34fa9d79c9f371c102a5423db86de8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6e238bf27c34fa9d79c9f371c102a5423db86de8
Author: Tom Stellard <thomas.stellard at amd.com>
Date: Mon Apr 16 17:47:04 2012 -0400
radeon: Remove HAVE_LLVM ifdefs
Only LLVM 3.1 is supported, so these are not necessary.
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
---
src/gallium/drivers/radeon/radeon_llvm_emit.cpp | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
index 1bc6a15..04fd6dd 100644
--- a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
+++ b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
@@ -68,12 +68,7 @@ radeon_llvm_compile(LLVMModuleRef M, unsigned char ** bytes,
unsigned * byte_count, const char * gpu_family,
unsigned dump) {
-#if HAVE_LLVM > 0x0300
Triple AMDGPUTriple(sys::getDefaultTargetTriple());
-#else
- Triple AMDGPUTriple(sys::getHostTriple());
-#endif
-
#ifdef EXTERNAL_LLVM
/* XXX: Can we just initialize the AMDGPU target here? */
@@ -100,9 +95,7 @@ radeon_llvm_compile(LLVMModuleRef M, unsigned char ** bytes,
Module * mod = unwrap(M);
std::string FS = gpu_family;
-#if HAVE_LLVM > 0x0300
TargetOptions TO;
-#endif
std::auto_ptr<TargetMachine> tm(AMDGPUTarget->createTargetMachine(
AMDGPUTriple.getTriple(), gpu_family, "" /* Features */,
@@ -125,9 +118,6 @@ radeon_llvm_compile(LLVMModuleRef M, unsigned char ** bytes,
/* Optional extra paramater true / false to disable verify */
if (AMDGPUTargetMachine.addPassesToEmitFile(PM, out, TargetMachine::CGFT_AssemblyFile,
-#if HAVE_LLVM <= 0x300
- CodeGenOpt::Default,
-#endif
true)){
fprintf(stderr, "AddingPasses failed.\n");
return 1;
More information about the mesa-commit
mailing list