From bb0a70c4537f31c9c0e7928d38f66d8650acc20d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 20 Jan 2016 17:35:53 +0000 Subject: [PATCH] prepare the 3.8 build --- debian/changelog | 4 +- debian/control | 2 +- .../fix-llvm-config-obj-src-root.patch | 14 +- debian/patches/series | 1 - debian/patches/silent-MCJIIT-tests.diff | 204 +++++++----------- debian/patches/strip-svn.diff | 43 ---- 6 files changed, 92 insertions(+), 176 deletions(-) diff --git a/debian/changelog b/debian/changelog index 07434591..5442e2f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-snapshot (1:3.8~svn256489-1~exp1) experimental; urgency=medium +llvm-toolchain-3.8 (1:3.8~+rc1-1~exp1) experimental; urgency=medium * New snapshot release * Cmake migration. Done by Andrew Wilkins. Many thanks to him @@ -21,7 +21,7 @@ llvm-toolchain-snapshot (1:3.8~svn256489-1~exp1) experimental; urgency=medium - removed autotools-specific artifacts (configure, Makefile, etc.) - removed dummy documentation files - -- Sylvestre Ledru Mon, 28 Dec 2015 09:31:25 +0100 + -- Sylvestre Ledru Wed, 20 Jan 2016 16:09:01 +0100 llvm-toolchain-snapshot (1:3.8~svn255217-1~exp1) experimental; urgency=medium diff --git a/debian/control b/debian/control index 1c881d48..9fbfe5e6 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: llvm-toolchain-snapshot +Source: llvm-toolchain-3.8 Section: devel Priority: optional Maintainer: LLVM Packaging Team diff --git a/debian/patches/fix-llvm-config-obj-src-root.patch b/debian/patches/fix-llvm-config-obj-src-root.patch index b9c4ee8f..f41b89a4 100644 --- a/debian/patches/fix-llvm-config-obj-src-root.patch +++ b/debian/patches/fix-llvm-config-obj-src-root.patch @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.8~svn257050/tools/llvm-config/llvm-config.cpp +Index: llvm-toolchain-3.8_3.8~+rc1/tools/llvm-config/llvm-config.cpp =================================================================== ---- llvm-toolchain-snapshot_3.8~svn257050.orig/tools/llvm-config/llvm-config.cpp -+++ llvm-toolchain-snapshot_3.8~svn257050/tools/llvm-config/llvm-config.cpp -@@ -531,9 +531,9 @@ int main(int argc, char **argv) { +--- llvm-toolchain-3.8_3.8~+rc1.orig/tools/llvm-config/llvm-config.cpp ++++ llvm-toolchain-3.8_3.8~+rc1/tools/llvm-config/llvm-config.cpp +@@ -498,9 +498,9 @@ int main(int argc, char **argv) { } else if (Arg == "--shared-mode") { PrintSharedMode = true; } else if (Arg == "--obj-root") { @@ -11,6 +11,6 @@ Index: llvm-toolchain-snapshot_3.8~svn257050/tools/llvm-config/llvm-config.cpp } else if (Arg == "--src-root") { - OS << LLVM_SRC_ROOT << '\n'; + OS << ActivePrefix << "/build/" << '\n'; - } else if (Arg == "--link-shared") { - LinkMode = LinkModeDyLib; - } else if (Arg == "--link-static") { + } else { + usage(); + } diff --git a/debian/patches/series b/debian/patches/series index c2027e6f..7ff72278 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -34,7 +34,6 @@ follow-parallel-var.diff hurd-EIEIO-undef.diff silent-MCJIIT-tests.diff lldb-libname.diff -strip-svn.diff compiler-rt-i586.diff clang-analyzer-force-version.diff fix-cmake-config-prefix.diff diff --git a/debian/patches/silent-MCJIIT-tests.diff b/debian/patches/silent-MCJIIT-tests.diff index 958cbfcf..feb60022 100644 --- a/debian/patches/silent-MCJIIT-tests.diff +++ b/debian/patches/silent-MCJIIT-tests.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll +Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll +--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll ++++ llvm-toolchain-3.8_3.8~+rc1/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 @@ -9,10 +9,10 @@ Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/cross-mo declare i32 @FB() -Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/eh-lg-pic.ll +Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/eh-lg-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/ExecutionEngine/MCJIT/eh-lg-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/eh-lg-pic.ll +--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/MCJIT/eh-lg-pic.ll ++++ llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/eh-lg-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli -relocation-model=pic -code-model=large %s -; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, aarch64, arm @@ -20,10 +20,10 @@ Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/eh-lg-pi declare i8* @__cxa_allocate_exception(i64) declare void @__cxa_throw(i8*, i8*, i8*) declare i32 @__gxx_personality_v0(...) -Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/eh-sm-pic.ll +Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/eh-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/ExecutionEngine/MCJIT/eh-sm-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/eh-sm-pic.ll +--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/MCJIT/eh-sm-pic.ll ++++ llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/eh-sm-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli -relocation-model=pic -code-model=small %s -; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, darwin, aarch64, arm @@ -31,10 +31,10 @@ Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/eh-sm-pi declare i8* @__cxa_allocate_exception(i64) declare void @__cxa_throw(i8*, i8*, i8*) declare i32 @__gxx_personality_v0(...) -Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll +Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll +--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll ++++ llvm-toolchain-3.8_3.8~+rc1/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 @@ -42,10 +42,10 @@ Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/multi-mo declare i32 @FB() -Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll +Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll +--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll ++++ llvm-toolchain-3.8_3.8~+rc1/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 @@ -53,10 +53,10 @@ Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/stubs-sm define i32 @main() nounwind { entry: -Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll +Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll +--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll ++++ llvm-toolchain-3.8_3.8~+rc1/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 @@ -64,10 +64,10 @@ Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/test-glo @count = global i32 1, align 4 -Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll +Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll +--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll ++++ llvm-toolchain-3.8_3.8~+rc1/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 @@ -75,54 +75,34 @@ Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/test-ptr @.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_3.8~svn255758/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll +Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll -@@ -1,5 +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 -relocation-model=pic -code-model=small %s > /dev/null --; XFAIL: mips-, mipsel-, i686, i386, arm -+; XFAIL: * - - declare i32 @FB() - -Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll -=================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/remote/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 -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext -relocation-model=pic -code-model=small %s > /dev/null --; XFAIL: mips-, mipsel-, i686, i386, arm -+; XFAIL: * - - declare i32 @FB() - -Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll -=================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll -@@ -1,5 +1,5 @@ - ; RUN: %lli -remote-mcjit -relocation-model=pic -code-model=small %s > /dev/null --; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386 +--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll ++++ llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll +@@ -1,6 +1,6 @@ + ; RUN: %lli -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, win32 +; XFAIL: * @count = global i32 1, align 4 -Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll +Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll -@@ -1,5 +1,5 @@ - ; RUN: %lli -remote-mcjit -O0 -relocation-model=pic -code-model=small %s --; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386 +--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll ++++ llvm-toolchain-3.8_3.8~+rc1/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, win32 +; XFAIL: * @.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_3.8~svn255758/test/BugPoint/crash-narrowfunctiontest.ll +Index: llvm-toolchain-3.8_3.8~+rc1/test/BugPoint/crash-narrowfunctiontest.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/BugPoint/crash-narrowfunctiontest.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/BugPoint/crash-narrowfunctiontest.ll +--- llvm-toolchain-3.8_3.8~+rc1.orig/test/BugPoint/crash-narrowfunctiontest.ll ++++ llvm-toolchain-3.8_3.8~+rc1/test/BugPoint/crash-narrowfunctiontest.ll @@ -2,7 +2,6 @@ ; ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes > /dev/null @@ -131,10 +111,10 @@ Index: llvm-toolchain-snapshot_3.8~svn255758/test/BugPoint/crash-narrowfunctiont define i32 @foo() { ret i32 1 } -Index: llvm-toolchain-snapshot_3.8~svn255758/test/BugPoint/metadata.ll +Index: llvm-toolchain-3.8_3.8~+rc1/test/BugPoint/metadata.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/BugPoint/metadata.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/BugPoint/metadata.ll +--- llvm-toolchain-3.8_3.8~+rc1.orig/test/BugPoint/metadata.ll ++++ llvm-toolchain-3.8_3.8~+rc1/test/BugPoint/metadata.ll @@ -1,7 +1,6 @@ ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes > /dev/null ; RUN: llvm-dis %t-reduced-simplified.bc -o - | FileCheck %s @@ -143,10 +123,10 @@ Index: llvm-toolchain-snapshot_3.8~svn255758/test/BugPoint/metadata.ll ; Bugpoint should keep the call's metadata attached to the call. -Index: llvm-toolchain-snapshot_3.8~svn255758/test/BugPoint/remove_arguments_test.ll +Index: llvm-toolchain-3.8_3.8~+rc1/test/BugPoint/remove_arguments_test.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/BugPoint/remove_arguments_test.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/BugPoint/remove_arguments_test.ll +--- llvm-toolchain-3.8_3.8~+rc1.orig/test/BugPoint/remove_arguments_test.ll ++++ llvm-toolchain-3.8_3.8~+rc1/test/BugPoint/remove_arguments_test.ll @@ -1,7 +1,6 @@ ; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashcalls -silence-passes ; RUN: llvm-dis %t-reduced-simplified.bc -o - | FileCheck %s @@ -155,10 +135,10 @@ Index: llvm-toolchain-snapshot_3.8~svn255758/test/BugPoint/remove_arguments_test ; 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_3.8~svn255758/test/Feature/load_module.ll +Index: llvm-toolchain-3.8_3.8~+rc1/test/Feature/load_module.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/Feature/load_module.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/Feature/load_module.ll +--- llvm-toolchain-3.8_3.8~+rc1.orig/test/Feature/load_module.ll ++++ llvm-toolchain-3.8_3.8~+rc1/test/Feature/load_module.ll @@ -3,7 +3,6 @@ ; RUN: -disable-output 2>&1 | grep Hello ; REQUIRES: loadable_module @@ -167,10 +147,10 @@ Index: llvm-toolchain-snapshot_3.8~svn255758/test/Feature/load_module.ll @junk = global i32 0 -Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll +Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll +--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/OrcMCJIT/cross-module-sm-pic-a.ll ++++ llvm-toolchain-3.8_3.8~+rc1/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 @@ -178,10 +158,10 @@ Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/cross declare i32 @FB() -Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll +Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll +--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll ++++ llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=large %s -; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, aarch64, arm @@ -189,10 +169,10 @@ Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/eh-lg declare i8* @__cxa_allocate_exception(i64) declare void @__cxa_throw(i8*, i8*, i8*) declare i32 @__gxx_personality_v0(...) -Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll +Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll +--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll ++++ llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/eh-sm-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=small %s -; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, darwin, aarch64, arm @@ -200,10 +180,10 @@ Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/eh-sm declare i8* @__cxa_allocate_exception(i64) declare void @__cxa_throw(i8*, i8*, i8*) declare i32 @__gxx_personality_v0(...) -Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll +Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll +--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/OrcMCJIT/multi-module-sm-pic-a.ll ++++ llvm-toolchain-3.8_3.8~+rc1/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 @@ -211,54 +191,34 @@ Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/multi declare i32 @FB() -Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/remote/cross-module-sm-pic-a.ll +Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/ExecutionEngine/OrcMCJIT/remote/cross-module-sm-pic-a.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/remote/cross-module-sm-pic-a.ll -@@ -1,5 +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 -relocation-model=pic -code-model=small %s > /dev/null --; XFAIL: mips-, mipsel-, i686, i386, arm -+; XFAIL: * - - declare i32 @FB() - -Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/remote/multi-module-sm-pic-a.ll -=================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/ExecutionEngine/OrcMCJIT/remote/multi-module-sm-pic-a.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/remote/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 -disable-lazy-compilation=true -remote-mcjit -mcjit-remote-process=lli-child-target%exeext -relocation-model=pic -code-model=small %s > /dev/null --; XFAIL: mips-, mipsel-, i686, i386, arm -+; XFAIL: * - - declare i32 @FB() - -Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll -=================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll -@@ -1,5 +1,5 @@ - ; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -relocation-model=pic -code-model=small %s > /dev/null --; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386 +--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/OrcMCJIT/remote/test-global-init-nonzero-sm-pic.ll ++++ llvm-toolchain-3.8_3.8~+rc1/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, win32 +; XFAIL: * @count = global i32 1, align 4 -Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll +Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll -@@ -1,5 +1,5 @@ - ; RUN: %lli -jit-kind=orc-mcjit -remote-mcjit -O0 -relocation-model=pic -code-model=small %s --; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386 +--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/OrcMCJIT/remote/test-ptr-reloc-sm-pic.ll ++++ llvm-toolchain-3.8_3.8~+rc1/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 +-; XFAIL: mips-, mipsel-, aarch64, arm, i686, i386, win32 +; XFAIL: * @.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_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll +Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll +--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/OrcMCJIT/stubs-sm-pic.ll ++++ llvm-toolchain-3.8_3.8~+rc1/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 @@ -266,10 +226,10 @@ Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/stubs define i32 @main() nounwind { entry: -Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll +Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll +--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/OrcMCJIT/test-global-init-nonzero-sm-pic.ll ++++ llvm-toolchain-3.8_3.8~+rc1/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 @@ -277,10 +237,10 @@ Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/test- @count = global i32 1, align 4 -Index: llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll +Index: llvm-toolchain-3.8_3.8~+rc1/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_3.8~svn255758.orig/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll -+++ llvm-toolchain-snapshot_3.8~svn255758/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll +--- llvm-toolchain-3.8_3.8~+rc1.orig/test/ExecutionEngine/OrcMCJIT/test-ptr-reloc-sm-pic.ll ++++ llvm-toolchain-3.8_3.8~+rc1/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 diff --git a/debian/patches/strip-svn.diff b/debian/patches/strip-svn.diff index c953a977..e69de29b 100644 --- a/debian/patches/strip-svn.diff +++ b/debian/patches/strip-svn.diff @@ -1,43 +0,0 @@ -Index: llvm-toolchain-snapshot_3.8~svn243851/autoconf/configure.ac -=================================================================== ---- llvm-toolchain-snapshot_3.8~svn243851.orig/autoconf/configure.ac -+++ llvm-toolchain-snapshot_3.8~svn243851/autoconf/configure.ac -@@ -32,12 +32,12 @@ dnl===---------------------------------- - dnl Initialize autoconf and define the package name, version number and - dnl address for reporting bugs. - --AC_INIT([LLVM],[3.8.0svn],[http://llvm.org/bugs/]) -+AC_INIT([LLVM],[3.8.0],[http://llvm.org/bugs/]) - - LLVM_VERSION_MAJOR=3 - LLVM_VERSION_MINOR=8 - LLVM_VERSION_PATCH=0 --LLVM_VERSION_SUFFIX=svn -+LLVM_VERSION_SUFFIX= - - AC_DEFINE_UNQUOTED([LLVM_VERSION_MAJOR], $LLVM_VERSION_MAJOR, [Major version of the LLVM API]) - AC_DEFINE_UNQUOTED([LLVM_VERSION_MINOR], $LLVM_VERSION_MINOR, [Minor version of the LLVM API]) -Index: llvm-toolchain-snapshot_3.8~svn243851/configure -=================================================================== ---- llvm-toolchain-snapshot_3.8~svn243851.orig/configure -+++ llvm-toolchain-snapshot_3.8~svn243851/configure -@@ -561,8 +561,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} - # Identity of this package. - PACKAGE_NAME='LLVM' - PACKAGE_TARNAME='llvm' --PACKAGE_VERSION='3.8.0svn' --PACKAGE_STRING='LLVM 3.8.0svn' -+PACKAGE_VERSION='3.8.0' -+PACKAGE_STRING='LLVM 3.8.0' - PACKAGE_BUGREPORT='http://llvm.org/bugs/' - - ac_unique_file="lib/IR/Module.cpp" -@@ -1956,7 +1956,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - LLVM_VERSION_MAJOR=3 - LLVM_VERSION_MINOR=8 - LLVM_VERSION_PATCH=0 --LLVM_VERSION_SUFFIX=svn -+LLVM_VERSION_SUFFIX= - - - cat >>confdefs.h <<_ACEOF