From b9fd9ed37ebf24d0935fe597cc8ea13f77288636 Mon Sep 17 00:00:00 2001
From: Eric Christopher <echristo@gmail.com>
Date: Thu, 7 Aug 2014 22:02:54 +0000
Subject: Temporarily Revert "Nuke the old JIT." as it's not quite ready to be
 deleted. This will be reapplied as soon as possible and before the 3.6 branch
 date at any rate.

Approved by Jim Grosbach, Lang Hames, Rafael Espindola.

This reverts commits r215111, 215115, 215116, 215117, 215136.

llvm-svn: 215154
---
 llvm/test/ExecutionEngine/2002-12-16-ArgTest.ll                     | 1 +
 llvm/test/ExecutionEngine/2003-01-04-ArgumentBug.ll                 | 1 +
 llvm/test/ExecutionEngine/2003-01-04-LoopTest.ll                    | 1 +
 llvm/test/ExecutionEngine/2003-01-15-AlignmentTest.ll               | 1 +
 llvm/test/ExecutionEngine/2003-05-06-LivenessClobber.ll             | 1 +
 llvm/test/ExecutionEngine/2003-05-07-ArgumentTest.ll                | 1 +
 llvm/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll             | 1 +
 llvm/test/ExecutionEngine/2003-08-21-EnvironmentTest.ll             | 1 +
 llvm/test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll     | 1 +
 .../2003-10-18-PHINode-ConstantExpr-CondCode-Failure.ll             | 1 +
 llvm/test/ExecutionEngine/2005-12-02-TailCallBug.ll                 | 1 +
 llvm/test/ExecutionEngine/MCJIT/2002-12-16-ArgTest.ll               | 2 +-
 llvm/test/ExecutionEngine/MCJIT/2003-01-04-ArgumentBug.ll           | 2 +-
 llvm/test/ExecutionEngine/MCJIT/2003-01-04-LoopTest.ll              | 2 +-
 llvm/test/ExecutionEngine/MCJIT/2003-01-04-PhiTest.ll               | 2 +-
 llvm/test/ExecutionEngine/MCJIT/2003-01-09-SARTest.ll               | 2 +-
 llvm/test/ExecutionEngine/MCJIT/2003-01-10-FUCOM.ll                 | 2 +-
 llvm/test/ExecutionEngine/MCJIT/2003-01-15-AlignmentTest.ll         | 2 +-
 llvm/test/ExecutionEngine/MCJIT/2003-05-06-LivenessClobber.ll       | 2 +-
 llvm/test/ExecutionEngine/MCJIT/2003-05-07-ArgumentTest.ll          | 2 +-
 llvm/test/ExecutionEngine/MCJIT/2003-05-11-PHIRegAllocBug.ll        | 2 +-
 llvm/test/ExecutionEngine/MCJIT/2003-06-04-bzip2-bug.ll             | 2 +-
 llvm/test/ExecutionEngine/MCJIT/2003-06-05-PHIBug.ll                | 2 +-
 llvm/test/ExecutionEngine/MCJIT/2003-08-15-AllocaAssertion.ll       | 2 +-
 llvm/test/ExecutionEngine/MCJIT/2003-08-21-EnvironmentTest.ll       | 2 +-
 .../ExecutionEngine/MCJIT/2003-08-23-RegisterAllocatePhysReg.ll     | 2 +-
 .../MCJIT/2003-10-18-PHINode-ConstantExpr-CondCode-Failure.ll       | 2 +-
 llvm/test/ExecutionEngine/MCJIT/2005-12-02-TailCallBug.ll           | 2 +-
 llvm/test/ExecutionEngine/MCJIT/2007-12-10-APIntLoadStore.ll        | 2 +-
 llvm/test/ExecutionEngine/MCJIT/2008-06-05-APInt-OverAShr.ll        | 2 +-
 llvm/test/ExecutionEngine/MCJIT/2010-01-15-UndefValue.ll            | 2 +-
 llvm/test/ExecutionEngine/MCJIT/2013-04-04-RelocAddend.ll           | 2 +-
 llvm/test/ExecutionEngine/MCJIT/cross-module-a.ll                   | 2 +-
 llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll            | 2 +-
 llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll                        | 2 +-
 llvm/test/ExecutionEngine/MCJIT/eh-sm-pic.ll                        | 2 +-
 llvm/test/ExecutionEngine/MCJIT/eh.ll                               | 2 +-
 llvm/test/ExecutionEngine/MCJIT/fpbitcast.ll                        | 2 +-
 llvm/test/ExecutionEngine/MCJIT/hello-sm-pic.ll                     | 2 +-
 llvm/test/ExecutionEngine/MCJIT/hello.ll                            | 2 +-
 llvm/test/ExecutionEngine/MCJIT/hello2.ll                           | 2 +-
 llvm/test/ExecutionEngine/MCJIT/load-object-a.ll                    | 6 +++---
 llvm/test/ExecutionEngine/MCJIT/multi-module-a.ll                   | 2 +-
 llvm/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll                | 2 +-
 llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll            | 2 +-
 llvm/test/ExecutionEngine/MCJIT/non-extern-addend-smallcodemodel.ll | 2 +-
 llvm/test/ExecutionEngine/MCJIT/non-extern-addend.ll                | 2 +-
 llvm/test/ExecutionEngine/MCJIT/pr13727.ll                          | 2 +-
 llvm/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll            | 2 +-
 llvm/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll     | 2 +-
 llvm/test/ExecutionEngine/MCJIT/remote/multi-module-a.ll            | 2 +-
 llvm/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll     | 2 +-
 llvm/test/ExecutionEngine/MCJIT/remote/simpletest-remote.ll         | 2 +-
 llvm/test/ExecutionEngine/MCJIT/remote/stubs-remote.ll              | 2 +-
 llvm/test/ExecutionEngine/MCJIT/remote/stubs-sm-pic.ll              | 2 +-
 .../test/ExecutionEngine/MCJIT/remote/test-common-symbols-remote.ll | 2 +-
 llvm/test/ExecutionEngine/MCJIT/remote/test-data-align-remote.ll    | 2 +-
 .../MCJIT/remote/test-fp-no-external-funcs-remote.ll                | 2 +-
 .../ExecutionEngine/MCJIT/remote/test-global-init-nonzero-remote.ll | 2 +-
 .../ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll | 2 +-
 llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-remote.ll     | 2 +-
 llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll     | 2 +-
 llvm/test/ExecutionEngine/MCJIT/simplesttest.ll                     | 2 +-
 llvm/test/ExecutionEngine/MCJIT/simpletest.ll                       | 2 +-
 llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll                     | 2 +-
 llvm/test/ExecutionEngine/MCJIT/stubs.ll                            | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-arith.ll                       | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-branch.ll                      | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-call-no-external-funcs.ll      | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-call.ll                        | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-cast.ll                        | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-common-symbols-alignment.ll    | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-common-symbols.ll              | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-constantexpr.ll                | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-data-align.ll                  | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-fp-no-external-funcs.ll        | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-fp.ll                          | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-global-ctors.ll                | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll  | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero.ll         | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-global.ll                      | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-loadstore.ll                   | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-local.ll                       | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-logical.ll                     | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-loop.ll                        | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-phi.ll                         | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll            | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc.ll                   | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-ret.ll                         | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-return.ll                      | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-setcond-fp.ll                  | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-setcond-int.ll                 | 2 +-
 llvm/test/ExecutionEngine/MCJIT/test-shift.ll                       | 2 +-
 llvm/test/ExecutionEngine/hello.ll                                  | 1 +
 llvm/test/ExecutionEngine/hello2.ll                                 | 1 +
 llvm/test/ExecutionEngine/mov64zext32.ll                            | 1 +
 llvm/test/ExecutionEngine/simpletest.ll                             | 1 +
 llvm/test/ExecutionEngine/stubs.ll                                  | 1 +
 llvm/test/ExecutionEngine/test-call-no-external-funcs.ll            | 1 +
 llvm/test/ExecutionEngine/test-call.ll                              | 1 +
 llvm/test/ExecutionEngine/test-common-symbols.ll                    | 1 +
 llvm/test/ExecutionEngine/test-fp-no-external-funcs.ll              | 1 +
 llvm/test/ExecutionEngine/test-fp.ll                                | 1 +
 llvm/test/ExecutionEngine/test-global-init-nonzero.ll               | 1 +
 llvm/test/ExecutionEngine/test-global.ll                            | 1 +
 llvm/test/ExecutionEngine/test-loadstore.ll                         | 1 +
 llvm/test/ExecutionEngine/test-local.ll                             | 1 +
 107 files changed, 109 insertions(+), 84 deletions(-)

