diff --git a/debian/changelog b/debian/changelog index 69d7a7d7..00eb6208 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ llvm-toolchain-snapshot (1:3.5~svn211313-1) unstable; urgency=medium * Fix FTBFS on powerpc and powerpcspe (Closes: #733890) * Broken library symlink fixed in lldb-3.5 (Closes: #715130) * Fix --use-cc when no absolute path is provided (Closes: #748777) + * Disable silent-MCJIIT-tests.diff. They now pass. -- Sylvestre Ledru Tue, 17 Jun 2014 09:49:31 +0200 diff --git a/debian/control b/debian/control index 207444cb..656f6d6f 100644 --- a/debian/control +++ b/debian/control @@ -9,8 +9,7 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect, lsb-release, patchutils, diffstat, xz-utils, chrpath, python-dev, libedit-dev, swig, python-sphinx, ocaml-nox, binutils-dev, libcloog-isl-dev, libisl-dev (>= 0.11.1), libjsoncpp-dev, - lcov, procps, help2man, dh-ocaml, - g++ + lcov, procps, help2man, dh-ocaml Build-Conflicts: oprofile, ocaml, libllvm-3.4-ocaml-dev, libllvm-3.5-ocaml-dev Standards-Version: 3.9.5 Homepage: http://www.llvm.org/ diff --git a/debian/patches/series b/debian/patches/series index 9d8df64f..62afdc41 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -26,7 +26,6 @@ atomic_library_2.diff python-clangpath.diff removeduplicatedeclaration.diff fix-clang-path-and-build.diff -silent-MCJIIT-tests.diff include-target.diff debian-mips64-n32-multiarch.diff force-gcc-header-obj.diff diff --git a/debian/patches/silent-MCJIIT-tests.diff b/debian/patches/silent-MCJIIT-tests.diff deleted file mode 100644 index 52982344..00000000 --- a/debian/patches/silent-MCJIIT-tests.diff +++ /dev/null @@ -1,132 +0,0 @@ -Index: llvm-toolchain-snapshot_3.5~svn211445/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll -=================================================================== ---- llvm-toolchain-snapshot_3.5~svn211445.orig/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll 2014-06-21 15:54:22.049147179 -0700 -+++ llvm-toolchain-snapshot_3.5~svn211445/test/ExecutionEngine/MCJIT/cross-module-sm-pic-a.ll 2014-06-21 15:54:22.045147073 -0700 -@@ -1,5 +1,5 @@ - ; RUN: %lli_mcjit -extra-module=%p/Inputs/cross-module-b.ll -relocation-model=pic -code-model=small %s > /dev/null --; XFAIL: mips, i686, i386, arm -+; XFAIL: * - - declare i32 @FB() - -Index: llvm-toolchain-snapshot_3.5~svn211445/test/ExecutionEngine/MCJIT/eh-lg-pic.ll -=================================================================== ---- llvm-toolchain-snapshot_3.5~svn211445.orig/test/ExecutionEngine/MCJIT/eh-lg-pic.ll 2014-06-21 15:54:22.049147179 -0700 -+++ llvm-toolchain-snapshot_3.5~svn211445/test/ExecutionEngine/MCJIT/eh-lg-pic.ll 2014-06-21 15:54:39.753616224 -0700 -@@ -1,5 +1,5 @@ - ; RUN: %lli_mcjit -relocation-model=pic -code-model=large %s --; XFAIL: cygwin, win32, mingw, mips, 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_3.5~svn211445/test/ExecutionEngine/MCJIT/eh-sm-pic.ll -=================================================================== ---- llvm-toolchain-snapshot_3.5~svn211445.orig/test/ExecutionEngine/MCJIT/eh-sm-pic.ll 2014-06-21 15:54:22.049147179 -0700 -+++ llvm-toolchain-snapshot_3.5~svn211445/test/ExecutionEngine/MCJIT/eh-sm-pic.ll 2014-06-21 15:54:22.049147179 -0700 -@@ -1,5 +1,5 @@ - ; RUN: %lli_mcjit -relocation-model=pic -code-model=small %s --; XFAIL: cygwin, win32, mingw, mips, i686, i386, darwin, 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_3.5~svn211445/test/ExecutionEngine/MCJIT/hello-sm-pic.ll -=================================================================== ---- llvm-toolchain-snapshot_3.5~svn211445.orig/test/ExecutionEngine/MCJIT/hello-sm-pic.ll 2014-06-21 15:54:22.049147179 -0700 -+++ llvm-toolchain-snapshot_3.5~svn211445/test/ExecutionEngine/MCJIT/hello-sm-pic.ll 2014-06-21 15:54:22.049147179 -0700 -@@ -1,5 +1,5 @@ - ; RUN: %lli_mcjit -relocation-model=pic -code-model=small %s > /dev/null --; XFAIL: mips, i686, i386, darwin, aarch64, arm -+; XFAIL: * - - @.LC0 = internal global [12 x i8] c"Hello World\00" ; <[12 x i8]*> [#uses=1] - -Index: llvm-toolchain-snapshot_3.5~svn211445/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll -=================================================================== ---- llvm-toolchain-snapshot_3.5~svn211445.orig/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll 2014-06-21 15:54:22.049147179 -0700 -+++ llvm-toolchain-snapshot_3.5~svn211445/test/ExecutionEngine/MCJIT/multi-module-sm-pic-a.ll 2014-06-21 15:54:22.049147179 -0700 -@@ -1,5 +1,5 @@ - ; RUN: %lli_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, i686, i386, arm -+; XFAIL: * - - declare i32 @FB() - -Index: llvm-toolchain-snapshot_3.5~svn211445/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll -=================================================================== ---- llvm-toolchain-snapshot_3.5~svn211445.orig/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll 2014-06-21 15:54:22.049147179 -0700 -+++ llvm-toolchain-snapshot_3.5~svn211445/test/ExecutionEngine/MCJIT/remote/cross-module-sm-pic-a.ll 2014-06-21 15:54:22.049147179 -0700 -@@ -1,5 +1,5 @@ - ; RUN: %lli_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, i686, i386, arm -+; XFAIL: * - - declare i32 @FB() - -Index: llvm-toolchain-snapshot_3.5~svn211445/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll -=================================================================== ---- llvm-toolchain-snapshot_3.5~svn211445.orig/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll 2014-06-21 15:54:22.049147179 -0700 -+++ llvm-toolchain-snapshot_3.5~svn211445/test/ExecutionEngine/MCJIT/remote/multi-module-sm-pic-a.ll 2014-06-21 15:54:22.049147179 -0700 -@@ -1,5 +1,5 @@ - ; RUN: %lli_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, i686, i386, arm -+; XFAIL: * - - declare i32 @FB() - -Index: llvm-toolchain-snapshot_3.5~svn211445/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll -=================================================================== ---- llvm-toolchain-snapshot_3.5~svn211445.orig/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll 2014-06-21 15:54:22.049147179 -0700 -+++ llvm-toolchain-snapshot_3.5~svn211445/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll 2014-06-21 15:54:22.049147179 -0700 -@@ -1,5 +1,5 @@ - ; RUN: %lli_mcjit -remote-mcjit -relocation-model=pic -code-model=small %s > /dev/null --; XFAIL: mips, aarch64, arm, i686, i386 -+; XFAIL: * - - @count = global i32 1, align 4 - -Index: llvm-toolchain-snapshot_3.5~svn211445/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll -=================================================================== ---- llvm-toolchain-snapshot_3.5~svn211445.orig/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll 2014-06-21 15:54:22.049147179 -0700 -+++ llvm-toolchain-snapshot_3.5~svn211445/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll 2014-06-21 15:54:22.049147179 -0700 -@@ -1,5 +1,5 @@ - ; RUN: %lli_mcjit -remote-mcjit -O0 -relocation-model=pic -code-model=small %s --; XFAIL: mips, aarch64, arm, i686, i386 -+; XFAIL: * - - @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1 - @ptr = global i8* getelementptr inbounds ([6 x i8]* @.str, i32 0, i32 0), align 4 -Index: llvm-toolchain-snapshot_3.5~svn211445/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll -=================================================================== ---- llvm-toolchain-snapshot_3.5~svn211445.orig/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll 2014-06-21 15:54:22.049147179 -0700 -+++ llvm-toolchain-snapshot_3.5~svn211445/test/ExecutionEngine/MCJIT/stubs-sm-pic.ll 2014-06-21 15:54:22.049147179 -0700 -@@ -1,5 +1,5 @@ - ; RUN: %lli_mcjit -disable-lazy-compilation=false -relocation-model=pic -code-model=small %s --; XFAIL: mips, i686, i386, aarch64, arm -+; XFAIL: * - - define i32 @main() nounwind { - entry: -Index: llvm-toolchain-snapshot_3.5~svn211445/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll -=================================================================== ---- llvm-toolchain-snapshot_3.5~svn211445.orig/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll 2014-06-21 15:54:22.049147179 -0700 -+++ llvm-toolchain-snapshot_3.5~svn211445/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll 2014-06-21 15:54:22.049147179 -0700 -@@ -1,5 +1,5 @@ - ; RUN: %lli_mcjit -relocation-model=pic -code-model=small %s > /dev/null --; XFAIL: mips, aarch64, arm, i686, i386 -+; XFAIL: * - - @count = global i32 1, align 4 - -Index: llvm-toolchain-snapshot_3.5~svn211445/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll -=================================================================== ---- llvm-toolchain-snapshot_3.5~svn211445.orig/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll 2014-06-21 15:54:22.049147179 -0700 -+++ llvm-toolchain-snapshot_3.5~svn211445/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll 2014-06-21 15:54:22.049147179 -0700 -@@ -1,5 +1,5 @@ - ; RUN: %lli_mcjit -O0 -relocation-model=pic -code-model=small %s --; XFAIL: mips, aarch64, arm, i686, i386 -+; XFAIL: * - - @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1 - @ptr = global i8* getelementptr inbounds ([6 x i8]* @.str, i32 0, i32 0), align 4