From 61abf1550f6b12b066c959512ab10ce0720df207 Mon Sep 17 00:00:00 2001 From: Andrew Kaylor Date: Mon, 28 Oct 2013 21:58:15 +0000 Subject: 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 --- test/ExecutionEngine/MCJIT/cross-module-a.ll | 2 +- test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll | 2 +- test/ExecutionEngine/MCJIT/multi-module-a.ll | 2 +- test/ExecutionEngine/MCJIT/multi-module-eh-a.ll | 2 +- test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll | 2 +- test/ExecutionEngine/MCJIT/remote/cross-module-a.ll | 2 +- test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll | 2 +- test/ExecutionEngine/MCJIT/remote/multi-module-a.ll | 2 +- test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll | 2 +- tools/lli/lli.cpp | 3 +-- 10 files changed, 10 insertions(+), 11 deletions(-) diff --git a/test/ExecutionEngine/MCJIT/cross-module-a.ll b/test/ExecutionEngine/MCJIT/cross-module-a.ll index 201a670..d6f0423 100644 --- 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 5ccc892..7631ca8 100644 --- 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 9c6de8d..abb0e97 100644 --- 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 89035e6..5883366 100644 --- 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 ac7f9d1..423356f 100644 --- 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 97f4eda..69565a3 100644 --- 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 bfd0942..75d9b6b 100644 --- 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 b80965d..5cb4224 100644 --- 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 5efa372..a7fe627 100644 --- 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 7117707..6425142 100644 --- a/tools/lli/lli.cpp +++ b/tools/lli/lli.cpp @@ -132,8 +132,7 @@ namespace { cl::init("main")); cl::list - ExtraModules("extra-modules", - cl::CommaSeparated, + ExtraModules("extra-module", cl::desc("Extra modules to be loaded"), cl::value_desc(",,...")); -- cgit v1.1