(limited to 'llvm/test/ExecutionEngine')

diff --git a/llvm/test/ExecutionEngine/2002-12-16-ArgTest.ll b/llvm/test/ExecutionEngine/2002-12-16-ArgTest.ll
index eb2fe8c0483..4c03519a85a 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
+; XFAIL: arm
 
 @.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 68fdefefa54..3182193453a 100644
--- a/llvm/test/ExecutionEngine/2003-01-04-ArgumentBug.ll
+++ b/llvm/test/ExecutionEngine/2003-01-04-ArgumentBug.ll
@@ -1,4 +1,5 @@
 ; RUN: %lli %s > /dev/null
+; XFAIL: arm
 
 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 5a0311dd939..3e27e0607ba 100644
--- a/llvm/test/ExecutionEngine/2003-01-04-LoopTest.ll
+++ b/llvm/test/ExecutionEngine/2003-01-04-LoopTest.ll
@@ -1,4 +1,5 @@
 ; RUN: %lli %s > /dev/null
+; XFAIL: arm
 
 define i32 @main() {
 	call i32 @mylog( i32 4 )		; <i32>:1 [#uses=0]
diff --git a/llvm/test/ExecutionEngine/2003-01-15-AlignmentTest.ll b/llvm/test/ExecutionEngine/2003-01-15-AlignmentTest.ll
index 038d7500101..80e19ba1932 100644
--- a/llvm/test/ExecutionEngine/2003-01-15-AlignmentTest.ll
+++ b/llvm/test/ExecutionEngine/2003-01-15-AlignmentTest.ll
@@ -1,4 +1,5 @@
 ; RUN: %lli %s > /dev/null
+; XFAIL: arm
 
 define i32 @bar(i8* %X) {
         ; pointer should be 4 byte aligned!
diff --git a/llvm/test/ExecutionEngine/2003-05-06-LivenessClobber.ll b/llvm/test/ExecutionEngine/2003-05-06-LivenessClobber.ll
index 576ef7cf638..6f61aa68b67 100644
--- a/llvm/test/ExecutionEngine/2003-05-06-LivenessClobber.ll
+++ b/llvm/test/ExecutionEngine/2003-05-06-LivenessClobber.ll
@@ -1,6 +1,7 @@
 ; This testcase should return with an exit code of 1.
 ;
 ; RUN: not %lli %s
+; XFAIL: arm
 
 @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 42db5fe93fc..236be18d96e 100644
--- a/llvm/test/ExecutionEngine/2003-05-07-ArgumentTest.ll
+++ b/llvm/test/ExecutionEngine/2003-05-07-ArgumentTest.ll
@@ -1,4 +1,5 @@
 ; RUN: %lli %s test
+; XFAIL: arm
 
 declare i32 @puts(i8*)
 
diff --git a/llvm/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll b/llvm/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll
index bee409c1441..22dd4ccb44c 100644
--- a/llvm/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll
+++ b/llvm/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll
@@ -1,4 +1,5 @@
 ; RUN: %lli %s > /dev/null
+; XFAIL: arm
 
 ; This testcase failed to work because two variable sized allocas confused the
 ; local register allocator.
diff --git a/llvm/test/ExecutionEngine/2003-08-21-EnvironmentTest.ll b/llvm/test/ExecutionEngine/2003-08-21-EnvironmentTest.ll
index 63303fcff7c..60dc3d6b7d4 100644
--- a/llvm/test/ExecutionEngine/2003-08-21-EnvironmentTest.ll
+++ b/llvm/test/ExecutionEngine/2003-08-21-EnvironmentTest.ll
@@ -1,4 +1,5 @@
 ; RUN: %lli %s > /dev/null
+; XFAIL: arm
 
 ;
 ; 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 8fb1bbbe9d7..04a5e1741bb 100644
--- a/llvm/test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll
+++ b/llvm/test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll
@@ -1,4 +1,5 @@
 ; RUN: %lli %s > /dev/null
+; XFAIL: arm
 
 ; This testcase exposes a bug in the local register allocator where it runs out
 ; of registers (due to too many overlapping live ranges), but then attempts to
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 6513540903e..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,5 @@
 ; 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 2ac8ad1795d..8523b5e3f5b 100644
--- a/llvm/test/ExecutionEngine/2005-12-02-TailCallBug.ll
+++ b/llvm/test/ExecutionEngine/2005-12-02-TailCallBug.ll
@@ -1,5 +1,6 @@
 ; PR672
 ; RUN: %lli %s
+; XFAIL: arm
 
 define i32 @main() {
 	%f = bitcast i32 (i32, i32*, i32)* @check_tail to i32*		; <i32*> [#uses=1]
diff --git a/llvm/test/ExecutionEngine/MCJIT/2002-12-16-ArgTest.ll b/llvm/test/ExecutionEngine/MCJIT/2002-12-16-ArgTest.ll
index eb2fe8c0483..babd8f6a780 100644
--- a/llvm/test/ExecutionEngine/MCJIT/2002-12-16-ArgTest.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/2002-12-16-ArgTest.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 @.LC0 = internal global [10 x i8] c"argc: %d\0A\00"		; <[10 x i8]*> [#uses=1]
 
diff --git a/llvm/test/ExecutionEngine/MCJIT/2003-01-04-ArgumentBug.ll b/llvm/test/ExecutionEngine/MCJIT/2003-01-04-ArgumentBug.ll
index 68fdefefa54..bbb81b88b16 100644
--- a/llvm/test/ExecutionEngine/MCJIT/2003-01-04-ArgumentBug.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/2003-01-04-ArgumentBug.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 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/MCJIT/2003-01-04-LoopTest.ll b/llvm/test/ExecutionEngine/MCJIT/2003-01-04-LoopTest.ll
index 5a0311dd939..7574267bdcd 100644
--- a/llvm/test/ExecutionEngine/MCJIT/2003-01-04-LoopTest.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/2003-01-04-LoopTest.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 define i32 @main() {
 	call i32 @mylog( i32 4 )		; <i32>:1 [#uses=0]
diff --git a/llvm/test/ExecutionEngine/MCJIT/2003-01-04-PhiTest.ll b/llvm/test/ExecutionEngine/MCJIT/2003-01-04-PhiTest.ll
index 48576e7c83e..261939ad202 100644
--- a/llvm/test/ExecutionEngine/MCJIT/2003-01-04-PhiTest.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/2003-01-04-PhiTest.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 define i32 @main() {
 ; <label>:0
diff --git a/llvm/test/ExecutionEngine/MCJIT/2003-01-09-SARTest.ll b/llvm/test/ExecutionEngine/MCJIT/2003-01-09-SARTest.ll
index ed58e118437..f76f9983282 100644
--- a/llvm/test/ExecutionEngine/MCJIT/2003-01-09-SARTest.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/2003-01-09-SARTest.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 ; We were accidentally inverting the signedness of right shifts.  Whoops.
 
diff --git a/llvm/test/ExecutionEngine/MCJIT/2003-01-10-FUCOM.ll b/llvm/test/ExecutionEngine/MCJIT/2003-01-10-FUCOM.ll
index 4960e596900..2b83bb9e43e 100644
--- a/llvm/test/ExecutionEngine/MCJIT/2003-01-10-FUCOM.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/2003-01-10-FUCOM.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 define i32 @main() {
 	%X = fadd double 0.000000e+00, 1.000000e+00		; <double> [#uses=1]
diff --git a/llvm/test/ExecutionEngine/MCJIT/2003-01-15-AlignmentTest.ll b/llvm/test/ExecutionEngine/MCJIT/2003-01-15-AlignmentTest.ll
index 038d7500101..d1ca2bee399 100644
--- a/llvm/test/ExecutionEngine/MCJIT/2003-01-15-AlignmentTest.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/2003-01-15-AlignmentTest.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 define i32 @bar(i8* %X) {
         ; pointer should be 4 byte aligned!
diff --git a/llvm/test/ExecutionEngine/MCJIT/2003-05-06-LivenessClobber.ll b/llvm/test/ExecutionEngine/MCJIT/2003-05-06-LivenessClobber.ll
index 576ef7cf638..20ef0ff95cd 100644
--- a/llvm/test/ExecutionEngine/MCJIT/2003-05-06-LivenessClobber.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/2003-05-06-LivenessClobber.ll
@@ -1,6 +1,6 @@
 ; This testcase should return with an exit code of 1.
 ;
-; RUN: not %lli %s
+; RUN: not %lli_mcjit %s
 
 @test = global i64 0		; <i64*> [#uses=1]
 
diff --git a/llvm/test/ExecutionEngine/MCJIT/2003-05-07-ArgumentTest.ll b/llvm/test/ExecutionEngine/MCJIT/2003-05-07-ArgumentTest.ll
index 42db5fe93fc..c7bcc5450b0 100644
--- a/llvm/test/ExecutionEngine/MCJIT/2003-05-07-ArgumentTest.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/2003-05-07-ArgumentTest.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s test
+; RUN: %lli_mcjit %s test
 
 declare i32 @puts(i8*)
 
diff --git a/llvm/test/ExecutionEngine/MCJIT/2003-05-11-PHIRegAllocBug.ll b/llvm/test/ExecutionEngine/MCJIT/2003-05-11-PHIRegAllocBug.ll
index 45279adbe57..0512575d1b4 100644
--- a/llvm/test/ExecutionEngine/MCJIT/2003-05-11-PHIRegAllocBug.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/2003-05-11-PHIRegAllocBug.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 target datalayout = "e-p:32:32"
 
diff --git a/llvm/test/ExecutionEngine/MCJIT/2003-06-04-bzip2-bug.ll b/llvm/test/ExecutionEngine/MCJIT/2003-06-04-bzip2-bug.ll
index 4342aa44097..c292a818a09 100644
--- a/llvm/test/ExecutionEngine/MCJIT/2003-06-04-bzip2-bug.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/2003-06-04-bzip2-bug.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 ; Testcase distilled from 256.bzip2.
 
diff --git a/llvm/test/ExecutionEngine/MCJIT/2003-06-05-PHIBug.ll b/llvm/test/ExecutionEngine/MCJIT/2003-06-05-PHIBug.ll
index 03b66c43a1c..c0a83f5ecbd 100644
--- a/llvm/test/ExecutionEngine/MCJIT/2003-06-05-PHIBug.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/2003-06-05-PHIBug.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 ; Testcase distilled from 256.bzip2.
 
diff --git a/llvm/test/ExecutionEngine/MCJIT/2003-08-15-AllocaAssertion.ll b/llvm/test/ExecutionEngine/MCJIT/2003-08-15-AllocaAssertion.ll
index bee409c1441..55ce689b865 100644
--- a/llvm/test/ExecutionEngine/MCJIT/2003-08-15-AllocaAssertion.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/2003-08-15-AllocaAssertion.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 ; This testcase failed to work because two variable sized allocas confused the
 ; local register allocator.
diff --git a/llvm/test/ExecutionEngine/MCJIT/2003-08-21-EnvironmentTest.ll b/llvm/test/ExecutionEngine/MCJIT/2003-08-21-EnvironmentTest.ll
index 63303fcff7c..2e999967a2c 100644
--- a/llvm/test/ExecutionEngine/MCJIT/2003-08-21-EnvironmentTest.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/2003-08-21-EnvironmentTest.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 ;
 ; Regression Test: EnvironmentTest.ll
diff --git a/llvm/test/ExecutionEngine/MCJIT/2003-08-23-RegisterAllocatePhysReg.ll b/llvm/test/ExecutionEngine/MCJIT/2003-08-23-RegisterAllocatePhysReg.ll
index 8fb1bbbe9d7..659901b9b36 100644
--- a/llvm/test/ExecutionEngine/MCJIT/2003-08-23-RegisterAllocatePhysReg.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/2003-08-23-RegisterAllocatePhysReg.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 ; This testcase exposes a bug in the local register allocator where it runs out
 ; of registers (due to too many overlapping live ranges), but then attempts to
diff --git a/llvm/test/ExecutionEngine/MCJIT/2003-10-18-PHINode-ConstantExpr-CondCode-Failure.ll b/llvm/test/ExecutionEngine/MCJIT/2003-10-18-PHINode-ConstantExpr-CondCode-Failure.ll
index 6513540903e..68e31a7074d 100644
--- a/llvm/test/ExecutionEngine/MCJIT/2003-10-18-PHINode-ConstantExpr-CondCode-Failure.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/2003-10-18-PHINode-ConstantExpr-CondCode-Failure.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 @A = global i32 0		; <i32*> [#uses=1]
 
diff --git a/llvm/test/ExecutionEngine/MCJIT/2005-12-02-TailCallBug.ll b/llvm/test/ExecutionEngine/MCJIT/2005-12-02-TailCallBug.ll
index 6a3c0f2a31c..0bc010584f1 100644
--- a/llvm/test/ExecutionEngine/MCJIT/2005-12-02-TailCallBug.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/2005-12-02-TailCallBug.ll
@@ -1,5 +1,5 @@
 ; PR672
-; RUN: %lli %s
+; RUN: %lli_mcjit %s
 ; XFAIL: mcjit-ia32
 
 define i32 @main() {
diff --git a/llvm/test/ExecutionEngine/MCJIT/2007-12-10-APIntLoadStore.ll b/llvm/test/ExecutionEngine/MCJIT/2007-12-10-APIntLoadStore.ll
index 418361163fc..43188f2be48 100644
--- a/llvm/test/ExecutionEngine/MCJIT/2007-12-10-APIntLoadStore.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/2007-12-10-APIntLoadStore.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -force-interpreter %s
+; RUN: %lli_mcjit -force-interpreter %s
 ; PR1836
 
 define i32 @main() {
diff --git a/llvm/test/ExecutionEngine/MCJIT/2008-06-05-APInt-OverAShr.ll b/llvm/test/ExecutionEngine/MCJIT/2008-06-05-APInt-OverAShr.ll
index 349db69e4c6..9897602250a 100644
--- a/llvm/test/ExecutionEngine/MCJIT/2008-06-05-APInt-OverAShr.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/2008-06-05-APInt-OverAShr.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -force-interpreter=true %s | FileCheck %s
+; RUN: %lli_mcjit -force-interpreter=true %s | FileCheck %s
 ; CHECK: 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"
diff --git a/llvm/test/ExecutionEngine/MCJIT/2010-01-15-UndefValue.ll b/llvm/test/ExecutionEngine/MCJIT/2010-01-15-UndefValue.ll
index 8bf03de321b..7ed0e3870a3 100644
--- a/llvm/test/ExecutionEngine/MCJIT/2010-01-15-UndefValue.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/2010-01-15-UndefValue.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -force-interpreter=true %s > /dev/null
+; RUN: %lli_mcjit -force-interpreter=true %s > /dev/null
 
 define i32 @main() {
        %a = add i32 0, undef
diff --git a/llvm/test/ExecutionEngine/MCJIT/2013-04-04-RelocAddend.ll b/llvm/test/ExecutionEngine/MCJIT/2013-04-04-RelocAddend.ll
index d9ff347b078..3f402c59311 100644
--- a/llvm/test/ExecutionEngine/MCJIT/2013-04-04-RelocAddend.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/2013-04-04-RelocAddend.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s
+; RUN: %lli_mcjit %s
 ;
 ; Verify relocations to global symbols with addend work correctly.
 ;
diff --git a/llvm/test/ExecutionEngine/MCJIT/cross-module-a.ll b/llvm/test/ExecutionEngine/MCJIT/cross-module-a.ll
index 5d4e16fa4a2..fe8d3864c9b 100644
--- a/llvm/test/ExecutionEngine/MCJIT/cross-module-a.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/cross-module-a.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -extra-module=%p/Inputs/cross-module-b.ll %s > /dev/null
+; RUN: %lli_mcjit -extra-module=%p/Inputs/cross-module-b.ll %s > /dev/null
 
 declare i32 @FB()
 
diff --git a/llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll b/llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
index f37d4a86e66..ee26702dfae 100644
--- a/llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -extra-module=%p/Inputs/cross-module-b.ll -relocation-model=pic -code-model=small %s > /dev/null
+; RUN: %lli_mcjit -extra-module=%p/Inputs/cross-module-b.ll -relocation-model=pic -code-model=small %s > /dev/null
 ; XFAIL: mips, i686, i386, arm
 
 declare i32 @FB()
diff --git a/llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll b/llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
index bd097f29038..539c890f918 100644
--- a/llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -relocation-model=pic -code-model=large %s
+; RUN: %lli_mcjit -relocation-model=pic -code-model=large %s
 ; XFAIL: cygwin, win32, mingw, mips, i686, i386, aarch64, arm
 declare i8* @__cxa_allocate_exception(i64)
 declare void @__cxa_throw(i8*, i8*, i8*)
diff --git a/llvm/test/ExecutionEngine/MCJIT/eh-sm-pic.ll b/llvm/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
index f3e61dc8570..00c2bb056ff 100644
--- a/llvm/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/eh-sm-pic.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -relocation-model=pic -code-model=small %s
+; RUN: %lli_mcjit -relocation-model=pic -code-model=small %s
 ; XFAIL: cygwin, win32, mingw, mips, i686, i386, darwin, aarch64, arm
 declare i8* @__cxa_allocate_exception(i64)
 declare void @__cxa_throw(i8*, i8*, i8*)
diff --git a/llvm/test/ExecutionEngine/MCJIT/eh.ll b/llvm/test/ExecutionEngine/MCJIT/eh.ll
index aa81bb52a59..c2135736ad4 100644
--- a/llvm/test/ExecutionEngine/MCJIT/eh.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/eh.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s
+; RUN: %lli_mcjit %s
 ; XFAIL: arm, cygwin, win32, mingw
 declare i8* @__cxa_allocate_exception(i64)
 declare void @__cxa_throw(i8*, i8*, i8*)
diff --git a/llvm/test/ExecutionEngine/MCJIT/fpbitcast.ll b/llvm/test/ExecutionEngine/MCJIT/fpbitcast.ll
index e6d06f83db4..ea39617547a 100644
--- a/llvm/test/ExecutionEngine/MCJIT/fpbitcast.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/fpbitcast.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -force-interpreter=true %s | FileCheck %s
+; RUN: %lli_mcjit -force-interpreter=true %s | FileCheck %s
 ; CHECK: 40091eb8
 
 define i32 @test(double %x) {
diff --git a/llvm/test/ExecutionEngine/MCJIT/hello-sm-pic.ll b/llvm/test/ExecutionEngine/MCJIT/hello-sm-pic.ll
index 7db60f7aeeb..115846c7864 100644
--- a/llvm/test/ExecutionEngine/MCJIT/hello-sm-pic.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/hello-sm-pic.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -relocation-model=pic -code-model=small %s > /dev/null
+; RUN: %lli_mcjit -relocation-model=pic -code-model=small %s > /dev/null
 ; XFAIL: mips, i686, i386, darwin, aarch64, arm
 
 @.LC0 = internal global [12 x i8] c"Hello World\00"		; <[12 x i8]*> [#uses=1]
diff --git a/llvm/test/ExecutionEngine/MCJIT/hello.ll b/llvm/test/ExecutionEngine/MCJIT/hello.ll
index 47e36a58956..b74470724de 100644
--- a/llvm/test/ExecutionEngine/MCJIT/hello.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/hello.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 @.LC0 = internal global [12 x i8] c"Hello World\00"		; <[12 x i8]*> [#uses=1]
 
diff --git a/llvm/test/ExecutionEngine/MCJIT/hello2.ll b/llvm/test/ExecutionEngine/MCJIT/hello2.ll
index 13b25884fee..cd033d50947 100644
--- a/llvm/test/ExecutionEngine/MCJIT/hello2.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/hello2.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 @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/MCJIT/load-object-a.ll b/llvm/test/ExecutionEngine/MCJIT/load-object-a.ll
index 080bf6cf584..9d27e41c6a5 100644
--- a/llvm/test/ExecutionEngine/MCJIT/load-object-a.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/load-object-a.ll
@@ -1,20 +1,20 @@
 ; This first line will generate the .o files for the next run line
 ; RUN: rm -rf %t.cachedir %t.cachedir2 %t.cachedir3
 ; RUN: mkdir -p %t.cachedir %t.cachedir2 %t.cachedir3
-; RUN: %lli -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -enable-cache-manager -object-cache-dir=%t.cachedir %s
+; RUN: %lli_mcjit -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -enable-cache-manager -object-cache-dir=%t.cachedir %s
 
 ; Collect generated objects.
 ; RUN: find %t.cachedir -type f -name 'multi-module-?.o' -exec mv -v '{}' %t.cachedir2 ';'
 
 ; This line tests MCJIT object loading
-; RUN: %lli -extra-object=%t.cachedir2/multi-module-b.o -extra-object=%t.cachedir2/multi-module-c.o %s
+; RUN: %lli_mcjit -extra-object=%t.cachedir2/multi-module-b.o -extra-object=%t.cachedir2/multi-module-c.o %s
 
 ; These lines put the object files into an archive
 ; RUN: llvm-ar r %t.cachedir3/load-object.a %t.cachedir2/multi-module-b.o
 ; RUN: llvm-ar r %t.cachedir3/load-object.a %t.cachedir2/multi-module-c.o
 
 ; This line test MCJIT archive loading
-; RUN: %lli -extra-archive=%t.cachedir3/load-object.a %s
+; RUN: %lli_mcjit -extra-archive=%t.cachedir3/load-object.a %s
 
 declare i32 @FB()
 
diff --git a/llvm/test/ExecutionEngine/MCJIT/multi-module-a.ll b/llvm/test/ExecutionEngine/MCJIT/multi-module-a.ll
index dc3154c7b30..8848ca6117f 100644
--- a/llvm/test/ExecutionEngine/MCJIT/multi-module-a.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/multi-module-a.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll %s > /dev/null
+; RUN: %lli_mcjit -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll %s > /dev/null
 
 declare i32 @FB()
 
diff --git a/llvm/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll b/llvm/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll
index 10cfdcd264d..66fafc924ac 100644
--- a/llvm/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -extra-module=%p/Inputs/multi-module-eh-b.ll %s
+; RUN: %lli_mcjit -extra-module=%p/Inputs/multi-module-eh-b.ll %s
 ; XFAIL: arm, cygwin, win32, mingw
 declare i8* @__cxa_allocate_exception(i64)
 declare void @__cxa_throw(i8*, i8*, i8*)
diff --git a/llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll b/llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
index e4395c433fe..f2fa59f4821 100644
--- a/llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -relocation-model=pic -code-model=small %s > /dev/null
+; RUN: %lli_mcjit -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -relocation-model=pic -code-model=small %s > /dev/null
 ; XFAIL: mips, i686, i386, arm
 
 declare i32 @FB()
diff --git a/llvm/test/ExecutionEngine/MCJIT/non-extern-addend-smallcodemodel.ll b/llvm/test/ExecutionEngine/MCJIT/non-extern-addend-smallcodemodel.ll
index 03de30a6419..21db67dad66 100644
--- a/llvm/test/ExecutionEngine/MCJIT/non-extern-addend-smallcodemodel.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/non-extern-addend-smallcodemodel.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -code-model=small %s > /dev/null
+; RUN: %lli_mcjit -code-model=small %s > /dev/null
 ; XFAIL: mips
 ;
 ; FIXME: Merge this file with non-extern-addend.ll once AArch64 supports PC-rel
diff --git a/llvm/test/ExecutionEngine/MCJIT/non-extern-addend.ll b/llvm/test/ExecutionEngine/MCJIT/non-extern-addend.ll
index 72e67ae93fe..e0827f6add9 100644
--- a/llvm/test/ExecutionEngine/MCJIT/non-extern-addend.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/non-extern-addend.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 define i32 @foo(i32 %x, i32 %y, double %d) {
 entry:
diff --git a/llvm/test/ExecutionEngine/MCJIT/pr13727.ll b/llvm/test/ExecutionEngine/MCJIT/pr13727.ll
index 6f5ae3999bc..1c719c5b7c2 100644
--- a/llvm/test/ExecutionEngine/MCJIT/pr13727.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/pr13727.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -O0 -disable-lazy-compilation=false %s
+; RUN: %lli_mcjit -O0 -disable-lazy-compilation=false %s
 
 ; The intention of this test is to verify that symbols mapped to COMMON in ELF
 ; work as expected.
diff --git a/llvm/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll b/llvm/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll
index c31572361d3..b540bfa3bd6 100644
--- a/llvm/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -extra-module=%p/Inputs/cross-module-b.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
+; RUN: %lli_mcjit -extra-module=%p/Inputs/cross-module-b.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
 
 declare i32 @FB()
 
diff --git a/llvm/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll b/llvm/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll
index d47fc6cffbb..589ba2f6d38 100644
--- a/llvm/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -extra-module=%p/Inputs/cross-module-b.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext -relocation-model=pic -code-model=small %s > /dev/null
+; RUN: %lli_mcjit -extra-module=%p/Inputs/cross-module-b.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext -relocation-model=pic -code-model=small %s > /dev/null
 ; XFAIL: mips, i686, i386, arm
 
 declare i32 @FB()
diff --git a/llvm/test/ExecutionEngine/MCJIT/remote/multi-module-a.ll b/llvm/test/ExecutionEngine/MCJIT/remote/multi-module-a.ll
index 0fd363b4447..fbbb8bdf4bc 100644
--- a/llvm/test/ExecutionEngine/MCJIT/remote/multi-module-a.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/remote/multi-module-a.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
+; RUN: %lli_mcjit -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
 
 declare i32 @FB()
 
diff --git a/llvm/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll b/llvm/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll
index d248c4b2a94..9c231695991 100644
--- a/llvm/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext -relocation-model=pic -code-model=small %s > /dev/null
+; RUN: %lli_mcjit -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext -relocation-model=pic -code-model=small %s > /dev/null
 ; XFAIL: mips, i686, i386, arm
 
 declare i32 @FB()
diff --git a/llvm/test/ExecutionEngine/MCJIT/remote/simpletest-remote.ll b/llvm/test/ExecutionEngine/MCJIT/remote/simpletest-remote.ll
index 30b4dd8e7ab..6c8ab3d5369 100644
--- a/llvm/test/ExecutionEngine/MCJIT/remote/simpletest-remote.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/remote/simpletest-remote.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
+; RUN: %lli_mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
 
 define i32 @bar() nounwind {
 	ret i32 0
diff --git a/llvm/test/ExecutionEngine/MCJIT/remote/stubs-remote.ll b/llvm/test/ExecutionEngine/MCJIT/remote/stubs-remote.ll
index da4ddc6943c..48b939bbe35 100644
--- a/llvm/test/ExecutionEngine/MCJIT/remote/stubs-remote.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/remote/stubs-remote.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -remote-mcjit -disable-lazy-compilation=false -mcjit-remote-process=lli-child-target%exeext %s
+; RUN: %lli_mcjit -remote-mcjit -disable-lazy-compilation=false -mcjit-remote-process=lli-child-target%exeext %s
 ; XFAIL: *
 ; This test should fail until remote symbol resolution is supported.
 
diff --git a/llvm/test/ExecutionEngine/MCJIT/remote/stubs-sm-pic.ll b/llvm/test/ExecutionEngine/MCJIT/remote/stubs-sm-pic.ll
index f6a16078dfa..88faf21adb1 100644
--- a/llvm/test/ExecutionEngine/MCJIT/remote/stubs-sm-pic.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/remote/stubs-sm-pic.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -remote-mcjit -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s
+; RUN: %lli_mcjit -remote-mcjit -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s
 ; XFAIL: *
 ; This function should fail until remote symbol resolution is supported.
 
diff --git a/llvm/test/ExecutionEngine/MCJIT/remote/test-common-symbols-remote.ll b/llvm/test/ExecutionEngine/MCJIT/remote/test-common-symbols-remote.ll
index 0f58710603d..e07178ed283 100644
--- a/llvm/test/ExecutionEngine/MCJIT/remote/test-common-symbols-remote.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/remote/test-common-symbols-remote.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -remote-mcjit -O0 -disable-lazy-compilation=false -mcjit-remote-process=lli-child-target%exeext %s
+; RUN: %lli_mcjit -remote-mcjit -O0 -disable-lazy-compilation=false -mcjit-remote-process=lli-child-target%exeext %s
 
 ; The intention of this test is to verify that symbols mapped to COMMON in ELF
 ; work as expected.
diff --git a/llvm/test/ExecutionEngine/MCJIT/remote/test-data-align-remote.ll b/llvm/test/ExecutionEngine/MCJIT/remote/test-data-align-remote.ll
index 435c21a4a9f..129350b63eb 100644
--- a/llvm/test/ExecutionEngine/MCJIT/remote/test-data-align-remote.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/remote/test-data-align-remote.ll
@@ -1,4 +1,4 @@
-; RUN:  %lli -remote-mcjit -O0 -mcjit-remote-process=lli-child-target%exeext %s
+; RUN:  %lli_mcjit -remote-mcjit -O0 -mcjit-remote-process=lli-child-target%exeext %s
 
 ; Check that a variable is always aligned as specified.
 
diff --git a/llvm/test/ExecutionEngine/MCJIT/remote/test-fp-no-external-funcs-remote.ll b/llvm/test/ExecutionEngine/MCJIT/remote/test-fp-no-external-funcs-remote.ll
index 9d11415c906..8eec0f22988 100644
--- a/llvm/test/ExecutionEngine/MCJIT/remote/test-fp-no-external-funcs-remote.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/remote/test-fp-no-external-funcs-remote.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
+; RUN: %lli_mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
 
 define double @test(double* %DP, double %Arg) nounwind {
 	%D = load double* %DP		; <double> [#uses=1]
diff --git a/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-remote.ll b/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-remote.ll
index 40b514fd8e1..9fbaeb79449 100644
--- a/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-remote.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-remote.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
+; RUN: %lli_mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
 
 @count = global i32 1, align 4
 
diff --git a/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll b/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
index 5119b72d448..29ab24b3933 100644
--- a/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -remote-mcjit -relocation-model=pic -code-model=small %s > /dev/null
+; RUN: %lli_mcjit -remote-mcjit -relocation-model=pic -code-model=small %s > /dev/null
 ; XFAIL: mips, aarch64, arm, i686, i386
 
 @count = global i32 1, align 4
diff --git a/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-remote.ll b/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-remote.ll
index ba3ffff2142..d62631ff50c 100644
--- a/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-remote.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-remote.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -remote-mcjit -O0 -mcjit-remote-process=lli-child-target%exeext %s
+; RUN: %lli_mcjit -remote-mcjit -O0 -mcjit-remote-process=lli-child-target%exeext %s
 
 @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1
 @ptr = global i8* getelementptr inbounds ([6 x i8]* @.str, i32 0, i32 0), align 4
diff --git a/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll b/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
index bbc71afdf7e..bad026fe7d4 100644
--- a/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -remote-mcjit -O0 -relocation-model=pic -code-model=small %s
+; RUN: %lli_mcjit -remote-mcjit -O0 -relocation-model=pic -code-model=small %s
 ; XFAIL: mips, aarch64, arm, i686, i386
 
 @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1
diff --git a/llvm/test/ExecutionEngine/MCJIT/simplesttest.ll b/llvm/test/ExecutionEngine/MCJIT/simplesttest.ll
index 85c17153275..318baf4e8ff 100644
--- a/llvm/test/ExecutionEngine/MCJIT/simplesttest.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/simplesttest.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 define i32 @main() {
 	ret i32 0
diff --git a/llvm/test/ExecutionEngine/MCJIT/simpletest.ll b/llvm/test/ExecutionEngine/MCJIT/simpletest.ll
index 167a0fdfd13..5b0f2dd3055 100644
--- a/llvm/test/ExecutionEngine/MCJIT/simpletest.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/simpletest.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 define i32 @bar() {
 	ret i32 0
diff --git a/llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll b/llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
index 9b83ed231e9..9e214f5d475 100644
--- a/llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s
+; RUN: %lli_mcjit -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s
 ; XFAIL: mips, i686, i386, aarch64, arm
 
 define i32 @main() nounwind {
diff --git a/llvm/test/ExecutionEngine/MCJIT/stubs.ll b/llvm/test/ExecutionEngine/MCJIT/stubs.ll
index b7d922f2cb6..f4aac333945 100644
--- a/llvm/test/ExecutionEngine/MCJIT/stubs.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/stubs.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -disable-lazy-compilation=false %s
+; RUN: %lli_mcjit -disable-lazy-compilation=false %s
 
 define i32 @main() nounwind {
 entry:
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-arith.ll b/llvm/test/ExecutionEngine/MCJIT/test-arith.ll
index 79f989f7265..e1cc23b9fcd 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-arith.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-arith.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 define i32 @main() {
 	%A = add i8 0, 12		; <i8> [#uses=1]
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-branch.ll b/llvm/test/ExecutionEngine/MCJIT/test-branch.ll
index 3ae55d069b3..cdf10350ec1 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-branch.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-branch.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 ; test unconditional branch
 define i32 @main() {
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-call-no-external-funcs.ll b/llvm/test/ExecutionEngine/MCJIT/test-call-no-external-funcs.ll
index c3cb93121f6..8a36cf2953f 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-call-no-external-funcs.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-call-no-external-funcs.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 define i32 @_Z14func_exit_codev() nounwind uwtable {
 entry:
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-call.ll b/llvm/test/ExecutionEngine/MCJIT/test-call.ll
index 313a6c52367..1a0f0084168 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-call.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-call.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 declare void @exit(i32)
 
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-cast.ll b/llvm/test/ExecutionEngine/MCJIT/test-cast.ll
index 667fa80a489..335ec508eff 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-cast.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-cast.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 define i32 @foo() {
 	ret i32 0
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-common-symbols-alignment.ll b/llvm/test/ExecutionEngine/MCJIT/test-common-symbols-alignment.ll
index a425b5c1e9b..989a4734233 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-common-symbols-alignment.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-common-symbols-alignment.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -O0 %s
+; RUN: %lli_mcjit -O0 %s
 
 ; This test checks that common symbols have been allocated addresses honouring
 ; the alignment requirement.
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-common-symbols.ll b/llvm/test/ExecutionEngine/MCJIT/test-common-symbols.ll
index 19e2ce58468..13ee06a6507 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-common-symbols.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-common-symbols.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -O0 -disable-lazy-compilation=false %s
+; RUN: %lli_mcjit -O0 -disable-lazy-compilation=false %s
 
 ; The intention of this test is to verify that symbols mapped to COMMON in ELF
 ; work as expected.
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-constantexpr.ll b/llvm/test/ExecutionEngine/MCJIT/test-constantexpr.ll
index d01479a86cd..8f15cbd7f7e 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-constantexpr.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-constantexpr.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 ; This tests to make sure that we can evaluate weird constant expressions
 
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-data-align.ll b/llvm/test/ExecutionEngine/MCJIT/test-data-align.ll
index f21ea2e2a45..2472d95e777 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-data-align.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-data-align.ll
@@ -1,4 +1,4 @@
-; RUN:  %lli -O0 %s
+; RUN:  %lli_mcjit -O0 %s
 
 ; Check that a variable is always aligned as specified.
 
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-fp-no-external-funcs.ll b/llvm/test/ExecutionEngine/MCJIT/test-fp-no-external-funcs.ll
index adb0550a72d..f094f3d9192 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-fp-no-external-funcs.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-fp-no-external-funcs.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 define double @test(double* %DP, double %Arg) {
 	%D = load double* %DP		; <double> [#uses=1]
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-fp.ll b/llvm/test/ExecutionEngine/MCJIT/test-fp.ll
index 2bf0210d8b0..b10e9d6c169 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-fp.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-fp.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 define double @test(double* %DP, double %Arg) {
 	%D = load double* %DP		; <double> [#uses=1]
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-global-ctors.ll b/llvm/test/ExecutionEngine/MCJIT/test-global-ctors.ll
index ec87d155d41..947d8f5d423 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-global-ctors.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-global-ctors.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 ; XFAIL: darwin
 @var = global i32 1, align 4
 @llvm.global_ctors = appending global [1 x { i32, void ()* }] [{ i32, void ()* } { i32 65535, void ()* @ctor_func }]
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll b/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
index 26bd8380802..eb031f2e4f4 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -relocation-model=pic -code-model=small %s > /dev/null
+; RUN: %lli_mcjit -relocation-model=pic -code-model=small %s > /dev/null
 ; XFAIL: mips, aarch64, arm, i686, i386
 
 @count = global i32 1, align 4
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero.ll b/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero.ll
index 3877e9a5886..b9f74b8be40 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 @count = global i32 1, align 4
 
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-global.ll b/llvm/test/ExecutionEngine/MCJIT/test-global.ll
index 69e54555564..6a8c042ef89 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-global.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-global.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 @count = global i32 0, align 4
 
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-loadstore.ll b/llvm/test/ExecutionEngine/MCJIT/test-loadstore.ll
index 1797599a9d8..90381947e8f 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-loadstore.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-loadstore.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 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/MCJIT/test-local.ll b/llvm/test/ExecutionEngine/MCJIT/test-local.ll
index ec5ba165408..d7c17342797 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-local.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-local.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 define i32 @main() nounwind uwtable {
 entry:
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-logical.ll b/llvm/test/ExecutionEngine/MCJIT/test-logical.ll
index 05b381bb53c..a03833e5c51 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-logical.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-logical.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 define i32 @main() {
 	%A = and i8 4, 8		; <i8> [#uses=2]
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-loop.ll b/llvm/test/ExecutionEngine/MCJIT/test-loop.ll
index e951a14ed2e..5ed8c4020f7 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-loop.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-loop.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 define i32 @main() {
 ; <label>:0
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-phi.ll b/llvm/test/ExecutionEngine/MCJIT/test-phi.ll
index c5bdfd513ed..4245ccabed7 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-phi.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-phi.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 ; test phi node
 @Y = global i32 6		; <i32*> [#uses=1]
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll b/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
index 21bcaef3aa8..9e067422e31 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -O0 -relocation-model=pic -code-model=small %s
+; RUN: %lli_mcjit -O0 -relocation-model=pic -code-model=small %s
 ; XFAIL: mips, aarch64, arm, i686, i386
 
 @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc.ll b/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc.ll
index f139ddf12f8..871d8bfa29e 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc.ll
@@ -1,4 +1,4 @@
-; RUN: %lli -O0 %s
+; RUN: %lli_mcjit -O0 %s
 
 @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1
 @ptr = global i8* getelementptr inbounds ([6 x i8]* @.str, i32 0, i32 0), align 4
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-ret.ll b/llvm/test/ExecutionEngine/MCJIT/test-ret.ll
index 025f53e5cb9..6bfc48052d0 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-ret.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-ret.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 ; test return instructions
 define void @test1() {
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-return.ll b/llvm/test/ExecutionEngine/MCJIT/test-return.ll
index d464a4b72d8..4db1c3fe39f 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-return.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-return.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 define i32 @main() nounwind uwtable {
 entry:
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-setcond-fp.ll b/llvm/test/ExecutionEngine/MCJIT/test-setcond-fp.ll
index 68276e617a4..b4367d0337a 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-setcond-fp.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-setcond-fp.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 
 define i32 @main() {
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-setcond-int.ll b/llvm/test/ExecutionEngine/MCJIT/test-setcond-int.ll
index 48dc02198ec..8c7d815446c 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-setcond-int.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-setcond-int.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 define i32 @main() {
 	%int1 = add i32 0, 0		; <i32> [#uses=6]
diff --git a/llvm/test/ExecutionEngine/MCJIT/test-shift.ll b/llvm/test/ExecutionEngine/MCJIT/test-shift.ll
index 590e2620689..8d9a94ef12c 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-shift.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-shift.ll
@@ -1,4 +1,4 @@
-; RUN: %lli %s > /dev/null
+; RUN: %lli_mcjit %s > /dev/null
 
 define i32 @main() {
 	%shamt = add i8 0, 1		; <i8> [#uses=8]
diff --git a/llvm/test/ExecutionEngine/hello.ll b/llvm/test/ExecutionEngine/hello.ll
index 47e36a58956..f2c4a7f414d 100644
--- a/llvm/test/ExecutionEngine/hello.ll
+++ b/llvm/test/ExecutionEngine/hello.ll
@@ -1,4 +1,5 @@
 ; RUN: %lli %s > /dev/null
+; XFAIL: arm
 
 @.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 13b25884fee..155ed41d7ca 100644
--- a/llvm/test/ExecutionEngine/hello2.ll
+++ b/llvm/test/ExecutionEngine/hello2.ll
@@ -1,4 +1,5 @@
 ; RUN: %lli %s > /dev/null
+; XFAIL: arm
 
 @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/mov64zext32.ll b/llvm/test/ExecutionEngine/mov64zext32.ll
index a5b246170cf..f38c21a5698 100644
--- a/llvm/test/ExecutionEngine/mov64zext32.ll
+++ b/llvm/test/ExecutionEngine/mov64zext32.ll
@@ -1,4 +1,5 @@
 ; RUN: %lli %s > /dev/null
+; XFAIL: arm
 
 define i64 @foo() {
   ret i64 42
diff --git a/llvm/test/ExecutionEngine/simpletest.ll b/llvm/test/ExecutionEngine/simpletest.ll
index 167a0fdfd13..83f9b840590 100644
--- a/llvm/test/ExecutionEngine/simpletest.ll
+++ b/llvm/test/ExecutionEngine/simpletest.ll
@@ -1,4 +1,5 @@
 ; RUN: %lli %s > /dev/null
+; XFAIL: arm
 
 define i32 @bar() {
 	ret i32 0
diff --git a/llvm/test/ExecutionEngine/stubs.ll b/llvm/test/ExecutionEngine/stubs.ll
index b7d922f2cb6..b40e4be63d4 100644
--- a/llvm/test/ExecutionEngine/stubs.ll
+++ b/llvm/test/ExecutionEngine/stubs.ll
@@ -1,4 +1,5 @@
 ; RUN: %lli -disable-lazy-compilation=false %s
+; XFAIL: arm
 
 define i32 @main() nounwind {
 entry:
diff --git a/llvm/test/ExecutionEngine/test-call-no-external-funcs.ll b/llvm/test/ExecutionEngine/test-call-no-external-funcs.ll
index c3cb93121f6..b2dd5325f11 100644
--- a/llvm/test/ExecutionEngine/test-call-no-external-funcs.ll
+++ b/llvm/test/ExecutionEngine/test-call-no-external-funcs.ll
@@ -1,4 +1,5 @@
 ; RUN: %lli %s > /dev/null
+; XFAIL: arm
 
 define i32 @_Z14func_exit_codev() nounwind uwtable {
 entry:
diff --git a/llvm/test/ExecutionEngine/test-call.ll b/llvm/test/ExecutionEngine/test-call.ll
index 313a6c52367..3fd39fe094f 100644
--- a/llvm/test/ExecutionEngine/test-call.ll
+++ b/llvm/test/ExecutionEngine/test-call.ll
@@ -1,4 +1,5 @@
 ; RUN: %lli %s > /dev/null
+; XFAIL: arm
 
 declare void @exit(i32)
 
diff --git a/llvm/test/ExecutionEngine/test-common-symbols.ll b/llvm/test/ExecutionEngine/test-common-symbols.ll
index 19e2ce58468..4dd926512ae 100644
--- a/llvm/test/ExecutionEngine/test-common-symbols.ll
+++ b/llvm/test/ExecutionEngine/test-common-symbols.ll
@@ -1,4 +1,5 @@
 ; RUN: %lli -O0 -disable-lazy-compilation=false %s
+; XFAIL: arm
 
 ; The intention of this test is to verify that symbols mapped to COMMON in ELF
 ; work as expected.
diff --git a/llvm/test/ExecutionEngine/test-fp-no-external-funcs.ll b/llvm/test/ExecutionEngine/test-fp-no-external-funcs.ll
index 61b12c2abeb..139b2efea57 100644
--- a/llvm/test/ExecutionEngine/test-fp-no-external-funcs.ll
+++ b/llvm/test/ExecutionEngine/test-fp-no-external-funcs.ll
@@ -1,4 +1,5 @@
 ; RUN: %lli  %s > /dev/null
+; XFAIL: arm
 
 define double @test(double* %DP, double %Arg) {
 	%D = load double* %DP		; <double> [#uses=1]
diff --git a/llvm/test/ExecutionEngine/test-fp.ll b/llvm/test/ExecutionEngine/test-fp.ll
index 2bf0210d8b0..c9064500d47 100644
--- a/llvm/test/ExecutionEngine/test-fp.ll
+++ b/llvm/test/ExecutionEngine/test-fp.ll
@@ -1,4 +1,5 @@
 ; RUN: %lli %s > /dev/null
+; XFAIL: arm
 
 define double @test(double* %DP, double %Arg) {
 	%D = load double* %DP		; <double> [#uses=1]
diff --git a/llvm/test/ExecutionEngine/test-global-init-nonzero.ll b/llvm/test/ExecutionEngine/test-global-init-nonzero.ll
index 749a4851c5d..ef2d37b8919 100644
--- a/llvm/test/ExecutionEngine/test-global-init-nonzero.ll
+++ b/llvm/test/ExecutionEngine/test-global-init-nonzero.ll
@@ -1,4 +1,5 @@
 ; RUN: %lli  %s > /dev/null
+; XFAIL: arm
 
 @count = global i32 1, align 4
 
diff --git a/llvm/test/ExecutionEngine/test-global.ll b/llvm/test/ExecutionEngine/test-global.ll
index 69e54555564..2ea50dea99a 100644
--- a/llvm/test/ExecutionEngine/test-global.ll
+++ b/llvm/test/ExecutionEngine/test-global.ll
@@ -1,4 +1,5 @@
 ; RUN: %lli %s > /dev/null
+; XFAIL: arm
 
 @count = global i32 0, align 4
 
diff --git a/llvm/test/ExecutionEngine/test-loadstore.ll b/llvm/test/ExecutionEngine/test-loadstore.ll
index 1797599a9d8..75743146c6e 100644
--- a/llvm/test/ExecutionEngine/test-loadstore.ll
+++ b/llvm/test/ExecutionEngine/test-loadstore.ll
@@ -1,4 +1,5 @@
 ; RUN: %lli %s > /dev/null
+; XFAIL: arm
 
 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-local.ll b/llvm/test/ExecutionEngine/test-local.ll
index ec5ba165408..240b174ac2f 100644
--- a/llvm/test/ExecutionEngine/test-local.ll
+++ b/llvm/test/ExecutionEngine/test-local.ll
@@ -1,4 +1,5 @@
 ; RUN: %lli %s > /dev/null
+; XFAIL: arm
 
 define i32 @main() nounwind uwtable {
 entry:
-- 
cgit v1.2.3