From 79cc1e3ae7bc224fa948495ba2f1c02f4c0c84ea Mon Sep 17 00:00:00 2001
From: Eric Christopher <echristo@gmail.com>
Date: Tue, 2 Sep 2014 22:28:02 +0000
Subject: Reinstate "Nuke the old JIT." Approved by Jim Grosbach, Lang Hames,
 Rafael Espindola.

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

llvm-svn: 216982
---
 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, 84 insertions(+), 109 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 4c03519a85a..eb2fe8c0483 100644
--- a/llvm/test/ExecutionEngine/2002-12-16-ArgTest.ll
+++ b/llvm/test/ExecutionEngine/2002-12-16-ArgTest.ll
@@ -1,5 +1,4 @@
 ; 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 3182193453a..68fdefefa54 100644
--- a/llvm/test/ExecutionEngine/2003-01-04-ArgumentBug.ll
+++ b/llvm/test/ExecutionEngine/2003-01-04-ArgumentBug.ll
@@ -1,5 +1,4 @@
 ; 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 3e27e0607ba..5a0311dd939 100644
--- a/llvm/test/ExecutionEngine/2003-01-04-LoopTest.ll
+++ b/llvm/test/ExecutionEngine/2003-01-04-LoopTest.ll
@@ -1,5 +1,4 @@
 ; 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 80e19ba1932..038d7500101 100644
--- a/llvm/test/ExecutionEngine/2003-01-15-AlignmentTest.ll
+++ b/llvm/test/ExecutionEngine/2003-01-15-AlignmentTest.ll
@@ -1,5 +1,4 @@
 ; 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 6f61aa68b67..576ef7cf638 100644
--- a/llvm/test/ExecutionEngine/2003-05-06-LivenessClobber.ll
+++ b/llvm/test/ExecutionEngine/2003-05-06-LivenessClobber.ll
@@ -1,7 +1,6 @@
 ; 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 236be18d96e..42db5fe93fc 100644
--- a/llvm/test/ExecutionEngine/2003-05-07-ArgumentTest.ll
+++ b/llvm/test/ExecutionEngine/2003-05-07-ArgumentTest.ll
@@ -1,5 +1,4 @@
 ; 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 22dd4ccb44c..bee409c1441 100644
--- a/llvm/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll
+++ b/llvm/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll
@@ -1,5 +1,4 @@
 ; 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 60dc3d6b7d4..63303fcff7c 100644
--- a/llvm/test/ExecutionEngine/2003-08-21-EnvironmentTest.ll
+++ b/llvm/test/ExecutionEngine/2003-08-21-EnvironmentTest.ll
@@ -1,5 +1,4 @@
 ; 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 04a5e1741bb..8fb1bbbe9d7 100644
--- a/llvm/test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll
+++ b/llvm/test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll
@@ -1,5 +1,4 @@
 ; 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 6e48c60db26..6513540903e 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,5 +1,4 @@
 ; 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 8523b5e3f5b..2ac8ad1795d 100644
--- a/llvm/test/ExecutionEngine/2005-12-02-TailCallBug.ll
+++ b/llvm/test/ExecutionEngine/2005-12-02-TailCallBug.ll
@@ -1,6 +1,5 @@
 ; 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 babd8f6a780..eb2fe8c0483 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_mcjit %s > /dev/null
