From 590dcc74cae46eae0350a15c155e5f63d7bf38bf Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 7 Aug 2014 20:21:14 +0000 Subject: [PATCH] MCJIT has been removed. silent-MCJIIT-tests.diff & 0050-powerpcspe-fp.diff are useless --- debian/changelog | 2 + debian/patches/0050-powerpcspe-fp.diff | 101 ------------------ debian/patches/series | 2 - debian/patches/silent-MCJIIT-tests.diff | 132 ------------------------ 4 files changed, 2 insertions(+), 235 deletions(-) delete mode 100644 debian/patches/0050-powerpcspe-fp.diff delete mode 100644 debian/patches/silent-MCJIIT-tests.diff diff --git a/debian/changelog b/debian/changelog index 0a501dd6..0f147219 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ llvm-toolchain-snapshot (1:3.6~svn214630-1~exp2) UNRELEASED; urgency=medium * Enable compressed debug sections (Closes: #757002) * Force scan-build to use the same version of clang + * MCJIT has been removed. silent-MCJIIT-tests.diff & 0050-powerpcspe-fp.diff + are useless -- Sylvestre Ledru Mon, 04 Aug 2014 13:36:15 +0200 diff --git a/debian/patches/0050-powerpcspe-fp.diff b/debian/patches/0050-powerpcspe-fp.diff deleted file mode 100644 index 9bff0202..00000000 --- a/debian/patches/0050-powerpcspe-fp.diff +++ /dev/null @@ -1,101 +0,0 @@ - PPCJITInfo.cpp | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -Index: llvm-toolchain-snapshot_3.5~svn210337/lib/Target/PowerPC/PPCJITInfo.cpp -=================================================================== ---- llvm-toolchain-snapshot_3.5~svn210337.orig/lib/Target/PowerPC/PPCJITInfo.cpp -+++ llvm-toolchain-snapshot_3.5~svn210337/lib/Target/PowerPC/PPCJITInfo.cpp -@@ -105,6 +105,7 @@ asm( - "stw r8, 196(r1)\n" "stw r7, 192(r1)\n" - "stw r6, 188(r1)\n" "stw r5, 184(r1)\n" - "stw r4, 180(r1)\n" "stw r3, 176(r1)\n" -+#ifndef __NO_FPRS__ - // Save all call-clobbered FP regs. - "stfd f13, 168(r1)\n" "stfd f12, 160(r1)\n" - "stfd f11, 152(r1)\n" "stfd f10, 144(r1)\n" -@@ -113,6 +114,7 @@ asm( - "stfd f5, 104(r1)\n" "stfd f4, 96(r1)\n" - "stfd f3, 88(r1)\n" "stfd f2, 80(r1)\n" - "stfd f1, 72(r1)\n" -+#endif - // Arguments to Compilation Callback: - // r3 - our lr (address of the call instruction in stub plus 4) - // r4 - stub's lr (address of instruction that called the stub plus 4) -@@ -128,6 +130,7 @@ asm( - "lwz r8, 196(r1)\n" "lwz r7, 192(r1)\n" - "lwz r6, 188(r1)\n" "lwz r5, 184(r1)\n" - "lwz r4, 180(r1)\n" "lwz r3, 176(r1)\n" -+#ifndef __NO_FPRS__ - // Restore all FP arg registers - "lfd f13, 168(r1)\n" "lfd f12, 160(r1)\n" - "lfd f11, 152(r1)\n" "lfd f10, 144(r1)\n" -@@ -136,6 +139,7 @@ asm( - "lfd f5, 104(r1)\n" "lfd f4, 96(r1)\n" - "lfd f3, 88(r1)\n" "lfd f2, 80(r1)\n" - "lfd f1, 72(r1)\n" -+#endif - // Pop 3 frames off the stack and branch to target - "lwz r1, 208(r1)\n" - "lwz r2, 8(r1)\n" -@@ -170,12 +174,14 @@ asm( - "stw 8, 92(1)\n" "stw 7, 88(1)\n" - "stw 6, 84(1)\n" "stw 5, 80(1)\n" - "stw 4, 76(1)\n" "stw 3, 72(1)\n" -+#ifndef __NO_FPRS__ - // Save all call-clobbered FP regs. - "stfd 8, 64(1)\n" - "stfd 7, 56(1)\n" "stfd 6, 48(1)\n" - "stfd 5, 40(1)\n" "stfd 4, 32(1)\n" - "stfd 3, 24(1)\n" "stfd 2, 16(1)\n" - "stfd 1, 8(1)\n" -+#endif - // Arguments to Compilation Callback: - // r3 - our lr (address of the call instruction in stub plus 4) - // r4 - stub's lr (address of instruction that called the stub plus 4) -@@ -191,12 +197,14 @@ asm( - "lwz 8, 92(1)\n" "lwz 7, 88(1)\n" - "lwz 6, 84(1)\n" "lwz 5, 80(1)\n" - "lwz 4, 76(1)\n" "lwz 3, 72(1)\n" -+#ifndef __NO_FPRS__ - // Restore all FP arg registers - "lfd 8, 64(1)\n" - "lfd 7, 56(1)\n" "lfd 6, 48(1)\n" - "lfd 5, 40(1)\n" "lfd 4, 32(1)\n" - "lfd 3, 24(1)\n" "lfd 2, 16(1)\n" - "lfd 1, 8(1)\n" -+#endif - // Pop 3 frames off the stack and branch to target - "lwz 1, 104(1)\n" - "lwz 0, 4(1)\n" -@@ -252,6 +260,7 @@ asm( - "std 8, 256(1)\n" "std 7, 248(1)\n" - "std 6, 240(1)\n" "std 5, 232(1)\n" - "std 4, 224(1)\n" "std 3, 216(1)\n" -+#ifndef __NO_FPRS__ - // Save all call-clobbered FP regs. - "stfd 13, 208(1)\n" "stfd 12, 200(1)\n" - "stfd 11, 192(1)\n" "stfd 10, 184(1)\n" -@@ -260,6 +269,7 @@ asm( - "stfd 5, 144(1)\n" "stfd 4, 136(1)\n" - "stfd 3, 128(1)\n" "stfd 2, 120(1)\n" - "stfd 1, 112(1)\n" -+#endif - // Arguments to Compilation Callback: - // r3 - our lr (address of the call instruction in stub plus 4) - // r4 - stub's lr (address of instruction that called the stub plus 4) -@@ -280,6 +290,7 @@ asm( - "ld 8, 256(1)\n" "ld 7, 248(1)\n" - "ld 6, 240(1)\n" "ld 5, 232(1)\n" - "ld 4, 224(1)\n" "ld 3, 216(1)\n" -+#ifndef __NO_FPRS__ - // Restore all FP arg registers - "lfd 13, 208(1)\n" "lfd 12, 200(1)\n" - "lfd 11, 192(1)\n" "lfd 10, 184(1)\n" -@@ -288,6 +299,7 @@ asm( - "lfd 5, 144(1)\n" "lfd 4, 136(1)\n" - "lfd 3, 128(1)\n" "lfd 2, 120(1)\n" - "lfd 1, 112(1)\n" -+#endif - // Pop 3 frames off the stack and branch to target - "ld 1, 280(1)\n" - "ld 0, 16(1)\n" diff --git a/debian/patches/series b/debian/patches/series index 0aa163ad..7977061e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,7 +11,6 @@ 0044-soname.diff 0047-version-name.diff scan-build-clang-path.diff -0050-powerpcspe-fp.diff declare_clear_cache.diff 31-powerpcspe.diff 34-powerpc-no-altivec.diff @@ -26,7 +25,6 @@ atomic_library_2.diff python-clangpath.diff removeduplicatedeclaration.diff fix-clang-path-and-build.diff -silent-MCJIIT-tests.diff include-target.diff force-gcc-header-obj.diff do-not-fail-on-unexpected-pass.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