diff --git a/debian/patches/0003-Debian-version-info-and-bugreport.patch b/debian/patches/0003-Debian-version-info-and-bugreport.patch index 3a739167..3155f758 100644 --- a/debian/patches/0003-Debian-version-info-and-bugreport.patch +++ b/debian/patches/0003-Debian-version-info-and-bugreport.patch @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.4~svn184046/lib/Support/CommandLine.cpp +Index: llvm-toolchain-snapshot_3.4~svn184290/lib/Support/CommandLine.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/lib/Support/CommandLine.cpp 2013-06-15 19:43:10.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/lib/Support/CommandLine.cpp 2013-06-15 19:43:10.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/lib/Support/CommandLine.cpp 2013-06-19 11:13:57.582779558 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/lib/Support/CommandLine.cpp 2013-06-19 11:13:57.582779558 +0200 @@ -1509,6 +1509,10 @@ OS << LLVM_VERSION_INFO; #endif diff --git a/debian/patches/0021-shared-lib-debian.patch b/debian/patches/0021-shared-lib-debian.patch index b99f05af..a2f73837 100644 --- a/debian/patches/0021-shared-lib-debian.patch +++ b/debian/patches/0021-shared-lib-debian.patch @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.4~svn184046/tools/llvm-shlib/Makefile +Index: llvm-toolchain-snapshot_3.4~svn184290/tools/llvm-shlib/Makefile =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/tools/llvm-shlib/Makefile 2013-06-15 19:43:11.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/tools/llvm-shlib/Makefile 2013-06-15 19:43:11.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/tools/llvm-shlib/Makefile 2013-06-19 11:13:57.974779570 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/tools/llvm-shlib/Makefile 2013-06-19 11:13:57.974779570 +0200 @@ -39,6 +39,12 @@ LLVMLibsPaths := $(IncludeInLibLlvm) diff --git a/debian/patches/0023-link-libopagent.patch b/debian/patches/0023-link-libopagent.patch index 08a82900..2643265a 100644 --- a/debian/patches/0023-link-libopagent.patch +++ b/debian/patches/0023-link-libopagent.patch @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.4~svn184046/configure +Index: llvm-toolchain-snapshot_3.4~svn184290/configure =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/configure 2013-06-15 19:43:12.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/configure 2013-06-15 19:43:12.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/configure 2013-06-19 11:13:58.370779593 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/configure 2013-06-19 11:13:58.366779571 +0200 @@ -13681,7 +13681,7 @@ case $llvm_cv_os_type in Linux) diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff index c3962258..02c26c0f 100644 --- a/debian/patches/0044-soname.diff +++ b/debian/patches/0044-soname.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.4~svn184046/tools/llvm-shlib/Makefile +Index: llvm-toolchain-snapshot_3.4~svn184290/tools/llvm-shlib/Makefile =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/tools/llvm-shlib/Makefile 2013-06-15 19:43:13.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/tools/llvm-shlib/Makefile 2013-06-15 19:43:13.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/tools/llvm-shlib/Makefile 2013-06-19 11:13:58.710779586 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/tools/llvm-shlib/Makefile 2013-06-19 11:13:58.706779586 +0200 @@ -76,7 +76,7 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU)) diff --git a/debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch b/debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch index 24f73c5f..b0bacb08 100644 --- a/debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch +++ b/debian/patches/0046-Revert-Patch-to-set-is_stmt-a-little-better-for-prol.patch @@ -12,11 +12,11 @@ This reverts commit 60b35f408bc3194e7ea4e96367c0b42dc5e7f850. test/DebugInfo/X86/ending-run.ll | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-) -Index: llvm-toolchain-snapshot_3.4~svn184046/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +Index: llvm-toolchain-snapshot_3.4~svn184290/lib/CodeGen/AsmPrinter/DwarfDebug.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-06-15 19:43:14.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-06-15 19:43:14.000000000 +0200 -@@ -1318,15 +1318,12 @@ +--- llvm-toolchain-snapshot_3.4~svn184290.orig/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-06-19 11:13:59.122779597 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-06-19 11:13:59.118779599 +0200 +@@ -1315,15 +1315,12 @@ if (!MI->isDebugValue()) { DebugLoc DL = MI->getDebugLoc(); if (DL != PrevInstLoc && (!DL.isUnknown() || UnknownLocations)) { @@ -33,10 +33,10 @@ Index: llvm-toolchain-snapshot_3.4~svn184046/lib/CodeGen/AsmPrinter/DwarfDebug.c if (!DL.isUnknown()) { const MDNode *Scope = DL.getScope(Asm->MF->getFunction()->getContext()); recordSourceLine(DL.getLine(), DL.getCol(), Scope, Flags); -Index: llvm-toolchain-snapshot_3.4~svn184046/test/DebugInfo/X86/ending-run.ll +Index: llvm-toolchain-snapshot_3.4~svn184290/test/DebugInfo/X86/ending-run.ll =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/test/DebugInfo/X86/ending-run.ll 2013-06-15 19:43:14.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/test/DebugInfo/X86/ending-run.ll 2013-06-15 19:43:14.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/test/DebugInfo/X86/ending-run.ll 2013-06-19 11:13:59.122779597 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/test/DebugInfo/X86/ending-run.ll 2013-06-19 11:13:59.118779599 +0200 @@ -1,11 +1,9 @@ ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj ; RUN: llvm-dwarfdump -debug-dump=line %t | FileCheck %s diff --git a/debian/patches/0047-version-name.diff b/debian/patches/0047-version-name.diff index e6ac547a..1e5569f0 100644 --- a/debian/patches/0047-version-name.diff +++ b/debian/patches/0047-version-name.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.4~svn184046/autoconf/configure.ac +Index: llvm-toolchain-snapshot_3.4~svn184290/autoconf/configure.ac =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/autoconf/configure.ac 2013-06-15 19:43:15.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/autoconf/configure.ac 2013-06-15 19:43:15.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/autoconf/configure.ac 2013-06-19 11:13:59.530779611 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/autoconf/configure.ac 2013-06-19 11:13:59.514779605 +0200 @@ -31,7 +31,7 @@ dnl===-----------------------------------------------------------------------=== dnl Initialize autoconf and define the package name, version number and @@ -11,10 +11,10 @@ Index: llvm-toolchain-snapshot_3.4~svn184046/autoconf/configure.ac AC_DEFINE([LLVM_VERSION_MAJOR], [3], [Major version of the LLVM API]) AC_DEFINE([LLVM_VERSION_MINOR], [4], [Minor version of the LLVM API]) -Index: llvm-toolchain-snapshot_3.4~svn184046/configure +Index: llvm-toolchain-snapshot_3.4~svn184290/configure =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/configure 2013-06-15 19:43:15.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/configure 2013-06-15 19:43:15.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/configure 2013-06-19 11:13:59.530779611 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/configure 2013-06-19 11:13:59.522779599 +0200 @@ -561,8 +561,8 @@ # Identity of this package. PACKAGE_NAME='LLVM' diff --git a/debian/patches/0050-powerpcspe-fp.diff b/debian/patches/0050-powerpcspe-fp.diff index 6fc2703b..fa08d2e9 100644 --- a/debian/patches/0050-powerpcspe-fp.diff +++ b/debian/patches/0050-powerpcspe-fp.diff @@ -1,10 +1,10 @@ PPCJITInfo.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) -Index: llvm-toolchain-snapshot_3.4~svn184046/lib/Target/PowerPC/PPCJITInfo.cpp +Index: llvm-toolchain-snapshot_3.4~svn184290/lib/Target/PowerPC/PPCJITInfo.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/lib/Target/PowerPC/PPCJITInfo.cpp 2013-06-15 19:43:16.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/lib/Target/PowerPC/PPCJITInfo.cpp 2013-06-15 19:43:16.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/lib/Target/PowerPC/PPCJITInfo.cpp 2013-06-19 11:14:00.422779630 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/lib/Target/PowerPC/PPCJITInfo.cpp 2013-06-19 11:14:00.418779630 +0200 @@ -99,6 +99,7 @@ "stw r8, 196(r1)\n" "stw r7, 192(r1)\n" "stw r6, 188(r1)\n" "stw r5, 184(r1)\n" diff --git a/debian/patches/18-soname.patch b/debian/patches/18-soname.patch index 50a275c4..ff3fe863 100644 --- a/debian/patches/18-soname.patch +++ b/debian/patches/18-soname.patch @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.4~svn184046/clang/tools/libclang/Makefile +Index: llvm-toolchain-snapshot_3.4~svn184290/clang/tools/libclang/Makefile =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/clang/tools/libclang/Makefile 2013-06-15 19:42:22.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/clang/tools/libclang/Makefile 2013-06-15 19:42:22.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/tools/libclang/Makefile 2013-06-19 11:13:54.270779471 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/clang/tools/libclang/Makefile 2013-06-19 11:13:54.266779456 +0200 @@ -14,6 +14,7 @@ LINK_LIBS_IN_SHARED = 1 diff --git a/debian/patches/19-clang_debian_version.patch b/debian/patches/19-clang_debian_version.patch index 49772936..68eeb7e3 100644 --- a/debian/patches/19-clang_debian_version.patch +++ b/debian/patches/19-clang_debian_version.patch @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Basic/Version.cpp +Index: llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Basic/Version.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/clang/lib/Basic/Version.cpp 2013-06-15 19:42:30.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Basic/Version.cpp 2013-06-15 19:42:30.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/lib/Basic/Version.cpp 2013-06-19 11:13:54.910779487 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Basic/Version.cpp 2013-06-19 11:13:54.906779469 +0200 @@ -15,6 +15,7 @@ #include "clang/Basic/LLVM.h" #include "llvm/Config/config.h" diff --git a/debian/patches/21-searchPathHeaders.diff b/debian/patches/21-searchPathHeaders.diff index 49f79b2b..ff31a5a6 100644 --- a/debian/patches/21-searchPathHeaders.diff +++ b/debian/patches/21-searchPathHeaders.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Driver/ToolChains.cpp +Index: llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Driver/ToolChains.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/clang/lib/Driver/ToolChains.cpp 2013-06-15 19:42:30.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Driver/ToolChains.cpp 2013-06-15 19:42:30.000000000 +0200 -@@ -2408,6 +2408,11 @@ +--- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/lib/Driver/ToolChains.cpp 2013-06-19 11:13:55.238779496 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Driver/ToolChains.cpp 2013-06-19 11:13:55.234779499 +0200 +@@ -2409,6 +2409,11 @@ addSystemInclude(DriverArgs, CC1Args, P.str()); } diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff index eef92cd0..f5f7f619 100644 --- a/debian/patches/23-strlcpy_strlcat_warning_removed.diff +++ b/debian/patches/23-strlcpy_strlcat_warning_removed.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.4~svn184046/clang/include/clang/Basic/Builtins.def +Index: llvm-toolchain-snapshot_3.4~svn184290/clang/include/clang/Basic/Builtins.def =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/clang/include/clang/Basic/Builtins.def 2013-06-15 19:42:31.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/clang/include/clang/Basic/Builtins.def 2013-06-15 19:42:31.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/include/clang/Basic/Builtins.def 2013-06-19 11:13:55.626779508 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/clang/include/clang/Basic/Builtins.def 2013-06-19 11:13:55.618779502 +0200 @@ -466,8 +466,8 @@ BUILTIN(__builtin___stpcpy_chk, "c*c*cC*z", "nF") BUILTIN(__builtin___strcat_chk, "c*c*cC*z", "nF") @@ -24,10 +24,10 @@ Index: llvm-toolchain-snapshot_3.4~svn184046/clang/include/clang/Basic/Builtins. // id objc_msgSend(id, SEL, ...) LIBBUILTIN(objc_msgSend, "GGH.", "f", "objc/message.h", OBJC_LANG) // long double objc_msgSend_fpret(id self, SEL op, ...) -Index: llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Sema/SemaChecking.cpp +Index: llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/clang/lib/Sema/SemaChecking.cpp 2013-06-15 19:42:31.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Sema/SemaChecking.cpp 2013-06-15 19:42:31.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/lib/Sema/SemaChecking.cpp 2013-06-19 11:13:55.626779508 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Sema/SemaChecking.cpp 2013-06-19 11:13:55.622779505 +0200 @@ -575,9 +575,10 @@ return false; @@ -42,11 +42,11 @@ Index: llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Sema/SemaChecking.cpp CheckStrncatArguments(TheCall, FnInfo); else CheckMemaccessArguments(TheCall, CMId, FnInfo); -Index: llvm-toolchain-snapshot_3.4~svn184046/clang/lib/AST/Decl.cpp +Index: llvm-toolchain-snapshot_3.4~svn184290/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/clang/lib/AST/Decl.cpp 2013-06-15 19:42:31.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/clang/lib/AST/Decl.cpp 2013-06-15 19:42:31.000000000 +0200 -@@ -2802,10 +2802,10 @@ +--- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/lib/AST/Decl.cpp 2013-06-19 11:13:55.626779508 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/clang/lib/AST/Decl.cpp 2013-06-19 11:13:55.622779505 +0200 +@@ -2806,10 +2806,10 @@ case Builtin::BImemmove: return Builtin::BImemmove; @@ -61,10 +61,10 @@ Index: llvm-toolchain-snapshot_3.4~svn184046/clang/lib/AST/Decl.cpp case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-toolchain-snapshot_3.4~svn184046/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain-snapshot_3.4~svn184290/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-06-15 19:42:31.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-06-15 19:42:31.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-06-19 11:13:55.626779508 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-06-19 11:13:55.622779505 +0200 @@ -238,9 +238,9 @@ case Builtin::BIstrncpy: case Builtin::BIstrncat: diff --git a/debian/patches/26-set-correct-float-abi.diff b/debian/patches/26-set-correct-float-abi.diff index cefdb666..b468d19a 100644 --- a/debian/patches/26-set-correct-float-abi.diff +++ b/debian/patches/26-set-correct-float-abi.diff @@ -18,11 +18,11 @@ Forwarded: Reviewed-By: Last-Update: -Index: llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Driver/Tools.cpp +Index: llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Driver/Tools.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/clang/lib/Driver/Tools.cpp 2013-06-15 19:42:32.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Driver/Tools.cpp 2013-06-15 19:42:32.000000000 +0200 -@@ -674,7 +674,7 @@ +--- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/lib/Driver/Tools.cpp 2013-06-19 11:13:56.406779526 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Driver/Tools.cpp 2013-06-19 11:13:56.402779526 +0200 +@@ -675,7 +675,7 @@ FloatABI = "hard"; break; case llvm::Triple::GNUEABI: diff --git a/debian/patches/27-fix_clang_stdint.diff b/debian/patches/27-fix_clang_stdint.diff index 8d8ff80a..f6dd73ab 100644 --- a/debian/patches/27-fix_clang_stdint.diff +++ b/debian/patches/27-fix_clang_stdint.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Headers/stdint.h +Index: llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Headers/stdint.h =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/clang/lib/Headers/stdint.h 2013-06-15 19:42:31.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Headers/stdint.h 2013-06-15 19:42:31.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/lib/Headers/stdint.h 2013-06-19 11:13:56.014779511 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Headers/stdint.h 2013-06-19 11:13:56.010779511 +0200 @@ -22,8 +22,6 @@ * \*===----------------------------------------------------------------------===*/ diff --git a/debian/patches/31-powerpcspe.diff b/debian/patches/31-powerpcspe.diff index 84a7e69d..1cf52ad3 100644 --- a/debian/patches/31-powerpcspe.diff +++ b/debian/patches/31-powerpcspe.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Lex/Makefile +Index: llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Lex/Makefile =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/clang/lib/Lex/Makefile 2013-06-15 19:43:18.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Lex/Makefile 2013-06-15 19:43:18.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/lib/Lex/Makefile 2013-06-19 11:14:01.434779657 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Lex/Makefile 2013-06-19 11:14:01.430779659 +0200 @@ -17,8 +17,10 @@ LIBRARYNAME := clangLex diff --git a/debian/patches/33-armhf-defaults.diff b/debian/patches/33-armhf-defaults.diff index 45527fb0..a9634535 100644 --- a/debian/patches/33-armhf-defaults.diff +++ b/debian/patches/33-armhf-defaults.diff @@ -18,11 +18,11 @@ Forwarded: Reviewed-By: Last-Update: -Index: llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Driver/Tools.cpp +Index: llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Driver/Tools.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/clang/lib/Driver/Tools.cpp 2013-06-15 19:43:19.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Driver/Tools.cpp 2013-06-15 19:43:19.000000000 +0200 -@@ -492,6 +492,9 @@ +--- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/lib/Driver/Tools.cpp 2013-06-19 11:14:02.002779657 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Driver/Tools.cpp 2013-06-19 11:14:01.998779666 +0200 +@@ -493,6 +493,9 @@ if (Arg *A = Args.getLastArg(options::OPT_march_EQ)) { // Otherwise, if we have -march= choose the base CPU for that arch. MArch = A->getValue(); @@ -32,7 +32,7 @@ Index: llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Driver/Tools.cpp } else { // Otherwise, use the Arch from the triple. MArch = Triple.getArchName(); -@@ -787,8 +790,19 @@ +@@ -788,8 +791,19 @@ } // Honor -mfpu=. diff --git a/debian/patches/34-powerpc-no-altivec.diff b/debian/patches/34-powerpc-no-altivec.diff index 8c76d546..2f4072fc 100644 --- a/debian/patches/34-powerpc-no-altivec.diff +++ b/debian/patches/34-powerpc-no-altivec.diff @@ -6,10 +6,10 @@ Reviewed-By: Colin Watson Last-Update: 2013-04-01 -Index: llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Lex/Makefile +Index: llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Lex/Makefile =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/clang/lib/Lex/Makefile 2013-06-15 19:43:20.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Lex/Makefile 2013-06-15 19:43:20.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/lib/Lex/Makefile 2013-06-19 11:14:02.478779684 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Lex/Makefile 2013-06-19 11:14:02.474779686 +0200 @@ -16,11 +16,5 @@ LIBRARYNAME := clangLex diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff index e8c63baa..ab332676 100644 --- a/debian/patches/clang-format-version.diff +++ b/debian/patches/clang-format-version.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.4~svn184046/clang/tools/clang-format/clang-format.py +Index: llvm-toolchain-snapshot_3.4~svn184290/clang/tools/clang-format/clang-format.py =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/clang/tools/clang-format/clang-format.py 2013-06-15 19:43:21.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/clang/tools/clang-format/clang-format.py 2013-06-15 19:43:21.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/tools/clang-format/clang-format.py 2013-06-19 11:14:03.630779723 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/clang/tools/clang-format/clang-format.py 2013-06-19 11:14:03.626779732 +0200 @@ -23,7 +23,7 @@ import vim @@ -11,10 +11,10 @@ Index: llvm-toolchain-snapshot_3.4~svn184046/clang/tools/clang-format/clang-form # Change this to format according to other formatting styles (see # clang-format -help) -Index: llvm-toolchain-snapshot_3.4~svn184046/clang/tools/clang-format/clang-format-diff.py +Index: llvm-toolchain-snapshot_3.4~svn184290/clang/tools/clang-format/clang-format-diff.py =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/clang/tools/clang-format/clang-format-diff.py 2013-06-15 19:43:21.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/clang/tools/clang-format/clang-format-diff.py 2013-06-15 19:43:21.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/tools/clang-format/clang-format-diff.py 2013-06-19 11:14:03.630779723 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/clang/tools/clang-format/clang-format-diff.py 2013-06-19 11:14:03.626779732 +0200 @@ -28,7 +28,7 @@ @@ -24,10 +24,10 @@ Index: llvm-toolchain-snapshot_3.4~svn184046/clang/tools/clang-format/clang-form def getOffsetLength(filename, line_number, line_count): -Index: llvm-toolchain-snapshot_3.4~svn184046/clang/tools/clang-format/clang-format.el +Index: llvm-toolchain-snapshot_3.4~svn184290/clang/tools/clang-format/clang-format.el =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/clang/tools/clang-format/clang-format.el 2013-06-15 19:43:21.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/clang/tools/clang-format/clang-format.el 2013-06-15 19:43:21.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/tools/clang-format/clang-format.el 2013-06-19 11:14:03.630779723 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/clang/tools/clang-format/clang-format.el 2013-06-19 11:14:03.626779732 +0200 @@ -13,7 +13,7 @@ ;; *Location of the clang-format binary. If it is on your PATH, a full path name diff --git a/debian/patches/declare_clear_cache.diff b/debian/patches/declare_clear_cache.diff index 3bcdcc7f..86a6c4b6 100644 --- a/debian/patches/declare_clear_cache.diff +++ b/debian/patches/declare_clear_cache.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.4~svn184046/lib/Support/Unix/Memory.inc +Index: llvm-toolchain-snapshot_3.4~svn184290/lib/Support/Unix/Memory.inc =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/lib/Support/Unix/Memory.inc 2013-06-15 19:43:17.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/lib/Support/Unix/Memory.inc 2013-06-15 19:43:17.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/lib/Support/Unix/Memory.inc 2013-06-19 11:14:00.914779646 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/lib/Support/Unix/Memory.inc 2013-06-19 11:14:00.910779646 +0200 @@ -336,7 +336,7 @@ // FIXME: Can we safely always call this for __GNUC__ everywhere? const char *Start = static_cast(Addr); diff --git a/debian/patches/ia64-fix.diff b/debian/patches/ia64-fix.diff index 158d3f7a..8ae3c6c7 100644 --- a/debian/patches/ia64-fix.diff +++ b/debian/patches/ia64-fix.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.4~svn184046/lib/ExecutionEngine/JIT/JIT.cpp +Index: llvm-toolchain-snapshot_3.4~svn184290/lib/ExecutionEngine/JIT/JIT.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/lib/ExecutionEngine/JIT/JIT.cpp 2013-06-15 19:43:21.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/lib/ExecutionEngine/JIT/JIT.cpp 2013-06-15 19:43:21.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/lib/ExecutionEngine/JIT/JIT.cpp 2013-06-19 11:14:03.050779689 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/lib/ExecutionEngine/JIT/JIT.cpp 2013-06-19 11:14:03.046779699 +0200 @@ -68,7 +68,7 @@ } diff --git a/debian/patches/kfreebsd.diff b/debian/patches/kfreebsd.diff index 39f91215..94e517d0 100644 --- a/debian/patches/kfreebsd.diff +++ b/debian/patches/kfreebsd.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.4~svn184046/lldb/include/lldb/Host/Config.h +Index: llvm-toolchain-snapshot_3.4~svn184290/lldb/include/lldb/Host/Config.h =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/lldb/include/lldb/Host/Config.h 2013-06-15 19:43:22.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/lldb/include/lldb/Host/Config.h 2013-06-15 19:43:22.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/lldb/include/lldb/Host/Config.h 2013-06-19 11:14:04.194779756 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/lldb/include/lldb/Host/Config.h 2013-06-19 11:14:04.190779765 +0200 @@ -18,7 +18,7 @@ #include "lldb/Host/linux/Config.h" @@ -11,10 +11,10 @@ Index: llvm-toolchain-snapshot_3.4~svn184046/lldb/include/lldb/Host/Config.h #include "lldb/Host/freebsd/Config.h" -Index: llvm-toolchain-snapshot_3.4~svn184046/lldb/source/Core/Mangled.cpp +Index: llvm-toolchain-snapshot_3.4~svn184290/lldb/source/Core/Mangled.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/lldb/source/Core/Mangled.cpp 2013-06-15 19:43:22.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/lldb/source/Core/Mangled.cpp 2013-06-15 19:43:22.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/lldb/source/Core/Mangled.cpp 2013-06-19 11:14:04.194779756 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/lldb/source/Core/Mangled.cpp 2013-06-19 11:14:04.190779765 +0200 @@ -31,6 +31,7 @@ #include #include @@ -23,10 +23,10 @@ Index: llvm-toolchain-snapshot_3.4~svn184046/lldb/source/Core/Mangled.cpp using namespace lldb_private; -Index: llvm-toolchain-snapshot_3.4~svn184046/lldb/source/Host/common/Host.cpp +Index: llvm-toolchain-snapshot_3.4~svn184290/lldb/source/Host/common/Host.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/lldb/source/Host/common/Host.cpp 2013-06-15 19:43:22.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/lldb/source/Host/common/Host.cpp 2013-06-15 19:43:22.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/lldb/source/Host/common/Host.cpp 2013-06-19 11:14:04.194779756 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/lldb/source/Host/common/Host.cpp 2013-06-19 11:14:04.190779765 +0200 @@ -151,7 +151,7 @@ delete info; diff --git a/debian/patches/profile_rt.diff b/debian/patches/profile_rt.diff index b0d80aa7..85344dd6 100644 --- a/debian/patches/profile_rt.diff +++ b/debian/patches/profile_rt.diff @@ -1,16 +1,16 @@ -Index: llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Driver/Tools.cpp +Index: llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Driver/Tools.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/clang/lib/Driver/Tools.cpp 2013-06-15 19:42:37.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/clang/lib/Driver/Tools.cpp 2013-06-15 19:43:00.000000000 +0200 -@@ -33,6 +33,7 @@ - #include "llvm/Support/Host.h" +--- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/lib/Driver/Tools.cpp 2013-06-19 11:13:56.794779535 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/clang/lib/Driver/Tools.cpp 2013-06-19 11:13:56.790779531 +0200 +@@ -34,6 +34,7 @@ + #include "llvm/Support/PathV1.h" #include "llvm/Support/Process.h" #include "llvm/Support/raw_ostream.h" +#include "llvm/Config/config.h" #include using namespace clang::driver; -@@ -218,7 +219,7 @@ +@@ -219,7 +220,7 @@ // libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is // not supported by old linkers. std::string ProfileRT = diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff index d3cc5e7b..f118b704 100644 --- a/debian/patches/scan-build-clang-path.diff +++ b/debian/patches/scan-build-clang-path.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.4~svn184046/clang/tools/scan-build/scan-build +Index: llvm-toolchain-snapshot_3.4~svn184290/clang/tools/scan-build/scan-build =================================================================== ---- llvm-toolchain-snapshot_3.4~svn184046.orig/clang/tools/scan-build/scan-build 2013-06-15 19:43:15.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn184046/clang/tools/scan-build/scan-build 2013-06-15 19:43:15.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn184290.orig/clang/tools/scan-build/scan-build 2013-06-19 11:13:59.982779627 +0200 ++++ llvm-toolchain-snapshot_3.4~svn184290/clang/tools/scan-build/scan-build 2013-06-19 11:13:59.978779615 +0200 @@ -1538,7 +1538,7 @@ # Find 'clang'