From 72c5d811f9feec655fdafbf59a649f2230379032 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 29 Oct 2013 11:28:52 +0000 Subject: [PATCH] refresh of the patches --- debian/patches/0023-link-libopagent.patch | 12 ++++----- ...set-is_stmt-a-little-better-for-prol.patch | 14 +++++----- debian/patches/21-searchPathHeaders.diff | 8 +++--- .../23-strlcpy_strlcat_warning_removed.diff | 26 +++++++++---------- debian/patches/26-set-correct-float-abi.diff | 8 +++--- debian/patches/30-kfreebsd.diff | 16 ++++++------ debian/patches/atomic_library_1.diff | 14 +++++----- debian/patches/atomic_library_2.diff | 14 +++++----- debian/patches/clang-format-version.diff | 20 +++++++------- debian/patches/disable-execinfo-usage.diff | 8 +++--- debian/patches/libstdc++-header-i386.diff | 14 +++++----- debian/patches/python-clangpath.diff | 8 +++--- .../patches/removeduplicatedeclaration.diff | 8 +++--- 13 files changed, 85 insertions(+), 85 deletions(-) diff --git a/debian/patches/0023-link-libopagent.patch b/debian/patches/0023-link-libopagent.patch index a83f7922..66b5b138 100644 --- a/debian/patches/0023-link-libopagent.patch +++ b/debian/patches/0023-link-libopagent.patch @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.4~svn192346/configure +Index: llvm-toolchain-snapshot_3.4~svn193603/configure =================================================================== ---- llvm-toolchain-snapshot_3.4~svn192346.orig/configure 2013-10-10 13:38:12.610082893 +0200 -+++ llvm-toolchain-snapshot_3.4~svn192346/configure 2013-10-10 13:38:12.602082891 +0200 -@@ -13314,7 +13314,7 @@ +--- llvm-toolchain-snapshot_3.4~svn193603.orig/configure 2013-10-29 12:26:09.742137116 +0100 ++++ llvm-toolchain-snapshot_3.4~svn193603/configure 2013-10-29 12:26:09.738137117 +0100 +@@ -13315,7 +13315,7 @@ case $llvm_cv_os_type in Linux) if test -n "$llvm_cv_oppath" ; then @@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_3.4~svn192346/configure { echo "$as_me:$LINENO: checking for library containing bfd_init" >&5 echo $ECHO_N "checking for library containing bfd_init... $ECHO_C" >&6; } if test "${ac_cv_search_bfd_init+set}" = set; then -@@ -13410,7 +13410,7 @@ +@@ -13411,7 +13411,7 @@ echo "${ECHO_T}$ac_cv_search_bfd_init" >&6; } ac_res=$ac_cv_search_bfd_init if test "$ac_res" != no; then @@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_3.4~svn192346/configure fi -@@ -13446,8 +13446,8 @@ +@@ -13447,8 +13447,8 @@ if test -z "$ac_lib"; then ac_res="none required" else 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 2f08f037..89f87a94 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~svn192346/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +Index: llvm-toolchain-snapshot_3.4~svn193603/lib/CodeGen/AsmPrinter/DwarfDebug.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn192346.orig/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-10-10 13:38:17.174082789 +0200 -+++ llvm-toolchain-snapshot_3.4~svn192346/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-10-10 13:38:17.166082790 +0200 -@@ -1478,15 +1478,12 @@ +--- llvm-toolchain-snapshot_3.4~svn193603.orig/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-10-29 12:26:12.986137235 +0100 ++++ llvm-toolchain-snapshot_3.4~svn193603/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-10-29 12:26:12.982137234 +0100 +@@ -1473,15 +1473,12 @@ if (!MI->isDebugValue()) { DebugLoc DL = MI->getDebugLoc(); if (DL != PrevInstLoc && (!DL.isUnknown() || UnknownLocations)) { @@ -33,10 +33,10 @@ Index: llvm-toolchain-snapshot_3.4~svn192346/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~svn192346/test/DebugInfo/X86/ending-run.ll +Index: llvm-toolchain-snapshot_3.4~svn193603/test/DebugInfo/X86/ending-run.ll =================================================================== ---- llvm-toolchain-snapshot_3.4~svn192346.orig/test/DebugInfo/X86/ending-run.ll 2013-10-10 13:38:17.174082789 +0200 -+++ llvm-toolchain-snapshot_3.4~svn192346/test/DebugInfo/X86/ending-run.ll 2013-10-10 13:38:17.166082790 +0200 +--- llvm-toolchain-snapshot_3.4~svn193603.orig/test/DebugInfo/X86/ending-run.ll 2013-10-29 12:26:12.986137235 +0100 ++++ llvm-toolchain-snapshot_3.4~svn193603/test/DebugInfo/X86/ending-run.ll 2013-10-29 12:26:12.986137235 +0100 @@ -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/21-searchPathHeaders.diff b/debian/patches/21-searchPathHeaders.diff index d8030ec5..3ea9b7d7 100644 --- a/debian/patches/21-searchPathHeaders.diff +++ b/debian/patches/21-searchPathHeaders.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Driver/ToolChains.cpp +Index: llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Driver/ToolChains.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn192346.orig/clang/lib/Driver/ToolChains.cpp 2013-10-10 13:37:53.642083314 +0200 -+++ llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Driver/ToolChains.cpp 2013-10-10 13:37:53.634083316 +0200 -@@ -2509,6 +2509,11 @@ +--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/lib/Driver/ToolChains.cpp 2013-10-29 12:25:51.978136469 +0100 ++++ llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Driver/ToolChains.cpp 2013-10-29 12:25:51.978136469 +0100 +@@ -2521,6 +2521,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 d90222fb..bf7863a0 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~svn192346/clang/include/clang/Basic/Builtins.def +Index: llvm-toolchain-snapshot_3.4~svn193603/clang/include/clang/Basic/Builtins.def =================================================================== ---- llvm-toolchain-snapshot_3.4~svn192346.orig/clang/include/clang/Basic/Builtins.def 2013-10-10 13:37:58.942083196 +0200 -+++ llvm-toolchain-snapshot_3.4~svn192346/clang/include/clang/Basic/Builtins.def 2013-10-10 13:37:58.930083198 +0200 +--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/include/clang/Basic/Builtins.def 2013-10-29 12:25:54.470136561 +0100 ++++ llvm-toolchain-snapshot_3.4~svn193603/clang/include/clang/Basic/Builtins.def 2013-10-29 12:25:54.466136561 +0100 @@ -467,8 +467,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~svn192346/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~svn192346/clang/lib/Sema/SemaChecking.cpp +Index: llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn192346.orig/clang/lib/Sema/SemaChecking.cpp 2013-10-10 13:37:58.942083196 +0200 -+++ llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Sema/SemaChecking.cpp 2013-10-10 13:37:58.934083197 +0200 +--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/lib/Sema/SemaChecking.cpp 2013-10-29 12:25:54.470136561 +0100 ++++ llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Sema/SemaChecking.cpp 2013-10-29 12:25:54.466136561 +0100 @@ -804,9 +804,10 @@ return false; @@ -42,11 +42,11 @@ Index: llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Sema/SemaChecking.cpp CheckStrncatArguments(TheCall, FnInfo); else CheckMemaccessArguments(TheCall, CMId, FnInfo); -Index: llvm-toolchain-snapshot_3.4~svn192346/clang/lib/AST/Decl.cpp +Index: llvm-toolchain-snapshot_3.4~svn193603/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn192346.orig/clang/lib/AST/Decl.cpp 2013-10-10 13:37:58.942083196 +0200 -+++ llvm-toolchain-snapshot_3.4~svn192346/clang/lib/AST/Decl.cpp 2013-10-10 13:37:58.934083197 +0200 -@@ -3010,10 +3010,10 @@ +--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/lib/AST/Decl.cpp 2013-10-29 12:25:54.470136561 +0100 ++++ llvm-toolchain-snapshot_3.4~svn193603/clang/lib/AST/Decl.cpp 2013-10-29 12:25:54.466136561 +0100 +@@ -3006,10 +3006,10 @@ case Builtin::BImemmove: return Builtin::BImemmove; @@ -61,10 +61,10 @@ Index: llvm-toolchain-snapshot_3.4~svn192346/clang/lib/AST/Decl.cpp case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-toolchain-snapshot_3.4~svn192346/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain-snapshot_3.4~svn193603/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn192346.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-10-10 13:37:58.942083196 +0200 -+++ llvm-toolchain-snapshot_3.4~svn192346/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-10-10 13:37:58.934083197 +0200 +--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-10-29 12:25:54.470136561 +0100 ++++ llvm-toolchain-snapshot_3.4~svn193603/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp 2013-10-29 12:25:54.466136561 +0100 @@ -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 4c479549..ded5688e 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~svn192346/clang/lib/Driver/Tools.cpp +Index: llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Driver/Tools.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn192346.orig/clang/lib/Driver/Tools.cpp 2013-10-10 13:38:02.294083121 +0200 -+++ llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Driver/Tools.cpp 2013-10-10 13:38:02.290083121 +0200 -@@ -695,7 +695,7 @@ +--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/lib/Driver/Tools.cpp 2013-10-29 12:25:57.426136669 +0100 ++++ llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Driver/Tools.cpp 2013-10-29 12:26:01.000000000 +0100 +@@ -721,7 +721,7 @@ FloatABI = "hard"; break; case llvm::Triple::GNUEABI: diff --git a/debian/patches/30-kfreebsd.diff b/debian/patches/30-kfreebsd.diff index 61e9e439..96d0492e 100644 --- a/debian/patches/30-kfreebsd.diff +++ b/debian/patches/30-kfreebsd.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Driver/ToolChains.h +Index: llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Driver/ToolChains.h =================================================================== ---- llvm-toolchain-snapshot_3.4~svn192346.orig/clang/lib/Driver/ToolChains.h 2013-10-10 13:38:07.526083006 +0200 -+++ llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Driver/ToolChains.h 2013-10-10 13:38:07.518083005 +0200 -@@ -154,6 +154,8 @@ +--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/lib/Driver/ToolChains.h 2013-10-29 12:26:05.678136968 +0100 ++++ llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Driver/ToolChains.h 2013-10-29 12:26:05.674136969 +0100 +@@ -164,6 +164,8 @@ virtual bool isPICDefault() const; virtual bool isPIEDefault() const; virtual bool isPICDefaultForced() const; @@ -11,11 +11,11 @@ Index: llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Driver/ToolChains.h protected: virtual Tool *getTool(Action::ActionClass AC) const; -Index: llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Driver/ToolChains.cpp +Index: llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Driver/ToolChains.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn192346.orig/clang/lib/Driver/ToolChains.cpp 2013-10-10 13:38:07.526083006 +0200 -+++ llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Driver/ToolChains.cpp 2013-10-10 13:38:07.522083005 +0200 -@@ -944,6 +944,13 @@ +--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/lib/Driver/ToolChains.cpp 2013-10-29 12:26:05.678136968 +0100 ++++ llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Driver/ToolChains.cpp 2013-10-29 12:26:05.674136969 +0100 +@@ -952,6 +952,13 @@ return GoodVersion; } diff --git a/debian/patches/atomic_library_1.diff b/debian/patches/atomic_library_1.diff index ef71db8f..7c27c1a1 100644 --- a/debian/patches/atomic_library_1.diff +++ b/debian/patches/atomic_library_1.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Basic/Targets.cpp +Index: llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Basic/Targets.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn192346.orig/clang/lib/Basic/Targets.cpp 2013-10-10 13:39:24.086081296 +0200 -+++ llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Basic/Targets.cpp 2013-10-10 13:39:24.082081296 +0200 -@@ -3612,6 +3612,20 @@ +--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/lib/Basic/Targets.cpp 2013-10-29 12:27:55.278140961 +0100 ++++ llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Basic/Targets.cpp 2013-10-29 12:27:55.274140961 +0100 +@@ -3667,6 +3667,20 @@ return Version >= 7; } @@ -23,10 +23,10 @@ Index: llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Basic/Targets.cpp public: ARMTargetInfo(const llvm::Triple &Triple) : TargetInfo(Triple), ABI("aapcs-linux"), CPU("arm1136j-s"), -Index: llvm-toolchain-snapshot_3.4~svn192346/clang/test/CodeGen/linux-arm-atomic.c +Index: llvm-toolchain-snapshot_3.4~svn193603/clang/test/CodeGen/linux-arm-atomic.c =================================================================== ---- llvm-toolchain-snapshot_3.4~svn192346.orig/clang/test/CodeGen/linux-arm-atomic.c 2013-10-10 13:39:24.086081296 +0200 -+++ llvm-toolchain-snapshot_3.4~svn192346/clang/test/CodeGen/linux-arm-atomic.c 2013-10-10 13:39:24.082081296 +0200 +--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/test/CodeGen/linux-arm-atomic.c 2013-10-29 12:27:55.278140961 +0100 ++++ llvm-toolchain-snapshot_3.4~svn193603/clang/test/CodeGen/linux-arm-atomic.c 2013-10-29 12:27:55.278140961 +0100 @@ -1,5 +1,15 @@ // RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv7-unknown-linux | FileCheck %s // RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv6-unknown-linux | FileCheck %s diff --git a/debian/patches/atomic_library_2.diff b/debian/patches/atomic_library_2.diff index 67920d81..b00f3800 100644 --- a/debian/patches/atomic_library_2.diff +++ b/debian/patches/atomic_library_2.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.4~svn192346/clang/test/CodeGen/linux-arm-atomic.c +Index: llvm-toolchain-snapshot_3.4~svn193603/clang/test/CodeGen/linux-arm-atomic.c =================================================================== ---- llvm-toolchain-snapshot_3.4~svn192346.orig/clang/test/CodeGen/linux-arm-atomic.c 2013-10-10 13:39:28.202081206 +0200 -+++ llvm-toolchain-snapshot_3.4~svn192346/clang/test/CodeGen/linux-arm-atomic.c 2013-10-10 13:39:28.190081205 +0200 +--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/test/CodeGen/linux-arm-atomic.c 2013-10-29 12:27:57.410141039 +0100 ++++ llvm-toolchain-snapshot_3.4~svn193603/clang/test/CodeGen/linux-arm-atomic.c 2013-10-29 12:27:57.410141039 +0100 @@ -1,5 +1,6 @@ // RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv7-unknown-linux | FileCheck %s // RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv6-unknown-linux | FileCheck %s @@ -9,11 +9,11 @@ Index: llvm-toolchain-snapshot_3.4~svn192346/clang/test/CodeGen/linux-arm-atomic typedef int _Atomic_word; _Atomic_word exchange_and_add(volatile _Atomic_word *__mem, int __val) { -Index: llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Basic/Targets.cpp +Index: llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Basic/Targets.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn192346.orig/clang/lib/Basic/Targets.cpp 2013-10-10 13:39:28.202081206 +0200 -+++ llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Basic/Targets.cpp 2013-10-10 13:39:28.194081205 +0200 -@@ -3621,9 +3621,23 @@ +--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/lib/Basic/Targets.cpp 2013-10-29 12:27:57.410141039 +0100 ++++ llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Basic/Targets.cpp 2013-10-29 12:27:57.410141039 +0100 +@@ -3676,9 +3676,23 @@ if (T.getOS() != llvm::Triple::Linux) return false; StringRef ArchName = T.getArchName(); diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff index 95ac9e09..73ec3444 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~svn191027/clang/tools/clang-format/clang-format.py +Index: llvm-toolchain-snapshot_3.4~svn193603/clang/tools/clang-format/clang-format.py =================================================================== ---- llvm-toolchain-snapshot_3.4~svn191027.orig/clang/tools/clang-format/clang-format.py 2013-09-19 21:18:52.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn191027/clang/tools/clang-format/clang-format.py 2013-09-19 21:18:52.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/tools/clang-format/clang-format.py 2013-10-29 12:26:23.002137599 +0100 ++++ llvm-toolchain-snapshot_3.4~svn193603/clang/tools/clang-format/clang-format.py 2013-10-29 12:26:23.002137599 +0100 @@ -24,7 +24,7 @@ import vim @@ -11,11 +11,11 @@ Index: llvm-toolchain-snapshot_3.4~svn191027/clang/tools/clang-format/clang-form # Change this to format according to other formatting styles. See the output of # 'clang-format --help' for a list of supported styles. The default looks for -Index: llvm-toolchain-snapshot_3.4~svn191027/clang/tools/clang-format/clang-format-diff.py +Index: llvm-toolchain-snapshot_3.4~svn193603/clang/tools/clang-format/clang-format-diff.py =================================================================== ---- llvm-toolchain-snapshot_3.4~svn191027.orig/clang/tools/clang-format/clang-format-diff.py 2013-09-19 21:18:52.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn191027/clang/tools/clang-format/clang-format-diff.py 2013-09-19 21:18:52.000000000 +0200 -@@ -28,7 +28,7 @@ +--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/tools/clang-format/clang-format-diff.py 2013-10-29 12:26:23.002137599 +0100 ++++ llvm-toolchain-snapshot_3.4~svn193603/clang/tools/clang-format/clang-format-diff.py 2013-10-29 12:26:23.002137599 +0100 +@@ -31,7 +31,7 @@ # Change this to the full path if clang-format is not on the path. @@ -24,10 +24,10 @@ Index: llvm-toolchain-snapshot_3.4~svn191027/clang/tools/clang-format/clang-form def main(): -Index: llvm-toolchain-snapshot_3.4~svn191027/clang/tools/clang-format/clang-format.el +Index: llvm-toolchain-snapshot_3.4~svn193603/clang/tools/clang-format/clang-format.el =================================================================== ---- llvm-toolchain-snapshot_3.4~svn191027.orig/clang/tools/clang-format/clang-format.el 2013-09-19 21:18:52.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn191027/clang/tools/clang-format/clang-format.el 2013-09-19 21:18:52.000000000 +0200 +--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/tools/clang-format/clang-format.el 2013-10-29 12:26:23.002137599 +0100 ++++ llvm-toolchain-snapshot_3.4~svn193603/clang/tools/clang-format/clang-format.el 2013-10-29 12:26:23.002137599 +0100 @@ -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/disable-execinfo-usage.diff b/debian/patches/disable-execinfo-usage.diff index 955cc7ff..64fb845f 100644 --- a/debian/patches/disable-execinfo-usage.diff +++ b/debian/patches/disable-execinfo-usage.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.4~svn189753/lldb/lib/Makefile +Index: llvm-toolchain-snapshot_3.4~svn193603/lldb/lib/Makefile =================================================================== ---- llvm-toolchain-snapshot_3.4~svn189753.orig/lldb/lib/Makefile 2013-09-02 14:03:46.000000000 +0200 -+++ llvm-toolchain-snapshot_3.4~svn189753/lldb/lib/Makefile 2013-09-02 14:03:46.000000000 +0200 -@@ -157,5 +157,6 @@ +--- llvm-toolchain-snapshot_3.4~svn193603.orig/lldb/lib/Makefile 2013-10-29 12:26:27.542137766 +0100 ++++ llvm-toolchain-snapshot_3.4~svn193603/lldb/lib/Makefile 2013-10-29 12:26:27.542137766 +0100 +@@ -158,5 +158,6 @@ # Allow unresolved symbols. LLVMLibsOptions += -Wl,--allow-shlib-undefined # Link in python diff --git a/debian/patches/libstdc++-header-i386.diff b/debian/patches/libstdc++-header-i386.diff index 579f207b..1311d7f1 100644 --- a/debian/patches/libstdc++-header-i386.diff +++ b/debian/patches/libstdc++-header-i386.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Driver/ToolChains.cpp +Index: llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Driver/ToolChains.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn192346.orig/clang/lib/Driver/ToolChains.cpp 2013-10-10 13:38:54.530081956 +0200 -+++ llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Driver/ToolChains.cpp 2013-10-10 13:38:54.522081958 +0200 -@@ -2693,6 +2693,12 @@ +--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/lib/Driver/ToolChains.cpp 2013-10-29 12:26:35.270138047 +0100 ++++ llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Driver/ToolChains.cpp 2013-10-29 12:27:25.930139892 +0100 +@@ -2707,6 +2707,12 @@ StringRef BiarchSuffix = GCCInstallation.getBiarchSuffix(); const GCCVersion &Version = GCCInstallation.getVersion(); @@ -12,6 +12,6 @@ Index: llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Driver/ToolChains.cpp +// addLibStdCXXIncludePaths( "/usr/include/", "/c++/" + Version.str(), "i386-linux-gnu", GCCInstallation.getMultiarchSuffix(), DriverArgs, CC1Args); +#endif + - if (addLibStdCXXIncludePaths( - LibDir.str() + "/../include", "/c++/" + Version.Text, TripleStr, - MultiLibSuffix + BiarchSuffix, DriverArgs, CC1Args)) + if (addLibStdCXXIncludePaths(LibDir.str() + "/../include", + "/c++/" + Version.Text, TripleStr, BiarchSuffix, + MIPSABIDirSuffix, DriverArgs, CC1Args)) diff --git a/debian/patches/python-clangpath.diff b/debian/patches/python-clangpath.diff index e2ef68ce..6eb46e94 100644 --- a/debian/patches/python-clangpath.diff +++ b/debian/patches/python-clangpath.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.4~svn192346/clang/bindings/python/clang/cindex.py +Index: llvm-toolchain-snapshot_3.4~svn193603/clang/bindings/python/clang/cindex.py =================================================================== ---- llvm-toolchain-snapshot_3.4~svn192346.orig/clang/bindings/python/clang/cindex.py 2013-10-10 13:39:31.038081142 +0200 -+++ llvm-toolchain-snapshot_3.4~svn192346/clang/bindings/python/clang/cindex.py 2013-10-10 13:39:31.030081141 +0200 -@@ -3280,7 +3280,7 @@ +--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/bindings/python/clang/cindex.py 2013-10-29 12:27:59.218141104 +0100 ++++ llvm-toolchain-snapshot_3.4~svn193603/clang/bindings/python/clang/cindex.py 2013-10-29 12:27:59.218141104 +0100 +@@ -3335,7 +3335,7 @@ elif name == 'Windows': file = 'libclang.dll' else: diff --git a/debian/patches/removeduplicatedeclaration.diff b/debian/patches/removeduplicatedeclaration.diff index 797042d5..c6348e7c 100644 --- a/debian/patches/removeduplicatedeclaration.diff +++ b/debian/patches/removeduplicatedeclaration.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot-3.4~svn192427/clang/lib/Basic/Targets.cpp +Index: llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Basic/Targets.cpp =================================================================== ---- llvm-toolchain-snapshot-3.4~svn192427.orig/clang/lib/Basic/Targets.cpp 2013-10-11 10:36:58.260142400 +0200 -+++ llvm-toolchain-snapshot-3.4~svn192427/clang/lib/Basic/Targets.cpp 2013-10-11 10:36:58.252142403 +0200 -@@ -3612,33 +3612,6 @@ +--- llvm-toolchain-snapshot_3.4~svn193603.orig/clang/lib/Basic/Targets.cpp 2013-10-29 12:28:01.158141175 +0100 ++++ llvm-toolchain-snapshot_3.4~svn193603/clang/lib/Basic/Targets.cpp 2013-10-29 12:28:01.158141175 +0100 +@@ -3667,33 +3667,6 @@ return Version >= 7; }