+; RUN: %lli %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 bbb81b88b16..68fdefefa54 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_mcjit %s > /dev/null
+; RUN: %lli %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 7574267bdcd..5a0311dd939 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_mcjit %s > /dev/null
+; RUN: %lli %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 261939ad202..48576e7c83e 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_mcjit %s > /dev/null
+; RUN: %lli %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 f76f9983282..ed58e118437 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_mcjit %s > /dev/null
+; RUN: %lli %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 2b83bb9e43e..4960e596900 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_mcjit %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/MCJIT/2003-01-15-AlignmentTest.ll b/llvm/test/ExecutionEngine/MCJIT/2003-01-15-AlignmentTest.ll
index d1ca2bee399..038d7500101 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_mcjit %s > /dev/null
+; RUN: %lli %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 20ef0ff95cd..576ef7cf638 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_mcjit %s
+; RUN: not %lli %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 c7bcc5450b0..42db5fe93fc 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_mcjit %s test
+; RUN: %lli %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 0512575d1b4..45279adbe57 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_mcjit %s > /dev/null
+; RUN: %lli %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 c292a818a09..4342aa44097 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_mcjit %s > /dev/null
+; RUN: %lli %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 c0a83f5ecbd..03b66c43a1c 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_mcjit %s > /dev/null
+; RUN: %lli %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 55ce689b865..bee409c1441 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_mcjit %s > /dev/null
+; RUN: %lli %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 2e999967a2c..63303fcff7c 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_mcjit %s > /dev/null
+; RUN: %lli %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 659901b9b36..8fb1bbbe9d7 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_mcjit %s > /dev/null
+; RUN: %lli %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 68e31a7074d..6513540903e 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_mcjit %s > /dev/null
+; RUN: %lli %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 0bc010584f1..6a3c0f2a31c 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_mcjit %s
+; RUN: %lli %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 43188f2be48..418361163fc 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_mcjit -force-interpreter %s
+; RUN: %lli -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 9897602250a..349db69e4c6 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_mcjit -force-interpreter=true %s | FileCheck %s
+; RUN: %lli -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 7ed0e3870a3..8bf03de321b 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_mcjit -force-interpreter=true %s > /dev/null
+; RUN: %lli -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 3f402c59311..d9ff347b078 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_mcjit %s
+; RUN: %lli %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 fe8d3864c9b..5d4e16fa4a2 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_mcjit -extra-module=%p/Inputs/cross-module-b.ll %s > /dev/null
+; RUN: %lli -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 ee26702dfae..f37d4a86e66 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_mcjit -extra-module=%p/Inputs/cross-module-b.ll -relocation-model=pic -code-model=small %s > /dev/null
+; RUN: %lli -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 539c890f918..bd097f29038 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_mcjit -relocation-model=pic -code-model=large %s
+; RUN: %lli -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 00c2bb056ff..f3e61dc8570 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_mcjit -relocation-model=pic -code-model=small %s
+; RUN: %lli -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 c2135736ad4..aa81bb52a59 100644
--- a/llvm/test/ExecutionEngine/MCJIT/eh.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/eh.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit %s
+; RUN: %lli %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 ea39617547a..e6d06f83db4 100644
--- a/llvm/test/ExecutionEngine/MCJIT/fpbitcast.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/fpbitcast.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit -force-interpreter=true %s | FileCheck %s
+; RUN: %lli -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 115846c7864..7db60f7aeeb 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_mcjit -relocation-model=pic -code-model=small %s > /dev/null
+; RUN: %lli -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 b74470724de..47e36a58956 100644
--- a/llvm/test/ExecutionEngine/MCJIT/hello.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/hello.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit %s > /dev/null
+; RUN: %lli %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 cd033d50947..13b25884fee 100644
--- a/llvm/test/ExecutionEngine/MCJIT/hello2.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/hello2.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit %s > /dev/null
+; RUN: %lli %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 9d27e41c6a5..080bf6cf584 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_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
+; 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
 
 ; 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_mcjit -extra-object=%t.cachedir2/multi-module-b.o -extra-object=%t.cachedir2/multi-module-c.o %s
+; RUN: %lli -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_mcjit -extra-archive=%t.cachedir3/load-object.a %s
+; RUN: %lli -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 8848ca6117f..dc3154c7b30 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_mcjit -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll %s > /dev/null
+; RUN: %lli -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 66fafc924ac..10cfdcd264d 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_mcjit -extra-module=%p/Inputs/multi-module-eh-b.ll %s
+; RUN: %lli -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 f2fa59f4821..e4395c433fe 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_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
+; 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
 ; 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 21db67dad66..03de30a6419 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_mcjit -code-model=small %s > /dev/null
+; RUN: %lli -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 e0827f6add9..72e67ae93fe 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_mcjit %s > /dev/null
+; RUN: %lli %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 1c719c5b7c2..6f5ae3999bc 100644
--- a/llvm/test/ExecutionEngine/MCJIT/pr13727.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/pr13727.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit -O0 -disable-lazy-compilation=false %s
+; RUN: %lli -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 b540bfa3bd6..c31572361d3 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_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
+; 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
 
 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 589ba2f6d38..d47fc6cffbb 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_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
+; 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
 ; 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 fbbb8bdf4bc..0fd363b4447 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_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
+; 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
 
 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 9c231695991..d248c4b2a94 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_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
+; 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
 ; 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 6c8ab3d5369..30b4dd8e7ab 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_mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
