Standardizing lli's extra module command line option

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@193544 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/ExecutionEngine/MCJIT/cross-module-a.ll b/test/ExecutionEngine/MCJIT/cross-module-a.ll
index 201a6701fbe2d57d1d31abcb18feb8d4352bc259..d6f04239e91e9f07f97e21890dc7bee85e806ff5 100644 (file)
--- a/test/ExecutionEngine/MCJIT/cross-module-a.ll
+++ b/test/ExecutionEngine/MCJIT/cross-module-a.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit -extra-modules=%p/cross-module-b.ir %s > /dev/null
+; RUN: %lli_mcjit -extra-module=%p/cross-module-b.ir %s > /dev/null
 
 declare i32 @FB()
 

diff --git a/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll b/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
index 5ccc892d29566eb31f9be217152483f5381d8aa1..7631ca8e7671ed4716114107e8b94688772f658a 100644 (file)
--- a/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
+++ b/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit -extra-modules=%p/cross-module-b.ir -relocation-model=pic -code-model=small %s > /dev/null
+; RUN: %lli_mcjit -extra-module=%p/cross-module-b.ir -relocation-model=pic -code-model=small %s > /dev/null
 ; XFAIL: mips, i686, i386, aarch64, arm
 
 declare i32 @FB()

diff --git a/test/ExecutionEngine/MCJIT/multi-module-a.ll b/test/ExecutionEngine/MCJIT/multi-module-a.ll
index 9c6de8dd8bc84fe548acb8c6bd71ccf7ba8e02de..abb0e973ea465dd6e1ad256531c5c1294e254ae3 100644 (file)
--- a/test/ExecutionEngine/MCJIT/multi-module-a.ll
+++ b/test/ExecutionEngine/MCJIT/multi-module-a.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit -extra-modules=%p/multi-module-b.ir,%p/multi-module-c.ir %s > /dev/null
+; RUN: %lli_mcjit -extra-module=%p/multi-module-b.ir -extra-module=%p/multi-module-c.ir %s > /dev/null
 
 declare i32 @FB()
 

diff --git a/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll b/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll
index 89035e65ac951db94e0f588292e719c8962ebd49..5883366bbf3ce5730f6118f099195425d301a05b 100644 (file)
--- a/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll
+++ b/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit -extra-modules=%p/multi-module-eh-b.ir %s
+; RUN: %lli_mcjit -extra-module=%p/multi-module-eh-b.ir %s
 ; XFAIL: arm, cygwin, win32, mingw
 declare i8* @__cxa_allocate_exception(i64)
 declare void @__cxa_throw(i8*, i8*, i8*)

diff --git a/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll b/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
index ac7f9d178c51127f7edf3163444d286210945359..423356f12845c2cffae90c50a97dc9cfd173eac8 100644 (file)
--- a/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
+++ b/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit -extra-modules=%p/multi-module-b.ir,%p/multi-module-c.ir -relocation-model=pic -code-model=small %s > /dev/null
+; RUN: %lli_mcjit -extra-module=%p/multi-module-b.ir -extra-module=%p/multi-module-c.ir -relocation-model=pic -code-model=small %s > /dev/null
 ; XFAIL: mips, i686, i386, aarch64, arm
 
 declare i32 @FB()

diff --git a/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll b/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll
index 97f4edaf22e50fdd3825bfd23c51105e333345ac..69565a385e92009ed9106f2d3352c6cf67423669 100644 (file)
--- a/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll
+++ b/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit -extra-modules=%p/cross-module-b.ir  -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target %s > /dev/null
+; RUN: %lli_mcjit -extra-module=%p/cross-module-b.ir -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target %s > /dev/null
 
 ; This fails because __main is not resolved in remote mcjit.
 ; XFAIL: cygwin,mingw32

diff --git a/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll b/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll
index bfd09425cbbba683a798e08686b57817179b78b1..75d9b6b1eb402685ebeee6e11a6d407a38e0d99c 100644 (file)
--- a/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll
+++ b/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit -extra-modules=%p/cross-module-b.ir  -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target -relocation-model=pic -code-model=small %s > /dev/null
+; RUN: %lli_mcjit -extra-module=%p/cross-module-b.ir -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target -relocation-model=pic -code-model=small %s > /dev/null
 ; XFAIL: mips, i686, i386, aarch64, arm
 
 declare i32 @FB()

diff --git a/test/ExecutionEngine/MCJIT/remote/multi-module-a.ll b/test/ExecutionEngine/MCJIT/remote/multi-module-a.ll
index b80965de3d39a009d9e134dea04515334b026f40..5cb4224b510301c7f18754bed84a4971e83b941a 100644 (file)
--- a/test/ExecutionEngine/MCJIT/remote/multi-module-a.ll
+++ b/test/ExecutionEngine/MCJIT/remote/multi-module-a.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit -extra-modules=%p/multi-module-b.ir,%p/multi-module-c.ir  -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target %s > /dev/null
+; RUN: %lli_mcjit -extra-module=%p/multi-module-b.ir -extra-module=%p/multi-module-c.ir -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target %s > /dev/null
 
 ; This fails because __main is not resolved in remote mcjit.
 ; XFAIL: cygwin,mingw32

diff --git a/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll b/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll
index 5efa372ffa0335525f72d6fd3a3fc82dc44dec11..a7fe6277e6b1964c06ead9a9f4f804db285b06c5 100644 (file)
--- a/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll
+++ b/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll
@@ -1,4 +1,4 @@
-; RUN: %lli_mcjit -extra-modules=%p/multi-module-b.ir,%p/multi-module-c.ir  -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target -relocation-model=pic -code-model=small %s > /dev/null
+; RUN: %lli_mcjit -extra-module=%p/multi-module-b.ir -extra-module=%p/multi-module-c.ir -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target -relocation-model=pic -code-model=small %s > /dev/null
 ; XFAIL: mips, i686, i386, aarch64, arm
 
 declare i32 @FB()

diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp
index 7117707691fdb2a36a1143f0a1c8f830142be68e..6425142c778fd7d0f49967c87dde60020b61fd41 100644 (file)
--- a/tools/lli/lli.cpp
+++ b/tools/lli/lli.cpp
@@ -132,8 +132,7 @@ namespace {
             cl::init("main"));
 
   cl::list<std::string>
-  ExtraModules("extra-modules",
-         cl::CommaSeparated,
+  ExtraModules("extra-module",
          cl::desc("Extra modules to be loaded"),
          cl::value_desc("<input bitcode 2>,<input bitcode 3>,..."));