From 7eaf9e664ad8df2942c3d74f87e9e7dcb55ca21f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 26 Jun 2018 09:53:27 +0200 Subject: [PATCH] rebase of the patch --- debian/patches/silent-MCJIIT-tests.diff | 110 +++++++++--------- .../silent-test-failing-codeverage.diff | 12 +- 2 files changed, 61 insertions(+), 61 deletions(-) diff --git a/debian/patches/silent-MCJIIT-tests.diff b/debian/patches/silent-MCJIIT-tests.diff index ab709b29..2374a7d6 100644 --- a/debian/patches/silent-MCJIIT-tests.diff +++ b/debian/patches/silent-MCJIIT-tests.diff @@ -18,10 +18,10 @@ test/Feature/load_module.ll | 1 - 17 files changed, 14 insertions(+), 17 deletions(-) -Index: llvm-toolchain-snapshot_7~svn324807/test/BugPoint/crash-narrowfunctiontest.ll +Index: llvm-toolchain-snapshot_7~svn335581/test/BugPoint/crash-narrowfunctiontest.ll =================================================================== ---- llvm-toolchain-snapshot_7~svn324807.orig/test/BugPoint/crash-narrowfunctiontest.ll -+++ llvm-toolchain-snapshot_7~svn324807/test/BugPoint/crash-narrowfunctiontest.ll +--- llvm-toolchain-snapshot_7~svn335581.orig/test/BugPoint/crash-narrowfunctiontest.ll ++++ llvm-toolchain-snapshot_7~svn335581/test/BugPoint/crash-narrowfunctiontest.ll @@ -2,7 +2,6 @@ ; ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls --opt-command opt -silence-passes > /dev/null @@ -30,10 +30,10 @@ Index: llvm-toolchain-snapshot_7~svn324807/test/BugPoint/crash-narrowfunctiontes define i32 @foo() { ret i32 1 } -Index: llvm-toolchain-snapshot_7~svn324807/test/BugPoint/remove_arguments_test.ll +Index: llvm-toolchain-snapshot_7~svn335581/test/BugPoint/remove_arguments_test.ll =================================================================== ---- llvm-toolchain-snapshot_7~svn324807.orig/test/BugPoint/remove_arguments_test.ll -+++ llvm-toolchain-snapshot_7~svn324807/test/BugPoint/remove_arguments_test.ll +--- llvm-toolchain-snapshot_7~svn335581.orig/test/BugPoint/remove_arguments_test.ll ++++ llvm-toolchain-snapshot_7~svn335581/test/BugPoint/remove_arguments_test.ll @@ -1,7 +1,6 @@ ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes --opt-command opt ; RUN: llvm-dis %t-reduced-simplified.bc -o - | FileCheck %s @@ -42,10 +42,10 @@ Index: llvm-toolchain-snapshot_7~svn324807/test/BugPoint/remove_arguments_test.l ; Test to make sure that arguments are removed from the function if they are ; unnecessary. And clean up any types that frees up too. -Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll +Index: llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll =================================================================== ---- llvm-toolchain-snapshot_7~svn324807.orig/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll -+++ llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll +--- llvm-toolchain-snapshot_7~svn335581.orig/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll ++++ llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll @@ -1,5 +1,5 @@ ; RUN: %lli -extra-module=%p/Inputs/cross-module-b.ll -relocation-model=pic -code-model=small %s > /dev/null -; XFAIL: mips-, mipsel-, i686, i386 @@ -53,22 +53,22 @@ Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/MCJIT/cross-modu declare i32 @FB() -Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/MCJIT/eh-lg-pic.ll +Index: llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/MCJIT/eh-lg-pic.ll =================================================================== ---- llvm-toolchain-snapshot_7~svn324807.orig/test/ExecutionEngine/MCJIT/eh-lg-pic.ll -+++ llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/MCJIT/eh-lg-pic.ll +--- llvm-toolchain-snapshot_7~svn335581.orig/test/ExecutionEngine/MCJIT/eh-lg-pic.ll ++++ llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/MCJIT/eh-lg-pic.ll @@ -1,6 +1,6 @@ - ; REQUIRES: cxx-shared-library + ; REQUIRES: cxx-shared-library, system-linux ; RUN: %lli -relocation-model=pic -code-model=large %s --; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, aarch64, arm +-; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm +; XFAIL: * declare i8* @__cxa_allocate_exception(i64) declare void @__cxa_throw(i8*, i8*, i8*) declare i32 @__gxx_personality_v0(...) -Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll +Index: llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll =================================================================== ---- llvm-toolchain-snapshot_7~svn324807.orig/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll -+++ llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll +--- llvm-toolchain-snapshot_7~svn335581.orig/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll ++++ llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll @@ -1,5 +1,5 @@ ; 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-, mipsel-, i686, i386 @@ -76,10 +76,10 @@ Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/MCJIT/multi-modu declare i32 @FB() -Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll +Index: llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_7~svn324807.orig/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll -+++ llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll +--- llvm-toolchain-snapshot_7~svn335581.orig/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll ++++ llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s -; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm @@ -87,10 +87,10 @@ Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/MCJIT/stubs-sm-p define i32 @main() nounwind { entry: -Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll +Index: llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_7~svn324807.orig/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll -+++ llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll +--- llvm-toolchain-snapshot_7~svn335581.orig/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll ++++ llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli -relocation-model=pic -code-model=small %s > /dev/null -; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386 @@ -98,10 +98,10 @@ Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/MCJIT/test-globa @count = global i32 1, align 4 -Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll +Index: llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_7~svn324807.orig/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll -+++ llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll +--- llvm-toolchain-snapshot_7~svn335581.orig/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll ++++ llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli -O0 -relocation-model=pic -code-model=small %s -; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386 @@ -109,10 +109,10 @@ Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/MCJIT/test-ptr-r @.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 -Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll +Index: llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll =================================================================== ---- llvm-toolchain-snapshot_7~svn324807.orig/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll -+++ llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll +--- llvm-toolchain-snapshot_7~svn335581.orig/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll ++++ llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll @@ -1,5 +1,5 @@ ; RUN: %lli -jit-kind=orc-mcjit -extra-module=%p/Inputs/cross-module-b.ll -relocation-model=pic -code-model=small %s > /dev/null -; XFAIL: mips-, mipsel-, i686, i386 @@ -120,22 +120,22 @@ Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/OrcMCJIT/cross-m declare i32 @FB() -Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll +Index: llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll =================================================================== ---- llvm-toolchain-snapshot_7~svn324807.orig/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll -+++ llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll +--- llvm-toolchain-snapshot_7~svn335581.orig/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll ++++ llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll @@ -1,6 +1,6 @@ - ; REQUIRES: cxx-shared-library + ; REQUIRES: cxx-shared-library, linux-system ; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=large %s --; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, aarch64, arm +-; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm +; XFAIL: * declare i8* @__cxa_allocate_exception(i64) declare void @__cxa_throw(i8*, i8*, i8*) declare i32 @__gxx_personality_v0(...) -Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll +Index: llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll =================================================================== ---- llvm-toolchain-snapshot_7~svn324807.orig/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll -+++ llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll +--- llvm-toolchain-snapshot_7~svn335581.orig/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll ++++ llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll @@ -1,5 +1,5 @@ ; RUN: %lli -jit-kind=orc-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-, mipsel-, i686, i386 @@ -143,10 +143,10 @@ Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/OrcMCJIT/multi-m declare i32 @FB() -Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll +Index: llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_7~svn324807.orig/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll -+++ llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll +--- llvm-toolchain-snapshot_7~svn335581.orig/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll ++++ llvm-toolchain-snapshot_7~svn335581/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 @@ -155,10 +155,10 @@ Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/OrcMCJIT/remote/ ; UNSUPPORTED: powerpc64-unknown-linux-gnu ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed -Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll +Index: llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_7~svn324807.orig/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll -+++ llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll +--- llvm-toolchain-snapshot_7~svn335581.orig/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll ++++ llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll @@ -1,6 +1,6 @@ ; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \ ; RUN: -O0 -relocation-model=pic -code-model=small %s @@ -167,10 +167,10 @@ Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/OrcMCJIT/remote/ ; UNSUPPORTED: powerpc64-unknown-linux-gnu ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed -Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll +Index: llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_7~svn324807.orig/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll -+++ llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll +--- llvm-toolchain-snapshot_7~svn335581.orig/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll ++++ llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli -jit-kind=orc-mcjit -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s -; XFAIL: mips-, mipsel-, i686, i386, aarch64, arm @@ -178,10 +178,10 @@ Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/OrcMCJIT/stubs-s define i32 @main() nounwind { entry: -Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll +Index: llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_7~svn324807.orig/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll -+++ llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll +--- llvm-toolchain-snapshot_7~svn335581.orig/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll ++++ llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=small %s > /dev/null -; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386 @@ -189,10 +189,10 @@ Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/OrcMCJIT/test-gl @count = global i32 1, align 4 -Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll +Index: llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_7~svn324807.orig/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll -+++ llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll +--- llvm-toolchain-snapshot_7~svn335581.orig/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll ++++ llvm-toolchain-snapshot_7~svn335581/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli -jit-kind=orc-mcjit -O0 -relocation-model=pic -code-model=small %s -; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386 @@ -200,10 +200,10 @@ Index: llvm-toolchain-snapshot_7~svn324807/test/ExecutionEngine/OrcMCJIT/test-pt @.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 -Index: llvm-toolchain-snapshot_7~svn324807/test/Feature/load_module.ll +Index: llvm-toolchain-snapshot_7~svn335581/test/Feature/load_module.ll =================================================================== ---- llvm-toolchain-snapshot_7~svn324807.orig/test/Feature/load_module.ll -+++ llvm-toolchain-snapshot_7~svn324807/test/Feature/load_module.ll +--- llvm-toolchain-snapshot_7~svn335581.orig/test/Feature/load_module.ll ++++ llvm-toolchain-snapshot_7~svn335581/test/Feature/load_module.ll @@ -3,7 +3,6 @@ ; RUN: -disable-output 2>&1 | grep Hello ; REQUIRES: loadable_module diff --git a/debian/patches/silent-test-failing-codeverage.diff b/debian/patches/silent-test-failing-codeverage.diff index 76e87010..0fadd898 100644 --- a/debian/patches/silent-test-failing-codeverage.diff +++ b/debian/patches/silent-test-failing-codeverage.diff @@ -1,10 +1,10 @@ -Index: llvm-toolchain-snapshot_5.0~svn306792/test/ThinLTO/X86/autoupgrade.ll +Index: llvm-toolchain-snapshot_7~svn335581/test/ThinLTO/X86/autoupgrade.ll =================================================================== ---- llvm-toolchain-snapshot_5.0~svn306792.orig/test/ThinLTO/X86/autoupgrade.ll -+++ llvm-toolchain-snapshot_5.0~svn306792/test/ThinLTO/X86/autoupgrade.ll -@@ -12,6 +12,8 @@ - ; CHECK: