diff --git a/debian/patches/0050-powerpcspe-fp.diff b/debian/patches/0050-powerpcspe-fp.diff index e35c38bf..9bff0202 100644 --- a/debian/patches/0050-powerpcspe-fp.diff +++ b/debian/patches/0050-powerpcspe-fp.diff @@ -1,11 +1,11 @@ PPCJITInfo.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) -Index: llvm-toolchain-snapshot_3.4~svn188990/lib/Target/PowerPC/PPCJITInfo.cpp +Index: llvm-toolchain-snapshot_3.5~svn210337/lib/Target/PowerPC/PPCJITInfo.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn188990.orig/lib/Target/PowerPC/PPCJITInfo.cpp 2013-08-22 09:07:37.872608521 +0200 -+++ llvm-toolchain-snapshot_3.4~svn188990/lib/Target/PowerPC/PPCJITInfo.cpp 2013-08-22 09:07:37.868608522 +0200 -@@ -104,6 +104,7 @@ +--- 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" @@ -13,7 +13,7 @@ Index: llvm-toolchain-snapshot_3.4~svn188990/lib/Target/PowerPC/PPCJITInfo.cpp // 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" -@@ -112,6 +113,7 @@ +@@ -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" @@ -21,7 +21,7 @@ Index: llvm-toolchain-snapshot_3.4~svn188990/lib/Target/PowerPC/PPCJITInfo.cpp // 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) -@@ -127,6 +129,7 @@ +@@ -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" @@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_3.4~svn188990/lib/Target/PowerPC/PPCJITInfo.cpp // 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" -@@ -135,6 +138,7 @@ +@@ -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" @@ -37,7 +37,7 @@ Index: llvm-toolchain-snapshot_3.4~svn188990/lib/Target/PowerPC/PPCJITInfo.cpp // Pop 3 frames off the stack and branch to target "lwz r1, 208(r1)\n" "lwz r2, 8(r1)\n" -@@ -169,12 +173,14 @@ +@@ -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" @@ -52,7 +52,7 @@ Index: llvm-toolchain-snapshot_3.4~svn188990/lib/Target/PowerPC/PPCJITInfo.cpp // 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) -@@ -190,12 +196,14 @@ +@@ -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" @@ -67,7 +67,7 @@ Index: llvm-toolchain-snapshot_3.4~svn188990/lib/Target/PowerPC/PPCJITInfo.cpp // Pop 3 frames off the stack and branch to target "lwz 1, 104(1)\n" "lwz 0, 4(1)\n" -@@ -246,6 +254,7 @@ +@@ -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" @@ -75,7 +75,7 @@ Index: llvm-toolchain-snapshot_3.4~svn188990/lib/Target/PowerPC/PPCJITInfo.cpp // 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" -@@ -254,6 +263,7 @@ +@@ -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" @@ -83,7 +83,7 @@ Index: llvm-toolchain-snapshot_3.4~svn188990/lib/Target/PowerPC/PPCJITInfo.cpp // 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) -@@ -274,6 +284,7 @@ +@@ -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" @@ -91,7 +91,7 @@ Index: llvm-toolchain-snapshot_3.4~svn188990/lib/Target/PowerPC/PPCJITInfo.cpp // 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" -@@ -282,6 +293,7 @@ +@@ -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" diff --git a/debian/patches/19-clang_debian_version.patch b/debian/patches/19-clang_debian_version.patch index 401953e1..c530e14f 100644 --- a/debian/patches/19-clang_debian_version.patch +++ b/debian/patches/19-clang_debian_version.patch @@ -1,16 +1,16 @@ -Index: llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Basic/Version.cpp +Index: llvm-toolchain-snapshot_3.5~svn210337/clang/lib/Basic/Version.cpp =================================================================== ---- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/lib/Basic/Version.cpp 2014-01-14 11:27:21.140872790 +0100 -+++ llvm-toolchain-snapshot_3.5~svn199197/clang/lib/Basic/Version.cpp 2014-01-14 11:30:26.020869154 +0100 +--- llvm-toolchain-snapshot_3.5~svn210337.orig/clang/lib/Basic/Version.cpp ++++ llvm-toolchain-snapshot_3.5~svn210337/clang/lib/Basic/Version.cpp @@ -15,6 +15,7 @@ #include "clang/Basic/LLVM.h" - #include "llvm/Config/config.h" + #include "clang/Config/config.h" #include "llvm/Support/raw_ostream.h" +#include "clang/Debian/debian_path.h" #include #include -@@ -125,7 +126,7 @@ +@@ -125,7 +126,7 @@ std::string getClangToolFullVersion(Stri #ifdef CLANG_VENDOR OS << CLANG_VENDOR; #endif