Adding a basic ELF dynamic loader and MC-JIT for ELF. Functionality is currently basic and will be enhanced with future patches.

Patch developed by Andy Kaylor and Daniel Malea. Reviewed on llvm-commits.

llvm-svn: 148231

41 files changed, 76 insertions, 47 deletions

diff --git a/llvm/test/ExecutionEngine/2002-12-16-ArgTest.ll b/llvm/test/ExecutionEngine/2002-12-16-ArgTest.ll
index eba58ccca42..b36feee516a 100644
--- a/llvm/test/ExecutionEngine/2002-12-16-ArgTest.ll
+++ b/llvm/test/ExecutionEngine/2002-12-16-ArgTest.ll
@@ -1,4 +1,5 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
+; XFAIL: mcjit
 
 @.LC0 = internal global [10 x i8] c"argc: %d\0A\00"		; <[10 x i8]*> [#uses=1]
 
diff --git a/llvm/test/ExecutionEngine/2003-01-04-ArgumentBug.ll b/llvm/test/ExecutionEngine/2003-01-04-ArgumentBug.ll
index 577226b5318..0cc0efd7eaf 100644
--- a/llvm/test/ExecutionEngine/2003-01-04-ArgumentBug.ll
+++ b/llvm/test/ExecutionEngine/2003-01-04-ArgumentBug.ll
@@ -1,5 +1,6 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 ; XFAIL: arm
+; XFAIL: mcjit
 
 define i32 @foo(i32 %X, i32 %Y, double %A) {
 	%cond212 = fcmp une double %A, 1.000000e+00		; <i1> [#uses=1]
diff --git a/llvm/test/ExecutionEngine/2003-01-04-LoopTest.ll b/llvm/test/ExecutionEngine/2003-01-04-LoopTest.ll
index 61b0a1bd58e..e4049a76e06 100644
--- a/llvm/test/ExecutionEngine/2003-01-04-LoopTest.ll
+++ b/llvm/test/ExecutionEngine/2003-01-04-LoopTest.ll
@@ -1,5 +1,6 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 ; XFAIL: arm
+; XFAIL: mcjit
 
 define i32 @main() {
 	call i32 @mylog( i32 4 )		; <i32>:1 [#uses=0]
diff --git a/llvm/test/ExecutionEngine/2003-01-04-PhiTest.ll b/llvm/test/ExecutionEngine/2003-01-04-PhiTest.ll
index 2bc70d749f5..48576e7c83e 100644
--- a/llvm/test/ExecutionEngine/2003-01-04-PhiTest.ll
+++ b/llvm/test/ExecutionEngine/2003-01-04-PhiTest.ll
@@ -1,4 +1,4 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 
 define i32 @main() {
 ; <label>:0
diff --git a/llvm/test/ExecutionEngine/2003-01-09-SARTest.ll b/llvm/test/ExecutionEngine/2003-01-09-SARTest.ll
index 560cd3eae9a..ed58e118437 100644
--- a/llvm/test/ExecutionEngine/2003-01-09-SARTest.ll
+++ b/llvm/test/ExecutionEngine/2003-01-09-SARTest.ll
@@ -1,4 +1,4 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 
 ; We were accidentally inverting the signedness of right shifts.  Whoops.
 
diff --git a/llvm/test/ExecutionEngine/2003-01-10-FUCOM.ll b/llvm/test/ExecutionEngine/2003-01-10-FUCOM.ll
index 8512f634323..4960e596900 100644
--- a/llvm/test/ExecutionEngine/2003-01-10-FUCOM.ll
+++ b/llvm/test/ExecutionEngine/2003-01-10-FUCOM.ll
@@ -1,4 +1,4 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 
 define i32 @main() {
 	%X = fadd double 0.000000e+00, 1.000000e+00		; <double> [#uses=1]
diff --git a/llvm/test/ExecutionEngine/2003-01-15-AlignmentTest.ll b/llvm/test/ExecutionEngine/2003-01-15-AlignmentTest.ll
index df150373b72..80e19ba1932 100644
--- a/llvm/test/ExecutionEngine/2003-01-15-AlignmentTest.ll
+++ b/llvm/test/ExecutionEngine/2003-01-15-AlignmentTest.ll
@@ -1,4 +1,4 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 ; XFAIL: arm
 
 define i32 @bar(i8* %X) {
diff --git a/llvm/test/ExecutionEngine/2003-05-06-LivenessClobber.ll b/llvm/test/ExecutionEngine/2003-05-06-LivenessClobber.ll
index 26429a05090..1e155ee20d5 100644
--- a/llvm/test/ExecutionEngine/2003-05-06-LivenessClobber.ll
+++ b/llvm/test/ExecutionEngine/2003-05-06-LivenessClobber.ll
@@ -1,7 +1,8 @@
 ; This testcase should return with an exit code of 1.
 ;
-; RUN: not lli %s
+; RUN: not %lli %s
 ; XFAIL: arm
+; XFAIL: mcjit
 
 @test = global i64 0		; <i64*> [#uses=1]
 
diff --git a/llvm/test/ExecutionEngine/2003-05-07-ArgumentTest.ll b/llvm/test/ExecutionEngine/2003-05-07-ArgumentTest.ll
index 566f3ae3693..1a1ae5f56b9 100644
--- a/llvm/test/ExecutionEngine/2003-05-07-ArgumentTest.ll
+++ b/llvm/test/ExecutionEngine/2003-05-07-ArgumentTest.ll
@@ -1,5 +1,6 @@
-; RUN: lli %s test
+; RUN: %lli %s test
 ; XFAIL: arm
+; XFAIL: mcjit
 
 declare i32 @puts(i8*)
 
diff --git a/llvm/test/ExecutionEngine/2003-05-11-PHIRegAllocBug.ll b/llvm/test/ExecutionEngine/2003-05-11-PHIRegAllocBug.ll
index bcdb11468dc..45279adbe57 100644
--- a/llvm/test/ExecutionEngine/2003-05-11-PHIRegAllocBug.ll
+++ b/llvm/test/ExecutionEngine/2003-05-11-PHIRegAllocBug.ll
@@ -1,4 +1,4 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 
 target datalayout = "e-p:32:32"
 
diff --git a/llvm/test/ExecutionEngine/2003-06-04-bzip2-bug.ll b/llvm/test/ExecutionEngine/2003-06-04-bzip2-bug.ll
index 37dae861c98..4342aa44097 100644
--- a/llvm/test/ExecutionEngine/2003-06-04-bzip2-bug.ll
+++ b/llvm/test/ExecutionEngine/2003-06-04-bzip2-bug.ll
@@ -1,4 +1,4 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 
 ; Testcase distilled from 256.bzip2.
 
diff --git a/llvm/test/ExecutionEngine/2003-06-05-PHIBug.ll b/llvm/test/ExecutionEngine/2003-06-05-PHIBug.ll
index f7bd8b77244..03b66c43a1c 100644
--- a/llvm/test/ExecutionEngine/2003-06-05-PHIBug.ll
+++ b/llvm/test/ExecutionEngine/2003-06-05-PHIBug.ll
@@ -1,4 +1,4 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 
 ; Testcase distilled from 256.bzip2.
 
diff --git a/llvm/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll b/llvm/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll
index 6c2f34095f6..22dd4ccb44c 100644
--- a/llvm/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll
+++ b/llvm/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll
@@ -1,4 +1,4 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 ; XFAIL: arm
 
 ; This testcase failed to work because two variable sized allocas confused the
diff --git a/llvm/test/ExecutionEngine/2003-08-21-EnvironmentTest.ll b/llvm/test/ExecutionEngine/2003-08-21-EnvironmentTest.ll
index 29cbaac4deb..b56025a2796 100644
--- a/llvm/test/ExecutionEngine/2003-08-21-EnvironmentTest.ll
+++ b/llvm/test/ExecutionEngine/2003-08-21-EnvironmentTest.ll
@@ -1,5 +1,6 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 ; XFAIL: arm
+; XFAIL: mcjit
 
 ;
 ; Regression Test: EnvironmentTest.ll
diff --git a/llvm/test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll b/llvm/test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll
index 6711d4db245..04a5e1741bb 100644
--- a/llvm/test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll
+++ b/llvm/test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll
@@ -1,4 +1,4 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 ; XFAIL: arm
 
 ; This testcase exposes a bug in the local register allocator where it runs out
diff --git a/llvm/test/ExecutionEngine/2003-10-18-PHINode-ConstantExpr-CondCode-Failure.ll b/llvm/test/ExecutionEngine/2003-10-18-PHINode-ConstantExpr-CondCode-Failure.ll
index fe182116ec9..6e48c60db26 100644
--- a/llvm/test/ExecutionEngine/2003-10-18-PHINode-ConstantExpr-CondCode-Failure.ll
+++ b/llvm/test/ExecutionEngine/2003-10-18-PHINode-ConstantExpr-CondCode-Failure.ll
@@ -1,4 +1,4 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 ; XFAIL: arm
 
 @A = global i32 0		; <i32*> [#uses=1]
diff --git a/llvm/test/ExecutionEngine/2005-12-02-TailCallBug.ll b/llvm/test/ExecutionEngine/2005-12-02-TailCallBug.ll
index 874ce39e662..4d7bd895d24 100644
--- a/llvm/test/ExecutionEngine/2005-12-02-TailCallBug.ll
+++ b/llvm/test/ExecutionEngine/2005-12-02-TailCallBug.ll
@@ -1,6 +1,7 @@
 ; PR672
-; RUN: lli %s
+; RUN: %lli %s
 ; XFAIL: arm
+; XFAIL: mcjit-ia32
 
 define i32 @main() {
 	%f = bitcast i32 (i32, i32*, i32)* @check_tail to i32*		; <i32*> [#uses=1]
diff --git a/llvm/test/ExecutionEngine/2007-12-10-APIntLoadStore.ll b/llvm/test/ExecutionEngine/2007-12-10-APIntLoadStore.ll
index c0dc4cf61ab..418361163fc 100644
--- a/llvm/test/ExecutionEngine/2007-12-10-APIntLoadStore.ll
+++ b/llvm/test/ExecutionEngine/2007-12-10-APIntLoadStore.ll
@@ -1,4 +1,4 @@
-; RUN: lli -force-interpreter %s
+; RUN: %lli -force-interpreter %s
 ; PR1836
 
 define i32 @main() {
diff --git a/llvm/test/ExecutionEngine/2008-06-05-APInt-OverAShr.ll b/llvm/test/ExecutionEngine/2008-06-05-APInt-OverAShr.ll
index 07cc659cd04..0ab02747ba1 100644
--- a/llvm/test/ExecutionEngine/2008-06-05-APInt-OverAShr.ll
+++ b/llvm/test/ExecutionEngine/2008-06-05-APInt-OverAShr.ll
@@ -1,4 +1,4 @@
-; RUN: lli -force-interpreter=true %s | grep 1
+; RUN: %lli -force-interpreter=true %s | grep 1
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32"
 target triple = "i686-pc-linux-gnu"
diff --git a/llvm/test/ExecutionEngine/2010-01-15-UndefValue.ll b/llvm/test/ExecutionEngine/2010-01-15-UndefValue.ll
index 6e7a392125e..01cb21f4206 100644
--- a/llvm/test/ExecutionEngine/2010-01-15-UndefValue.ll
+++ b/llvm/test/ExecutionEngine/2010-01-15-UndefValue.ll
@@ -1,4 +1,4 @@
-; RUN: lli -force-interpreter=true %s
+; RUN: %lli -force-interpreter=true %s
 
 define i32 @main() {
        %a = add i32 0, undef
diff --git a/llvm/test/ExecutionEngine/fpbitcast.ll b/llvm/test/ExecutionEngine/fpbitcast.ll
index 47cbb02db18..fa84be44101 100644
--- a/llvm/test/ExecutionEngine/fpbitcast.ll
+++ b/llvm/test/ExecutionEngine/fpbitcast.ll
@@ -1,4 +1,4 @@
-; RUN: lli -force-interpreter=true %s | grep 40091eb8
+; RUN: %lli -force-interpreter=true %s | grep 40091eb8
 ;
 define i32 @test(double %x) {
 entry:
diff --git a/llvm/test/ExecutionEngine/hello.ll b/llvm/test/ExecutionEngine/hello.ll
index 92c26a6c365..4d1d9874bbf 100644
--- a/llvm/test/ExecutionEngine/hello.ll
+++ b/llvm/test/ExecutionEngine/hello.ll
@@ -1,5 +1,6 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 ; XFAIL: arm
+; XFAIL: mcjit
 
 @.LC0 = internal global [12 x i8] c"Hello World\00"		; <[12 x i8]*> [#uses=1]
 
diff --git a/llvm/test/ExecutionEngine/hello2.ll b/llvm/test/ExecutionEngine/hello2.ll
index 10557ab5336..05b4409302f 100644
--- a/llvm/test/ExecutionEngine/hello2.ll
+++ b/llvm/test/ExecutionEngine/hello2.ll
@@ -1,5 +1,6 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 ; XFAIL: arm
+; XFAIL: mcjit
 
 @X = global i32 7		; <i32*> [#uses=0]
 @msg = internal global [13 x i8] c"Hello World\0A\00"		; <[13 x i8]*> [#uses=1]
diff --git a/llvm/test/ExecutionEngine/simplesttest.ll b/llvm/test/ExecutionEngine/simplesttest.ll
index ad38485d6e0..85c17153275 100644
--- a/llvm/test/ExecutionEngine/simplesttest.ll
+++ b/llvm/test/ExecutionEngine/simplesttest.ll
@@ -1,4 +1,4 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 
 define i32 @main() {
 	ret i32 0
diff --git a/llvm/test/ExecutionEngine/simpletest.ll b/llvm/test/ExecutionEngine/simpletest.ll
index 797b359c29a..83f9b840590 100644
--- a/llvm/test/ExecutionEngine/simpletest.ll
+++ b/llvm/test/ExecutionEngine/simpletest.ll
@@ -1,4 +1,4 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 ; XFAIL: arm
 
 define i32 @bar() {
diff --git a/llvm/test/ExecutionEngine/stubs.ll b/llvm/test/ExecutionEngine/stubs.ll
index 2039ab5a6a3..c1134e9ee06 100644
--- a/llvm/test/ExecutionEngine/stubs.ll
+++ b/llvm/test/ExecutionEngine/stubs.ll
@@ -1,5 +1,6 @@
-; RUN: lli -disable-lazy-compilation=false %s
+; RUN: %lli -disable-lazy-compilation=false %s
 ; XFAIL: arm
+; XFAIL: mcjit
 
 define i32 @main() nounwind {
 entry:
diff --git a/llvm/test/ExecutionEngine/test-arith.ll b/llvm/test/ExecutionEngine/test-arith.ll
index 354ecd24bc8..79f989f7265 100644
--- a/llvm/test/ExecutionEngine/test-arith.ll
+++ b/llvm/test/ExecutionEngine/test-arith.ll
@@ -1,4 +1,4 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 
 define i32 @main() {
 	%A = add i8 0, 12		; <i8> [#uses=1]
diff --git a/llvm/test/ExecutionEngine/test-branch.ll b/llvm/test/ExecutionEngine/test-branch.ll
index 7d4fd560592..3ae55d069b3 100644
--- a/llvm/test/ExecutionEngine/test-branch.ll
+++ b/llvm/test/ExecutionEngine/test-branch.ll
@@ -1,4 +1,4 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 
 ; test unconditional branch
 define i32 @main() {
diff --git a/llvm/test/ExecutionEngine/test-call.ll b/llvm/test/ExecutionEngine/test-call.ll
index c4131a20f79..eaadbbae0a7 100644
--- a/llvm/test/ExecutionEngine/test-call.ll
+++ b/llvm/test/ExecutionEngine/test-call.ll
@@ -1,5 +1,6 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 ; XFAIL: arm
+; XFAIL: mcjit
 
 declare void @exit(i32)
 
diff --git a/llvm/test/ExecutionEngine/test-cast.ll b/llvm/test/ExecutionEngine/test-cast.ll
index f41448cc60a..667fa80a489 100644
--- a/llvm/test/ExecutionEngine/test-cast.ll
+++ b/llvm/test/ExecutionEngine/test-cast.ll
@@ -1,4 +1,4 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 
 define i32 @foo() {
 	ret i32 0
diff --git a/llvm/test/ExecutionEngine/test-constantexpr.ll b/llvm/test/ExecutionEngine/test-constantexpr.ll
index d6d90e3e198..d01479a86cd 100644
--- a/llvm/test/ExecutionEngine/test-constantexpr.ll
+++ b/llvm/test/ExecutionEngine/test-constantexpr.ll
@@ -1,4 +1,4 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 
 ; This tests to make sure that we can evaluate weird constant expressions
 
diff --git a/llvm/test/ExecutionEngine/test-fp.ll b/llvm/test/ExecutionEngine/test-fp.ll
index f653660fb83..3411ca1c766 100644
--- a/llvm/test/ExecutionEngine/test-fp.ll
+++ b/llvm/test/ExecutionEngine/test-fp.ll
@@ -1,4 +1,5 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
+; XFAIL: mcjit
 
 define double @test(double* %DP, double %Arg) {
 	%D = load double* %DP		; <double> [#uses=1]
diff --git a/llvm/test/ExecutionEngine/test-loadstore.ll b/llvm/test/ExecutionEngine/test-loadstore.ll
index 7eb57cbf010..b9b779802cc 100644
--- a/llvm/test/ExecutionEngine/test-loadstore.ll
+++ b/llvm/test/ExecutionEngine/test-loadstore.ll
@@ -1,5 +1,6 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 ; XFAIL: arm
+; XFAIL: mcjit-ia32
 
 define void @test(i8* %P, i16* %P.upgrd.1, i32* %P.upgrd.2, i64* %P.upgrd.3) {
 	%V = load i8* %P		; <i8> [#uses=1]
diff --git a/llvm/test/ExecutionEngine/test-logical.ll b/llvm/test/ExecutionEngine/test-logical.ll
index 710763a30bd..05b381bb53c 100644
--- a/llvm/test/ExecutionEngine/test-logical.ll
+++ b/llvm/test/ExecutionEngine/test-logical.ll
@@ -1,4 +1,4 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 
 define i32 @main() {
 	%A = and i8 4, 8		; <i8> [#uses=2]
diff --git a/llvm/test/ExecutionEngine/test-loop.ll b/llvm/test/ExecutionEngine/test-loop.ll
index f0e6f7a6f9c..e951a14ed2e 100644
--- a/llvm/test/ExecutionEngine/test-loop.ll
+++ b/llvm/test/ExecutionEngine/test-loop.ll
@@ -1,4 +1,4 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 
 define i32 @main() {
 ; <label>:0
diff --git a/llvm/test/ExecutionEngine/test-phi.ll b/llvm/test/ExecutionEngine/test-phi.ll
index c5848a8b5cc..c5bdfd513ed 100644
--- a/llvm/test/ExecutionEngine/test-phi.ll
+++ b/llvm/test/ExecutionEngine/test-phi.ll
@@ -1,4 +1,4 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 
 ; test phi node
 @Y = global i32 6		; <i32*> [#uses=1]
diff --git a/llvm/test/ExecutionEngine/test-ret.ll b/llvm/test/ExecutionEngine/test-ret.ll
index beec3996075..025f53e5cb9 100644
--- a/llvm/test/ExecutionEngine/test-ret.ll
+++ b/llvm/test/ExecutionEngine/test-ret.ll
@@ -1,4 +1,4 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 
 ; test return instructions
 define void @test1() {
diff --git a/llvm/test/ExecutionEngine/test-setcond-fp.ll b/llvm/test/ExecutionEngine/test-setcond-fp.ll
index d1d6d05b335..68276e617a4 100644
--- a/llvm/test/ExecutionEngine/test-setcond-fp.ll
+++ b/llvm/test/ExecutionEngine/test-setcond-fp.ll
@@ -1,4 +1,4 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 
 
 define i32 @main() {
diff --git a/llvm/test/ExecutionEngine/test-setcond-int.ll b/llvm/test/ExecutionEngine/test-setcond-int.ll
index f59d325a5b5..48dc02198ec 100644
--- a/llvm/test/ExecutionEngine/test-setcond-int.ll
+++ b/llvm/test/ExecutionEngine/test-setcond-int.ll
@@ -1,4 +1,4 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 
 define i32 @main() {
 	%int1 = add i32 0, 0		; <i32> [#uses=6]
diff --git a/llvm/test/ExecutionEngine/test-shift.ll b/llvm/test/ExecutionEngine/test-shift.ll
index d0fb90a4275..590e2620689 100644
--- a/llvm/test/ExecutionEngine/test-shift.ll
+++ b/llvm/test/ExecutionEngine/test-shift.ll
@@ -1,4 +1,4 @@
-; RUN: lli %s > /dev/null
+; RUN: %lli %s > /dev/null
 
 define i32 @main() {
 	%shamt = add i8 0, 1		; <i8> [#uses=8]
diff --git a/llvm/test/lit.cfg b/llvm/test/lit.cfg
index 6bc170cdf94..f3302a2d6c0 100644
--- a/llvm/test/lit.cfg
+++ b/llvm/test/lit.cfg
@@ -141,6 +141,29 @@ for line in open(os.path.join(config.llvm_obj_root, 'test', 'site.exp')):
     if m:
         site_exp[m.group(1)] = m.group(2)
 
+# Provide target_triple for use in XFAIL and XTARGET.
+config.target_triple = site_exp['target_triplet']
+
+# When running under valgrind, we mangle '-vg' or '-vg_leak' onto the end of the
+# triple so we can check it with XFAIL and XTARGET.
+config.target_triple += lit.valgrindTriple
+
+# Process jit implementation option
+jit_impl_cfg = lit.params.get('jit_impl', None)
+if jit_impl_cfg == 'mcjit':
+  # When running with mcjit, mangle -mcjit into target triple
+  # and add -use-mcjit flag to lli invocation
+  if 'i686' in config.target_triple:
+    config.target_triple += jit_impl_cfg + '-ia32'
+  elif 'x86_64' in config.target_triple:
+    config.target_triple += jit_impl_cfg + '-ia64'
+  else:
+    config.target_triple += jit_impl_cfg
+
+  config.substitutions.append( ('%lli', 'lli -use-mcjit') )
+else:
+  config.substitutions.append( ('%lli', 'lli') )
+
 # Add substitutions.
 for sub in ['link', 'shlibext', 'ocamlopt', 'llvmshlibdir']:
     config.substitutions.append(('%' + sub, site_exp[sub]))
@@ -197,13 +220,6 @@ for pattern in [r"\bbugpoint\b(?!-)",   r"(?<!/|-)\bclang\b(?!-)",
 
 excludes = []
 
-# Provide target_triple for use in XFAIL and XTARGET.
-config.target_triple = site_exp['target_triplet']
-
-# When running under valgrind, we mangle '-vg' or '-vg_leak' onto the end of the
-# triple so we can check it with XFAIL and XTARGET.
-config.target_triple += lit.valgrindTriple
-
 # Provide llvm_supports_target for use in local configs.
 targets = set(site_exp["TARGETS_TO_BUILD"].split())
 def llvm_supports_target(name):