diff --git a/debian/patches/0023-link-libopagent.patch b/debian/patches/0023-link-libopagent.patch index 4acdcf28..50adf9d6 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~svn188990/configure +Index: llvm-toolchain-snapshot_3.4~svn189753/configure =================================================================== ---- llvm-toolchain-snapshot_3.4~svn188990.orig/configure 2013-08-22 09:07:25.608608834 +0200 -+++ llvm-toolchain-snapshot_3.4~svn188990/configure 2013-08-22 09:07:25.604608834 +0200 -@@ -13208,7 +13208,7 @@ +--- llvm-toolchain-snapshot_3.4~svn189753.orig/configure 2013-09-02 14:03:31.000000000 +0200 ++++ llvm-toolchain-snapshot_3.4~svn189753/configure 2013-09-02 14:03:31.000000000 +0200 +@@ -13233,7 +13233,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~svn188990/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 -@@ -13304,7 +13304,7 @@ +@@ -13329,7 +13329,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~svn188990/configure fi -@@ -13340,8 +13340,8 @@ +@@ -13365,8 +13365,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 cda4160c..2bfa24c5 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~svn188990/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +Index: llvm-toolchain-snapshot_3.4~svn189753/lib/CodeGen/AsmPrinter/DwarfDebug.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn188990.orig/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-08-22 09:07:30.076608720 +0200 -+++ llvm-toolchain-snapshot_3.4~svn188990/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-08-22 09:07:30.076608720 +0200 -@@ -1412,15 +1412,12 @@ +--- llvm-toolchain-snapshot_3.4~svn189753.orig/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-09-02 14:03:34.000000000 +0200 ++++ llvm-toolchain-snapshot_3.4~svn189753/lib/CodeGen/AsmPrinter/DwarfDebug.cpp 2013-09-02 14:03:34.000000000 +0200 +@@ -1369,15 +1369,12 @@ if (!MI->isDebugValue()) { DebugLoc DL = MI->getDebugLoc(); if (DL != PrevInstLoc && (!DL.isUnknown() || UnknownLocations)) { @@ -33,10 +33,10 @@ Index: llvm-toolchain-snapshot_3.4~svn188990/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~svn188990/test/DebugInfo/X86/ending-run.ll +Index: llvm-toolchain-snapshot_3.4~svn189753/test/DebugInfo/X86/ending-run.ll =================================================================== ---- llvm-toolchain-snapshot_3.4~svn188990.orig/test/DebugInfo/X86/ending-run.ll 2013-08-22 09:07:30.076608720 +0200 -+++ llvm-toolchain-snapshot_3.4~svn188990/test/DebugInfo/X86/ending-run.ll 2013-08-22 09:07:30.076608720 +0200 +--- llvm-toolchain-snapshot_3.4~svn189753.orig/test/DebugInfo/X86/ending-run.ll 2013-09-02 14:03:34.000000000 +0200 ++++ llvm-toolchain-snapshot_3.4~svn189753/test/DebugInfo/X86/ending-run.ll 2013-09-02 14:03:34.000000000 +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/21-searchPathHeaders.diff b/debian/patches/21-searchPathHeaders.diff index 7a3a6b60..be61c490 100644 --- a/debian/patches/21-searchPathHeaders.diff +++ b/debian/patches/21-searchPathHeaders.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.4~svn188146/clang/lib/Driver/ToolChains.cpp +Index: llvm-toolchain-snapshot_3.4~svn189753/clang/lib/Driver/ToolChains.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn188146.orig/clang/lib/Driver/ToolChains.cpp 2013-08-11 10:01:27.552734888 +0200 -+++ llvm-toolchain-snapshot_3.4~svn188146/clang/lib/Driver/ToolChains.cpp 2013-08-11 10:01:27.548734887 +0200 -@@ -2415,6 +2415,11 @@ +--- llvm-toolchain-snapshot_3.4~svn189753.orig/clang/lib/Driver/ToolChains.cpp 2013-09-02 14:03:19.000000000 +0200 ++++ llvm-toolchain-snapshot_3.4~svn189753/clang/lib/Driver/ToolChains.cpp 2013-09-02 14:03:19.000000000 +0200 +@@ -2426,6 +2426,11 @@ addSystemInclude(DriverArgs, CC1Args, P.str()); } diff --git a/debian/patches/30-kfreebsd.diff b/debian/patches/30-kfreebsd.diff index cc1d9e6b..72246785 100644 --- a/debian/patches/30-kfreebsd.diff +++ b/debian/patches/30-kfreebsd.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.4~svn188990/clang/lib/Driver/ToolChains.h +Index: llvm-toolchain-snapshot_3.4~svn189753/clang/lib/Driver/ToolChains.h =================================================================== ---- llvm-toolchain-snapshot_3.4~svn188990.orig/clang/lib/Driver/ToolChains.h 2013-08-22 09:07:17.880609031 +0200 -+++ llvm-toolchain-snapshot_3.4~svn188990/clang/lib/Driver/ToolChains.h 2013-08-22 09:07:17.872609031 +0200 -@@ -141,6 +141,8 @@ +--- llvm-toolchain-snapshot_3.4~svn189753.orig/clang/lib/Driver/ToolChains.h 2013-09-02 14:03:25.000000000 +0200 ++++ llvm-toolchain-snapshot_3.4~svn189753/clang/lib/Driver/ToolChains.h 2013-09-02 14:03:25.000000000 +0200 +@@ -144,6 +144,8 @@ virtual bool isPICDefault() const; virtual bool isPIEDefault() const; virtual bool isPICDefaultForced() const; @@ -11,11 +11,11 @@ Index: llvm-toolchain-snapshot_3.4~svn188990/clang/lib/Driver/ToolChains.h protected: virtual Tool *getTool(Action::ActionClass AC) const; -Index: llvm-toolchain-snapshot_3.4~svn188990/clang/lib/Driver/ToolChains.cpp +Index: llvm-toolchain-snapshot_3.4~svn189753/clang/lib/Driver/ToolChains.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn188990.orig/clang/lib/Driver/ToolChains.cpp 2013-08-22 09:07:17.880609031 +0200 -+++ llvm-toolchain-snapshot_3.4~svn188990/clang/lib/Driver/ToolChains.cpp 2013-08-22 09:07:17.872609031 +0200 -@@ -942,6 +942,13 @@ +--- llvm-toolchain-snapshot_3.4~svn189753.orig/clang/lib/Driver/ToolChains.cpp 2013-09-02 14:03:25.000000000 +0200 ++++ llvm-toolchain-snapshot_3.4~svn189753/clang/lib/Driver/ToolChains.cpp 2013-09-02 14:03:25.000000000 +0200 +@@ -944,6 +944,13 @@ return GoodVersion; } diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff index 0f09ada7..89ad5c06 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~svn188990/clang/tools/clang-format/clang-format.py +Index: llvm-toolchain-snapshot_3.4~svn189753/clang/tools/clang-format/clang-format.py =================================================================== ---- llvm-toolchain-snapshot_3.4~svn188990.orig/clang/tools/clang-format/clang-format.py 2013-08-22 09:11:28.544602646 +0200 -+++ llvm-toolchain-snapshot_3.4~svn188990/clang/tools/clang-format/clang-format.py 2013-08-22 09:11:28.540602646 +0200 +--- llvm-toolchain-snapshot_3.4~svn189753.orig/clang/tools/clang-format/clang-format.py 2013-09-02 14:03:41.000000000 +0200 ++++ llvm-toolchain-snapshot_3.4~svn189753/clang/tools/clang-format/clang-format.py 2013-09-02 14:03:41.000000000 +0200 @@ -24,7 +24,7 @@ import vim @@ -9,12 +9,12 @@ Index: llvm-toolchain-snapshot_3.4~svn188990/clang/tools/clang-format/clang-form -binary = 'clang-format' +binary = 'clang-format-3.4' - # Change this to format according to other formatting styles (see - # clang-format -help) -Index: llvm-toolchain-snapshot_3.4~svn188990/clang/tools/clang-format/clang-format-diff.py + # 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~svn189753/clang/tools/clang-format/clang-format-diff.py =================================================================== ---- llvm-toolchain-snapshot_3.4~svn188990.orig/clang/tools/clang-format/clang-format-diff.py 2013-08-22 09:11:28.544602646 +0200 -+++ llvm-toolchain-snapshot_3.4~svn188990/clang/tools/clang-format/clang-format-diff.py 2013-08-22 09:11:28.544602646 +0200 +--- llvm-toolchain-snapshot_3.4~svn189753.orig/clang/tools/clang-format/clang-format-diff.py 2013-09-02 14:03:41.000000000 +0200 ++++ llvm-toolchain-snapshot_3.4~svn189753/clang/tools/clang-format/clang-format-diff.py 2013-09-02 14:03:41.000000000 +0200 @@ -28,7 +28,7 @@ @@ -24,10 +24,10 @@ Index: llvm-toolchain-snapshot_3.4~svn188990/clang/tools/clang-format/clang-form def getOffsetLength(filename, line_number, line_count): -Index: llvm-toolchain-snapshot_3.4~svn188990/clang/tools/clang-format/clang-format.el +Index: llvm-toolchain-snapshot_3.4~svn189753/clang/tools/clang-format/clang-format.el =================================================================== ---- llvm-toolchain-snapshot_3.4~svn188990.orig/clang/tools/clang-format/clang-format.el 2013-08-22 09:11:28.544602646 +0200 -+++ llvm-toolchain-snapshot_3.4~svn188990/clang/tools/clang-format/clang-format.el 2013-08-22 09:11:28.544602646 +0200 +--- llvm-toolchain-snapshot_3.4~svn189753.orig/clang/tools/clang-format/clang-format.el 2013-09-02 14:03:41.000000000 +0200 ++++ llvm-toolchain-snapshot_3.4~svn189753/clang/tools/clang-format/clang-format.el 2013-09-02 14:03:41.000000000 +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/disable-execinfo-usage.diff b/debian/patches/disable-execinfo-usage.diff index 9d69bc42..955cc7ff 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~svn188990/lldb/lib/Makefile +Index: llvm-toolchain-snapshot_3.4~svn189753/lldb/lib/Makefile =================================================================== ---- llvm-toolchain-snapshot_3.4~svn188990.orig/lldb/lib/Makefile 2013-08-22 09:13:54.676598924 +0200 -+++ llvm-toolchain-snapshot_3.4~svn188990/lldb/lib/Makefile 2013-08-22 09:13:54.672598924 +0200 -@@ -154,5 +154,6 @@ +--- 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 @@ # Allow unresolved symbols. LLVMLibsOptions += -Wl,--allow-shlib-undefined # Link in python diff --git a/debian/patches/unwind-chain-inclusion.diff b/debian/patches/unwind-chain-inclusion.diff index 7b475e35..6299eb75 100644 --- a/debian/patches/unwind-chain-inclusion.diff +++ b/debian/patches/unwind-chain-inclusion.diff @@ -4,10 +4,10 @@ # Because of the #ifndef __CLANG_UNWIND_H, it might never include any declaration # from the system. -Index: llvm-toolchain-snapshot_3.4~svn188990/clang/lib/Headers/unwind.h +Index: llvm-toolchain-snapshot_3.4~svn189753/clang/lib/Headers/unwind.h =================================================================== ---- llvm-toolchain-snapshot_3.4~svn188990.orig/clang/lib/Headers/unwind.h 2013-08-22 09:13:57.600598849 +0200 -+++ llvm-toolchain-snapshot_3.4~svn188990/clang/lib/Headers/unwind.h 2013-08-22 09:13:57.600598849 +0200 +--- llvm-toolchain-snapshot_3.4~svn189753.orig/clang/lib/Headers/unwind.h 2013-09-02 14:03:54.000000000 +0200 ++++ llvm-toolchain-snapshot_3.4~svn189753/clang/lib/Headers/unwind.h 2013-09-02 14:03:54.000000000 +0200 @@ -23,9 +23,6 @@ /* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/ @@ -16,8 +16,8 @@ Index: llvm-toolchain-snapshot_3.4~svn188990/clang/lib/Headers/unwind.h -#define __CLANG_UNWIND_H - #if __has_include_next() - /* Darwin and libunwind provide an unwind.h. If that's available, use - * it. libunwind wraps some of its definitions in #ifdef _GNU_SOURCE, + /* Darwin (from 11.x on) and libunwind provide an unwind.h. If that's available, + * use it. libunwind wraps some of its definitions in #ifdef _GNU_SOURCE, @@ -53,6 +50,9 @@ # endif #else @@ -28,7 +28,7 @@ Index: llvm-toolchain-snapshot_3.4~svn188990/clang/lib/Headers/unwind.h #include #ifdef __cplusplus -@@ -128,6 +128,7 @@ +@@ -243,6 +243,7 @@ } #endif