+; RUN: %lli -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 48b939bbe35..da4ddc6943c 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_mcjit -remote-mcjit -disable-lazy-compilation=false -mcjit-remote-process=lli-child-target%exeext %s
+; RUN: %lli -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 88faf21adb1..f6a16078dfa 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_mcjit -remote-mcjit -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s
+; RUN: %lli -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 e07178ed283..0f58710603d 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_mcjit -remote-mcjit -O0 -disable-lazy-compilation=false -mcjit-remote-process=lli-child-target%exeext %s
+; RUN: %lli -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 129350b63eb..435c21a4a9f 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_mcjit -remote-mcjit -O0 -mcjit-remote-process=lli-child-target%exeext %s
+; RUN:  %lli -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 8eec0f22988..9d11415c906 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_mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
+; RUN: %lli -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 9fbaeb79449..40b514fd8e1 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_mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null
+; RUN: %lli -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 29ab24b3933..5119b72d448 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_mcjit -remote-mcjit -relocation-model=pic -code-model=small %s > /dev/null
+; RUN: %lli -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 d62631ff50c..ba3ffff2142 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_mcjit -remote-mcjit -O0 -mcjit-remote-process=lli-child-target%exeext %s
+; RUN: %lli -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 bad026fe7d4..bbc71afdf7e 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_mcjit -remote-mcjit -O0 -relocation-model=pic -code-model=small %s
+; RUN: %lli -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 318baf4e8ff..85c17153275 100644
--- a/llvm/test/ExecutionEngine/MCJIT/simplesttest.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/simplesttest.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit %s > /dev/null
+; RUN: %lli %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 5b0f2dd3055..167a0fdfd13 100644
--- a/llvm/test/ExecutionEngine/MCJIT/simpletest.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/simpletest.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit %s > /dev/null
+; RUN: %lli %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 9e214f5d475..9b83ed231e9 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_mcjit -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s
+; RUN: %lli -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 f4aac333945..b7d922f2cb6 100644
--- a/llvm/test/ExecutionEngine/MCJIT/stubs.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/stubs.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit -disable-lazy-compilation=false %s
+; RUN: %lli -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 e1cc23b9fcd..79f989f7265 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-arith.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-arith.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit %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/MCJIT/test-branch.ll b/llvm/test/ExecutionEngine/MCJIT/test-branch.ll
index cdf10350ec1..3ae55d069b3 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-branch.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-branch.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit %s > /dev/null
+; RUN: %lli %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 8a36cf2953f..c3cb93121f6 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_mcjit %s > /dev/null
+; RUN: %lli %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 1a0f0084168..313a6c52367 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-call.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-call.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit %s > /dev/null
+; RUN: %lli %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 335ec508eff..667fa80a489 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-cast.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-cast.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit %s > /dev/null
+; RUN: %lli %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 989a4734233..a425b5c1e9b 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_mcjit -O0 %s
+; RUN: %lli -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 13ee06a6507..19e2ce58468 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_mcjit -O0 -disable-lazy-compilation=false %s
+; RUN: %lli -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 8f15cbd7f7e..d01479a86cd 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-constantexpr.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-constantexpr.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit %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/MCJIT/test-data-align.ll b/llvm/test/ExecutionEngine/MCJIT/test-data-align.ll
index 2472d95e777..f21ea2e2a45 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_mcjit -O0 %s
+; RUN:  %lli -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 f094f3d9192..adb0550a72d 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_mcjit %s > /dev/null
+; RUN: %lli %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 b10e9d6c169..2bf0210d8b0 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-fp.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-fp.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit %s > /dev/null
+; RUN: %lli %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 947d8f5d423..ec87d155d41 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_mcjit %s > /dev/null
+; RUN: %lli %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 eb031f2e4f4..26bd8380802 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_mcjit -relocation-model=pic -code-model=small %s > /dev/null
+; RUN: %lli -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 b9f74b8be40..3877e9a5886 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_mcjit %s > /dev/null
+; RUN: %lli %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 6a8c042ef89..69e54555564 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-global.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-global.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit %s > /dev/null
+; RUN: %lli %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 90381947e8f..1797599a9d8 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-loadstore.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-loadstore.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit %s > /dev/null
+; RUN: %lli %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 d7c17342797..ec5ba165408 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-local.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-local.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit %s > /dev/null
+; RUN: %lli %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 a03833e5c51..05b381bb53c 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-logical.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-logical.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit %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/MCJIT/test-loop.ll b/llvm/test/ExecutionEngine/MCJIT/test-loop.ll
index 5ed8c4020f7..e951a14ed2e 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-loop.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-loop.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit %s > /dev/null
+; RUN: %lli %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 4245ccabed7..c5bdfd513ed 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-phi.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-phi.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit %s > /dev/null
+; RUN: %lli %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 9e067422e31..21bcaef3aa8 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_mcjit -O0 -relocation-model=pic -code-model=small %s
+; RUN: %lli -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 871d8bfa29e..f139ddf12f8 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_mcjit -O0 %s
+; RUN: %lli -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 6bfc48052d0..025f53e5cb9 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-ret.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-ret.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit %s > /dev/null
+; RUN: %lli %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 4db1c3fe39f..d464a4b72d8 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-return.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-return.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit %s > /dev/null
+; RUN: %lli %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 b4367d0337a..68276e617a4 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_mcjit %s > /dev/null
+; RUN: %lli %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 8c7d815446c..48dc02198ec 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_mcjit %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/MCJIT/test-shift.ll b/llvm/test/ExecutionEngine/MCJIT/test-shift.ll
index 8d9a94ef12c..590e2620689 100644
--- a/llvm/test/ExecutionEngine/MCJIT/test-shift.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/test-shift.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit %s > /dev/null
+; RUN: %lli %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 f2c4a7f414d..47e36a58956 100644
--- a/llvm/test/ExecutionEngine/hello.ll
+++ b/llvm/test/ExecutionEngine/hello.ll
@@ -1,5 +1,4 @@
 ; 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 155ed41d7ca..13b25884fee 100644
