diff options
20 files changed, 20 insertions, 5 deletions
diff --git a/llvm/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll b/llvm/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll index c31572361d3..7df88b1ec5e 100644 --- a/llvm/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll +++ b/llvm/test/ExecutionEngine/MCJIT/remote/cross-module-a.ll @@ -1,4 +1,5 @@ ; 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 +; XFAIL: win32 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..d35418b19c7 100644 --- a/llvm/test/ExecutionEngine/MCJIT/remote/multi-module-a.ll +++ b/llvm/test/ExecutionEngine/MCJIT/remote/multi-module-a.ll @@ -1,4 +1,5 @@ ; 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 +; XFAIL: win32 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..0d1a1ec6871 100644 --- a/llvm/test/ExecutionEngine/MCJIT/remote/simpletest-remote.ll +++ b/llvm/test/ExecutionEngine/MCJIT/remote/simpletest-remote.ll @@ -1,4 +1,5 @@ ; RUN: %lli -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null +; XFAIL: win32 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 0c4df7bcb15..31ed7523db4 100644 --- a/llvm/test/ExecutionEngine/MCJIT/remote/stubs-remote.ll +++ b/llvm/test/ExecutionEngine/MCJIT/remote/stubs-remote.ll @@ -1,4 +1,5 @@ ; RUN: %lli -remote-mcjit -disable-lazy-compilation=false -mcjit-remote-process=lli-child-target%exeext %s +; XFAIL: win32 ; This test should fail until remote symbol resolution is supported. define i32 @main() nounwind { 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 fb7750adf49..bbeab10cd78 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,5 @@ ; RUN: %lli -remote-mcjit -O0 -disable-lazy-compilation=false -mcjit-remote-process=lli-child-target%exeext %s +; XFAIL: win32 ; 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..0aa19b244c0 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,5 @@ ; RUN: %lli -remote-mcjit -O0 -mcjit-remote-process=lli-child-target%exeext %s +; XFAIL: win32 ; 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 6134b8b2464..13bac29a362 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,5 @@ ; RUN: %lli -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null +; XFAIL: win32 define double @test(double* %DP, double %Arg) nounwind { %D = load double, 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 5b7999c067e..5d5480e9d45 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,5 @@ ; RUN: %lli -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null +; XFAIL: win32 @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 ad1af93ffde..c2260fc2f1f 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,5 @@ ; RUN: %lli -remote-mcjit -O0 -mcjit-remote-process=lli-child-target%exeext %s +; XFAIL: win32 @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1 @ptr = global i8* getelementptr inbounds ([6 x i8], [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 31d87708f37..2a45472b25a 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,6 +1,6 @@ ; RUN: %lli -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \ ; RUN: -O0 -relocation-model=pic -code-model=small %s -; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386 +; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, win32 @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1 @ptr = global i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str, i32 0, i32 0), align 4 diff --git a/llvm/test/ExecutionEngine/OrcMCJIT/remote/cross-module-a.ll b/llvm/test/ExecutionEngine/OrcMCJIT/remote/cross-module-a.ll index 16553ebd2ad..249aad2d4b4 100644 --- a/llvm/test/ExecutionEngine/OrcMCJIT/remote/cross-module-a.ll +++ b/llvm/test/ExecutionEngine/OrcMCJIT/remote/cross-module-a.ll @@ -1,4 +1,5 @@ ; RUN: %lli -jit-kind=orc-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 +; XFAIL: win32 declare i32 @FB() diff --git a/llvm/test/ExecutionEngine/OrcMCJIT/remote/multi-module-a.ll b/llvm/test/ExecutionEngine/OrcMCJIT/remote/multi-module-a.ll index aa343486230..32c58ee6237 100644 --- a/llvm/test/ExecutionEngine/OrcMCJIT/remote/multi-module-a.ll +++ b/llvm/test/ExecutionEngine/OrcMCJIT/remote/multi-module-a.ll @@ -1,4 +1,5 @@ ; RUN: %lli -jit-kind=orc-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 +; XFAIL: win32 declare i32 @FB() diff --git a/llvm/test/ExecutionEngine/OrcMCJIT/remote/simpletest-remote.ll b/llvm/test/ExecutionEngine/OrcMCJIT/remote/simpletest-remote.ll index 45e11fce5a6..aaf3ebc9bc7 100644 --- a/llvm/test/ExecutionEngine/OrcMCJIT/remote/simpletest-remote.ll +++ b/llvm/test/ExecutionEngine/OrcMCJIT/remote/simpletest-remote.ll @@ -1,4 +1,5 @@ ; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null +; XFAIL: win32 define i32 @bar() nounwind { ret i32 0 diff --git a/llvm/test/ExecutionEngine/OrcMCJIT/remote/stubs-remote.ll b/llvm/test/ExecutionEngine/OrcMCJIT/remote/stubs-remote.ll index 523011ccdf1..a0d941049c4 100644 --- a/llvm/test/ExecutionEngine/OrcMCJIT/remote/stubs-remote.ll +++ b/llvm/test/ExecutionEngine/OrcMCJIT/remote/stubs-remote.ll @@ -1,4 +1,5 @@ ; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -disable-lazy-compilation=false -mcjit-remote-process=lli-child-target%exeext %s +; XFAIL: win32 ; This test should fail until remote symbol resolution is supported. define i32 @main() nounwind { diff --git a/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-common-symbols-remote.ll b/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-common-symbols-remote.ll index 7e4dc056027..9b4e2469665 100644 --- a/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-common-symbols-remote.ll +++ b/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-common-symbols-remote.ll @@ -1,4 +1,5 @@ ; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -O0 -disable-lazy-compilation=false -mcjit-remote-process=lli-child-target%exeext %s +; XFAIL: win32 ; The intention of this test is to verify that symbols mapped to COMMON in ELF ; work as expected. diff --git a/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-data-align-remote.ll b/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-data-align-remote.ll index 95c9b825a8d..88a561b613e 100644 --- a/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-data-align-remote.ll +++ b/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-data-align-remote.ll @@ -1,4 +1,5 @@ ; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -O0 -mcjit-remote-process=lli-child-target%exeext %s +; XFAIL: win32 ; Check that a variable is always aligned as specified. diff --git a/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-fp-no-external-funcs-remote.ll b/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-fp-no-external-funcs-remote.ll index 28671033884..484541ab480 100644 --- a/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-fp-no-external-funcs-remote.ll +++ b/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-fp-no-external-funcs-remote.ll @@ -1,4 +1,5 @@ ; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null +; XFAIL: win32 define double @test(double* %DP, double %Arg) nounwind { %D = load double, double* %DP ; <double> [#uses=1] diff --git a/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-remote.ll b/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-remote.ll index 5dabb8f44d6..adc3e944b63 100644 --- a/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-remote.ll +++ b/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-remote.ll @@ -1,4 +1,5 @@ ; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s > /dev/null +; XFAIL: win32 @count = global i32 1, align 4 diff --git a/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll b/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll index fc15fba91a0..8ab3fd59138 100644 --- a/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll +++ b/llvm/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll @@ -1,6 +1,6 @@ ; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \ ; RUN: -relocation-model=pic -code-model=small %s > /dev/null -; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386 +; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, win32 @count = global i32 1, align 4 diff --git a/llvm/tools/lli/lli.cpp b/llvm/tools/lli/lli.cpp index b83a1a86e0d..67e7cbd7686 100644 --- a/llvm/tools/lli/lli.cpp +++ b/llvm/tools/lli/lli.cpp @@ -583,13 +583,11 @@ int main(int argc, char **argv, char * const *envp) { // Sanity check use of remote-jit: LLI currently only supports use of the // remote JIT on Unix platforms. - // FIXME: Remove this pointless fallback mode which causes tests to "pass" - // on platforms where they should XFAIL. if (RemoteMCJIT) { #ifndef LLVM_ON_UNIX errs() << "Warning: host does not support external remote targets.\n" << " Defaulting to local execution execution\n"; - RemoteMCJIT = false; + return -1; #else if (ChildExecPath.empty()) { errs() << "-remote-mcjit requires -mcjit-remote-process.\n"; |
