From: Tom Stellard <thomas.stellard@amd.com>
Date: Mon, 16 Apr 2012 21:47:04 +0000 (-0400)
Subject: radeon: Remove HAVE_LLVM ifdefs
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6e238bf27c34fa9d79c9f371c102a5423db86de8;p=mesa.git

radeon: Remove HAVE_LLVM ifdefs

Only LLVM 3.1 is supported, so these are not necessary.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
index 1bc6a15610a..04fd6dd6b36 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;