--- a/llvm/test/ExecutionEngine/hello2.ll
+++ b/llvm/test/ExecutionEngine/hello2.ll
@@ -1,5 +1,4 @@
 ; 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 f38c21a5698..a5b246170cf 100644
--- a/llvm/test/ExecutionEngine/mov64zext32.ll
+++ b/llvm/test/ExecutionEngine/mov64zext32.ll
@@ -1,5 +1,4 @@
 ; 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 83f9b840590..167a0fdfd13 100644
--- a/llvm/test/ExecutionEngine/simpletest.ll
+++ b/llvm/test/ExecutionEngine/simpletest.ll
@@ -1,5 +1,4 @@
 ; 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 b40e4be63d4..b7d922f2cb6 100644
--- a/llvm/test/ExecutionEngine/stubs.ll
+++ b/llvm/test/ExecutionEngine/stubs.ll
@@ -1,5 +1,4 @@
 ; 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 b2dd5325f11..c3cb93121f6 100644
--- a/llvm/test/ExecutionEngine/test-call-no-external-funcs.ll
+++ b/llvm/test/ExecutionEngine/test-call-no-external-funcs.ll
@@ -1,5 +1,4 @@
 ; 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 3fd39fe094f..313a6c52367 100644
--- a/llvm/test/ExecutionEngine/test-call.ll
+++ b/llvm/test/ExecutionEngine/test-call.ll
@@ -1,5 +1,4 @@
 ; 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 4dd926512ae..19e2ce58468 100644
--- a/llvm/test/ExecutionEngine/test-common-symbols.ll
+++ b/llvm/test/ExecutionEngine/test-common-symbols.ll
@@ -1,5 +1,4 @@
 ; 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 139b2efea57..61b12c2abeb 100644
--- a/llvm/test/ExecutionEngine/test-fp-no-external-funcs.ll
+++ b/llvm/test/ExecutionEngine/test-fp-no-external-funcs.ll
@@ -1,5 +1,4 @@
 ; 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 c9064500d47..2bf0210d8b0 100644
--- a/llvm/test/ExecutionEngine/test-fp.ll
+++ b/llvm/test/ExecutionEngine/test-fp.ll
@@ -1,5 +1,4 @@
 ; 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 ef2d37b8919..749a4851c5d 100644
--- a/llvm/test/ExecutionEngine/test-global-init-nonzero.ll
+++ b/llvm/test/ExecutionEngine/test-global-init-nonzero.ll
@@ -1,5 +1,4 @@
 ; 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 2ea50dea99a..69e54555564 100644
--- a/llvm/test/ExecutionEngine/test-global.ll
+++ b/llvm/test/ExecutionEngine/test-global.ll
@@ -1,5 +1,4 @@
 ; 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 75743146c6e..1797599a9d8 100644
--- a/llvm/test/ExecutionEngine/test-loadstore.ll
+++ b/llvm/test/ExecutionEngine/test-loadstore.ll
@@ -1,5 +1,4 @@
 ; 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 240b174ac2f..ec5ba165408 100644
--- a/llvm/test/ExecutionEngine/test-local.ll
+++ b/llvm/test/ExecutionEngine/test-local.ll
@@ -1,5 +1,4 @@
 ; RUN: %lli %s > /dev/null
-; XFAIL: arm
 
 define i32 @main() nounwind uwtable {
 entry:
-- 
cgit v1.2.3