Mesa (master): gallium/radeon: nuke the final pre LLVM 3.6 codepath

Emil Velikov evelikov at kemper.freedesktop.org
Sun May 1 07:58:31 UTC 2016


Module: Mesa
Branch: master
Commit: 9fa2e57a738d20a2b77ae0a5e9ad717b529321b4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9fa2e57a738d20a2b77ae0a5e9ad717b529321b4

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Thu Apr 21 14:37:16 2016 +0100

gallium/radeon: nuke the final pre LLVM 3.6 codepath

Missed with commit 100796c15c3 "gallium/radeon: drop support for LLVM
3.5"

v2: s/LLVN/LLVM/ in shortlog (Nicolai)

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com> (v1)
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

---

 src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c b/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c
index 0828197..dd86f66 100644
--- a/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c
+++ b/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c
@@ -1536,13 +1536,7 @@ void radeon_llvm_context_init(struct radeon_llvm_context * ctx, const char *trip
 	ctx->gallivm.context = LLVMContextCreate();
 	ctx->gallivm.module = LLVMModuleCreateWithNameInContext("tgsi",
 						ctx->gallivm.context);
-	LLVMSetTarget(ctx->gallivm.module,
-
-#if HAVE_LLVM < 0x0306
-			"r600--");
-#else
-			triple);
-#endif
+	LLVMSetTarget(ctx->gallivm.module, triple);
 	ctx->gallivm.builder = LLVMCreateBuilderInContext(ctx->gallivm.context);
 
 	struct lp_build_tgsi_context * bld_base = &ctx->soa.bld_base;




More information about the mesa-commit mailing list