diff --git a/debian/patches/0003-Debian-version-info-and-bugreport.patch b/debian/patches/0003-Debian-version-info-and-bugreport.patch index 38921e00..6d28f022 100644 --- a/debian/patches/0003-Debian-version-info-and-bugreport.patch +++ b/debian/patches/0003-Debian-version-info-and-bugreport.patch @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.5~svn211104/lib/Support/CommandLine.cpp +Index: llvm-toolchain-snapshot_3.7~svn241915/lib/Support/CommandLine.cpp =================================================================== ---- llvm-toolchain-snapshot_3.5~svn211104.orig/lib/Support/CommandLine.cpp -+++ llvm-toolchain-snapshot_3.5~svn211104/lib/Support/CommandLine.cpp -@@ -1702,6 +1702,10 @@ public: +--- llvm-toolchain-snapshot_3.7~svn241915.orig/lib/Support/CommandLine.cpp ++++ llvm-toolchain-snapshot_3.7~svn241915/lib/Support/CommandLine.cpp +@@ -1747,6 +1747,10 @@ public: OS << " " << LLVM_VERSION_INFO; #endif OS << "\n "; diff --git a/debian/patches/0021-shared-lib-debian.patch b/debian/patches/0021-shared-lib-debian.patch index 5e6f1b9f..b6291fb7 100644 --- a/debian/patches/0021-shared-lib-debian.patch +++ b/debian/patches/0021-shared-lib-debian.patch @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.5~svn199197/tools/llvm-shlib/Makefile +Index: llvm-toolchain-snapshot_3.7~svn241915/tools/llvm-shlib/Makefile =================================================================== ---- llvm-toolchain-snapshot_3.5~svn199197.orig/tools/llvm-shlib/Makefile 2014-01-14 11:30:43.656868813 +0100 -+++ llvm-toolchain-snapshot_3.5~svn199197/tools/llvm-shlib/Makefile 2014-01-14 11:30:43.652868813 +0100 -@@ -39,6 +39,12 @@ +--- llvm-toolchain-snapshot_3.7~svn241915.orig/tools/llvm-shlib/Makefile ++++ llvm-toolchain-snapshot_3.7~svn241915/tools/llvm-shlib/Makefile +@@ -41,6 +41,12 @@ LLVMLibsOptions := $(IncludeInLibLlvm:$( LLVMLibsPaths := $(IncludeInLibLlvm) $(LibName.SO): $(LLVMLibsPaths) @@ -15,7 +15,7 @@ Index: llvm-toolchain-snapshot_3.5~svn199197/tools/llvm-shlib/Makefile ifeq ($(HOST_OS),Darwin) # set dylib internal version number to llvmCore submission number -@@ -67,7 +73,7 @@ +@@ -61,7 +67,7 @@ endif ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD GNU)) # Add soname to the library. diff --git a/debian/patches/0023-link-libopagent.patch b/debian/patches/0023-link-libopagent.patch index 37466fcf..7a4ac528 100644 --- a/debian/patches/0023-link-libopagent.patch +++ b/debian/patches/0023-link-libopagent.patch @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.5~svn200375/configure +Index: llvm-toolchain-snapshot_3.7~svn241915/configure =================================================================== ---- llvm-toolchain-snapshot_3.5~svn200375.orig/configure 2014-01-29 07:45:49.420720434 -0800 -+++ llvm-toolchain-snapshot_3.5~svn200375/configure 2014-01-29 07:45:49.416720434 -0800 -@@ -13392,7 +13392,7 @@ +--- llvm-toolchain-snapshot_3.7~svn241915.orig/configure ++++ llvm-toolchain-snapshot_3.7~svn241915/configure +@@ -10115,7 +10115,7 @@ if test "${with_oprofile+set}" = set; th case $llvm_cv_os_type in Linux) if test -n "$llvm_cv_oppath" ; then @@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_3.5~svn200375/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 -@@ -13488,7 +13488,7 @@ +@@ -10211,7 +10211,7 @@ fi 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.5~svn200375/configure fi -@@ -13524,8 +13524,8 @@ +@@ -10247,8 +10247,8 @@ for ac_lib in '' opagent; do if test -z "$ac_lib"; then ac_res="none required" else diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff index 5cf7f556..e478bc77 100644 --- a/debian/patches/0044-soname.diff +++ b/debian/patches/0044-soname.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.5~svn199197/tools/llvm-shlib/Makefile +Index: llvm-toolchain-snapshot_3.7~svn241915/tools/llvm-shlib/Makefile =================================================================== ---- llvm-toolchain-3.4_3.4~svn209031.orig/tools/llvm-shlib/Makefile -+++ llvm-toolchain-3.4_3.4~svn209031/tools/llvm-shlib/Makefile -@@ -78,7 +78,7 @@ endif +--- llvm-toolchain-snapshot_3.7~svn241915.orig/tools/llvm-shlib/Makefile ++++ llvm-toolchain-snapshot_3.7~svn241915/tools/llvm-shlib/Makefile +@@ -67,7 +67,7 @@ endif ifeq ($(HOST_OS), $(filter $(HOST_OS), DragonFly Linux FreeBSD GNU/kFreeBSD GNU)) # Add soname to the library. diff --git a/debian/patches/18-soname.patch b/debian/patches/18-soname.patch index 8bafacc6..fe812e0f 100644 --- a/debian/patches/18-soname.patch +++ b/debian/patches/18-soname.patch @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.6~svn214630/clang/tools/libclang/Makefile +Index: llvm-toolchain-snapshot_3.7~svn241915/clang/tools/libclang/Makefile =================================================================== ---- llvm-toolchain-snapshot_3.6~svn214630.orig/clang/tools/libclang/Makefile -+++ llvm-toolchain-snapshot_3.6~svn214630/clang/tools/libclang/Makefile +--- llvm-toolchain-snapshot_3.7~svn241915.orig/clang/tools/libclang/Makefile ++++ llvm-toolchain-snapshot_3.7~svn241915/clang/tools/libclang/Makefile @@ -14,6 +14,7 @@ EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/l LINK_LIBS_IN_SHARED = 1 @@ -9,8 +9,8 @@ Index: llvm-toolchain-snapshot_3.6~svn214630/clang/tools/libclang/Makefile +SONAME_MAJOR=1 include $(CLANG_LEVEL)/../../Makefile.config - LINK_COMPONENTS := AsmParser BitReader Core MC MCParser Option Support -@@ -34,7 +35,7 @@ include $(CLANG_LEVEL)/Makefile + LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter core \ +@@ -36,7 +37,7 @@ include $(CLANG_LEVEL)/Makefile # Add soname to the library. ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU GNU/kFreeBSD)) diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff index bf642d48..a4130f06 100644 --- a/debian/patches/23-strlcpy_strlcat_warning_removed.diff +++ b/debian/patches/23-strlcpy_strlcat_warning_removed.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.6~svn218443/clang/include/clang/Basic/Builtins.def +Index: llvm-toolchain-snapshot_3.7~svn241915/clang/include/clang/Basic/Builtins.def =================================================================== ---- llvm-toolchain-snapshot_3.6~svn218443.orig/clang/include/clang/Basic/Builtins.def -+++ llvm-toolchain-snapshot_3.6~svn218443/clang/include/clang/Basic/Builtins.def -@@ -474,8 +474,8 @@ BUILTIN(__builtin___memset_chk, "v*v*izz +--- llvm-toolchain-snapshot_3.7~svn241915.orig/clang/include/clang/Basic/Builtins.def ++++ llvm-toolchain-snapshot_3.7~svn241915/clang/include/clang/Basic/Builtins.def +@@ -475,8 +475,8 @@ BUILTIN(__builtin___memset_chk, "v*v*izz BUILTIN(__builtin___stpcpy_chk, "c*c*cC*z", "nF") BUILTIN(__builtin___strcat_chk, "c*c*cC*z", "nF") BUILTIN(__builtin___strcpy_chk, "c*c*cC*z", "nF") @@ -13,7 +13,7 @@ Index: llvm-toolchain-snapshot_3.6~svn218443/clang/include/clang/Basic/Builtins. BUILTIN(__builtin___strncat_chk, "c*c*cC*zz", "nF") BUILTIN(__builtin___strncpy_chk, "c*c*cC*zz", "nF") BUILTIN(__builtin___stpncpy_chk, "c*c*cC*zz", "nF") -@@ -779,8 +779,8 @@ LIBBUILTIN(getcontext, "iK*", "fj", +@@ -805,8 +805,8 @@ LIBBUILTIN(getcontext, "iK*", "fj", LIBBUILTIN(_longjmp, "vJi", "fr", "setjmp.h", ALL_GNU_LANGUAGES) LIBBUILTIN(siglongjmp, "vSJi", "fr", "setjmp.h", ALL_GNU_LANGUAGES) // non-standard but very common @@ -24,11 +24,11 @@ Index: llvm-toolchain-snapshot_3.6~svn218443/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.6~svn218443/clang/lib/Sema/SemaChecking.cpp +Index: llvm-toolchain-snapshot_3.7~svn241915/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-toolchain-snapshot_3.6~svn218443.orig/clang/lib/Sema/SemaChecking.cpp -+++ llvm-toolchain-snapshot_3.6~svn218443/clang/lib/Sema/SemaChecking.cpp -@@ -367,8 +367,8 @@ Sema::CheckBuiltinFunctionCall(FunctionD +--- llvm-toolchain-snapshot_3.7~svn241915.orig/clang/lib/Sema/SemaChecking.cpp ++++ llvm-toolchain-snapshot_3.7~svn241915/clang/lib/Sema/SemaChecking.cpp +@@ -473,8 +473,8 @@ Sema::CheckBuiltinFunctionCall(FunctionD case Builtin::BI__builtin___memcpy_chk: case Builtin::BI__builtin___memmove_chk: case Builtin::BI__builtin___memset_chk: @@ -39,7 +39,7 @@ Index: llvm-toolchain-snapshot_3.6~svn218443/clang/lib/Sema/SemaChecking.cpp case Builtin::BI__builtin___strncat_chk: case Builtin::BI__builtin___strncpy_chk: case Builtin::BI__builtin___stpncpy_chk: -@@ -1007,9 +1007,10 @@ bool Sema::CheckFunctionCall(FunctionDec +@@ -1402,9 +1402,10 @@ bool Sema::CheckFunctionCall(FunctionDec return false; // Handle memory setting and copying functions. @@ -53,11 +53,11 @@ Index: llvm-toolchain-snapshot_3.6~svn218443/clang/lib/Sema/SemaChecking.cpp CheckStrncatArguments(TheCall, FnInfo); else CheckMemaccessArguments(TheCall, CMId, FnInfo); -Index: llvm-toolchain-snapshot_3.6~svn218443/clang/lib/AST/Decl.cpp +Index: llvm-toolchain-snapshot_3.7~svn241915/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-toolchain-snapshot_3.6~svn218443.orig/clang/lib/AST/Decl.cpp -+++ llvm-toolchain-snapshot_3.6~svn218443/clang/lib/AST/Decl.cpp -@@ -3187,13 +3187,13 @@ unsigned FunctionDecl::getMemoryFunction +--- llvm-toolchain-snapshot_3.7~svn241915.orig/clang/lib/AST/Decl.cpp ++++ llvm-toolchain-snapshot_3.7~svn241915/clang/lib/AST/Decl.cpp +@@ -3242,13 +3242,13 @@ unsigned FunctionDecl::getMemoryFunction case Builtin::BImemmove: return Builtin::BImemmove; @@ -77,10 +77,10 @@ Index: llvm-toolchain-snapshot_3.6~svn218443/clang/lib/AST/Decl.cpp case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-toolchain-snapshot_3.6~svn218443/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain-snapshot_3.7~svn241915/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-toolchain-snapshot_3.6~svn218443.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -+++ llvm-toolchain-snapshot_3.6~svn218443/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +--- llvm-toolchain-snapshot_3.7~svn241915.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp ++++ llvm-toolchain-snapshot_3.7~svn241915/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp @@ -237,9 +237,9 @@ GenericTaintChecker::TaintPropagationRul case Builtin::BIstrncpy: case Builtin::BIstrncat: @@ -94,9 +94,9 @@ Index: llvm-toolchain-snapshot_3.6~svn218443/clang/lib/StaticAnalyzer/Checkers/G case Builtin::BIstrndup: return TaintPropagationRule(0, 1, ReturnValueIndex); -Index: llvm-toolchain-snapshot_3.6~svn218443/clang/test/Sema/warn-strlcpycat-size.c +Index: llvm-toolchain-snapshot_3.7~svn241915/clang/test/Sema/warn-strlcpycat-size.c =================================================================== ---- llvm-toolchain-snapshot_3.6~svn218443.orig/clang/test/Sema/warn-strlcpycat-size.c +--- llvm-toolchain-snapshot_3.7~svn241915.orig/clang/test/Sema/warn-strlcpycat-size.c +++ /dev/null @@ -1,55 +0,0 @@ -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s @@ -154,11 +154,11 @@ Index: llvm-toolchain-snapshot_3.6~svn218443/clang/test/Sema/warn-strlcpycat-siz - - strlcpy(z, str, sizeof(str)); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}} expected-note {{change size argument to be the size of the destination}} -} -Index: llvm-toolchain-snapshot_3.6~svn218443/clang/test/Sema/builtins.c +Index: llvm-toolchain-snapshot_3.7~svn241915/clang/test/Sema/builtins.c =================================================================== ---- llvm-toolchain-snapshot_3.6~svn218443.orig/clang/test/Sema/builtins.c -+++ llvm-toolchain-snapshot_3.6~svn218443/clang/test/Sema/builtins.c -@@ -185,11 +185,11 @@ void test18() { +--- llvm-toolchain-snapshot_3.7~svn241915.orig/clang/test/Sema/builtins.c ++++ llvm-toolchain-snapshot_3.7~svn241915/clang/test/Sema/builtins.c +@@ -190,11 +190,11 @@ void test18() { ptr = __builtin___memccpy_chk(dst, src, '\037', sizeof(src), sizeof(dst)); result = __builtin___strlcpy_chk(dst, src, sizeof(dst), sizeof(dst)); @@ -172,7 +172,7 @@ Index: llvm-toolchain-snapshot_3.6~svn218443/clang/test/Sema/builtins.c } void no_ms_builtins() { -@@ -204,12 +204,12 @@ void unavailable() { +@@ -209,12 +209,12 @@ void unavailable() { } // rdar://18259539 @@ -188,7 +188,7 @@ Index: llvm-toolchain-snapshot_3.6~svn218443/clang/test/Sema/builtins.c static char buf[20]; strlcpy(buf, b, sizeof(b)); // expected-warning {{size argument in 'strlcpy' call appears to be size of the source; expected the size of the destination}} \\ -@@ -224,6 +224,7 @@ void Test19(void) +@@ -229,6 +229,7 @@ void Test19(void) __builtin___strlcat_chk(buf, b, sizeof(b), __builtin_object_size(buf, 0)); // expected-warning {{size argument in '__builtin___strlcat_chk' call appears to be size of the source; expected the size of the destination}} \ // expected-note {{change size argument to be the size of the destination}} \ // expected-warning {{'__builtin___strlcat_chk' will always overflow destination buffer}} diff --git a/debian/patches/26-set-correct-float-abi.diff b/debian/patches/26-set-correct-float-abi.diff index 520d7f23..a0893606 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.5~svn200375/clang/lib/Driver/Tools.cpp +Index: llvm-toolchain-snapshot_3.7~svn241915/clang/lib/Driver/Tools.cpp =================================================================== ---- llvm-toolchain-snapshot_3.5~svn200375.orig/clang/lib/Driver/Tools.cpp 2014-01-29 07:45:42.592720648 -0800 -+++ llvm-toolchain-snapshot_3.5~svn200375/clang/lib/Driver/Tools.cpp 2014-01-29 07:45:42.592720648 -0800 -@@ -649,7 +649,7 @@ +--- llvm-toolchain-snapshot_3.7~svn241915.orig/clang/lib/Driver/Tools.cpp ++++ llvm-toolchain-snapshot_3.7~svn241915/clang/lib/Driver/Tools.cpp +@@ -604,7 +604,7 @@ StringRef tools::arm::getARMFloatABI(con 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 88852b5e..6cb67802 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~svn188990/clang/lib/Headers/stdint.h +Index: llvm-toolchain-snapshot_3.7~svn241915/clang/lib/Headers/stdint.h =================================================================== ---- llvm-toolchain-snapshot_3.4~svn188990.orig/clang/lib/Headers/stdint.h 2013-08-22 09:07:08.468609270 +0200 -+++ llvm-toolchain-snapshot_3.4~svn188990/clang/lib/Headers/stdint.h 2013-08-22 09:07:08.460609271 +0200 +--- llvm-toolchain-snapshot_3.7~svn241915.orig/clang/lib/Headers/stdint.h ++++ llvm-toolchain-snapshot_3.7~svn241915/clang/lib/Headers/stdint.h @@ -22,8 +22,6 @@ * \*===----------------------------------------------------------------------===*/ @@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_3.4~svn188990/clang/lib/Headers/stdint.h /* If we're hosted, fall back to the system's stdint.h, which might have * additional definitions. -@@ -73,6 +71,8 @@ +@@ -72,6 +70,8 @@ # endif #else @@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_3.4~svn188990/clang/lib/Headers/stdint.h /* C99 7.18.1.1 Exact-width integer types. * C99 7.18.1.2 Minimum-width integer types. -@@ -704,5 +704,5 @@ +@@ -703,5 +703,5 @@ typedef __UINTMAX_TYPE__ uintmax_t; #define INTMAX_C(v) __INTN_C(__INTMAX_WIDTH__, v) #define UINTMAX_C(v) __UINTN_C(__INTMAX_WIDTH__, v) diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff index fd01cf34..54a98dba 100644 --- a/debian/patches/clang-format-version.diff +++ b/debian/patches/clang-format-version.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.6~svn225450/clang/tools/clang-format/clang-format.py +Index: llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-format.py =================================================================== ---- llvm-toolchain-snapshot_3.6~svn225450.orig/clang/tools/clang-format/clang-format.py -+++ llvm-toolchain-snapshot_3.6~svn225450/clang/tools/clang-format/clang-format.py +--- llvm-toolchain-snapshot_3.7~svn241915.orig/clang/tools/clang-format/clang-format.py ++++ llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-format.py @@ -25,7 +25,7 @@ import vim # set g:clang_format_path to the path to clang-format if it is not on the path @@ -11,10 +11,10 @@ Index: llvm-toolchain-snapshot_3.6~svn225450/clang/tools/clang-format/clang-form if vim.eval('exists("g:clang_format_path")') == "1": binary = vim.eval('g:clang_format_path') -Index: llvm-toolchain-snapshot_3.6~svn225450/clang/tools/clang-format/clang-format-diff.py +Index: llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-format-diff.py =================================================================== ---- llvm-toolchain-snapshot_3.6~svn225450.orig/clang/tools/clang-format/clang-format-diff.py -+++ llvm-toolchain-snapshot_3.6~svn225450/clang/tools/clang-format/clang-format-diff.py +--- llvm-toolchain-snapshot_3.7~svn241915.orig/clang/tools/clang-format/clang-format-diff.py ++++ llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-format-diff.py @@ -32,7 +32,7 @@ import sys @@ -24,11 +24,11 @@ Index: llvm-toolchain-snapshot_3.6~svn225450/clang/tools/clang-format/clang-form def main(): -Index: llvm-toolchain-snapshot_3.6~svn225450/clang/tools/clang-format/clang-format.el +Index: llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-format.el =================================================================== ---- llvm-toolchain-snapshot_3.6~svn225450.orig/clang/tools/clang-format/clang-format.el -+++ llvm-toolchain-snapshot_3.6~svn225450/clang/tools/clang-format/clang-format.el -@@ -35,7 +35,7 @@ +--- llvm-toolchain-snapshot_3.7~svn241915.orig/clang/tools/clang-format/clang-format.el ++++ llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-format.el +@@ -36,7 +36,7 @@ :group 'tools) (defcustom clang-format-executable diff --git a/debian/patches/declare_clear_cache.diff b/debian/patches/declare_clear_cache.diff index 43f77762..6b55296d 100644 --- a/debian/patches/declare_clear_cache.diff +++ b/debian/patches/declare_clear_cache.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.7~svn227300/lib/Support/Unix/Memory.inc +Index: llvm-toolchain-snapshot_3.7~svn241915/lib/Support/Unix/Memory.inc =================================================================== ---- llvm-toolchain-snapshot_3.7~svn227300.orig/lib/Support/Unix/Memory.inc -+++ llvm-toolchain-snapshot_3.7~svn227300/lib/Support/Unix/Memory.inc +--- llvm-toolchain-snapshot_3.7~svn241915.orig/lib/Support/Unix/Memory.inc ++++ llvm-toolchain-snapshot_3.7~svn241915/lib/Support/Unix/Memory.inc @@ -338,7 +338,7 @@ void Memory::InvalidateInstructionCache( // FIXME: Can we safely always call this for __GNUC__ everywhere? const char *Start = static_cast(Addr); diff --git a/debian/patches/disable-execinfo-usage.diff b/debian/patches/disable-execinfo-usage.diff index 41fd33d1..18f3efc7 100644 --- a/debian/patches/disable-execinfo-usage.diff +++ b/debian/patches/disable-execinfo-usage.diff @@ -1,13 +1,12 @@ -Index: llvm-toolchain-snapshot_3.5~svn200683/lldb/lib/Makefile +Index: llvm-toolchain-snapshot_3.7~svn241915/lldb/lib/Makefile =================================================================== ---- llvm-toolchain-snapshot_3.5~svn200683.orig/lldb/lib/Makefile 2014-02-03 11:55:31.481978272 +0100 -+++ llvm-toolchain-snapshot_3.5~svn200683/lldb/lib/Makefile 2014-02-03 11:56:18.401976802 +0100 -@@ -160,6 +160,7 @@ +--- llvm-toolchain-snapshot_3.7~svn241915.orig/lldb/lib/Makefile ++++ llvm-toolchain-snapshot_3.7~svn241915/lldb/lib/Makefile +@@ -200,6 +200,6 @@ ifeq ($(HOST_OS),FreeBSD) # Allow unresolved symbols. LLVMLibsOptions += -Wl,--allow-shlib-undefined # Link in python - LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -L/usr/local/lib -lexecinfo \ + LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt \ - -ledit -lncurses -lpanel -+# -L/usr/local/lib -lexecinfo + -ledit -lncurses -lpanel -lpthread endif diff --git a/debian/patches/lldb-libname.diff b/debian/patches/lldb-libname.diff index d8ec11d6..e0f84e3b 100644 --- a/debian/patches/lldb-libname.diff +++ b/debian/patches/lldb-libname.diff @@ -1,13 +1,13 @@ -Index: llvm-toolchain-3.5-3.5~+rc4/lldb/lib/Makefile +Index: llvm-toolchain-snapshot_3.7~svn241915/lldb/lib/Makefile =================================================================== ---- llvm-toolchain-3.5-3.5~+rc4.orig/lldb/lib/Makefile -+++ llvm-toolchain-3.5-3.5~+rc4/lldb/lib/Makefile -@@ -175,7 +175,7 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), L +--- llvm-toolchain-snapshot_3.7~svn241915.orig/lldb/lib/Makefile ++++ llvm-toolchain-snapshot_3.7~svn241915/lldb/lib/Makefile +@@ -191,7 +191,7 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), L LLVMLibsOptions += -Wl,--no-undefined # Link in python - LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel + LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel -lpthread - LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT).$(SONAME_EXTENSION) -+ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(SHLIBEXT) ++ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)-$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)$(SHLIBEXT) ifneq (,$(filter $(shell dpkg-architecture -qDEB_HOST_ARCH), mips mipsel powerpc powerpcspe)) # Link GCC atomic helper library LLVMLibsOptions += -latomic diff --git a/debian/patches/lldb-link-atomic.diff b/debian/patches/lldb-link-atomic.diff index ffd417f6..30976127 100644 --- a/debian/patches/lldb-link-atomic.diff +++ b/debian/patches/lldb-link-atomic.diff @@ -1,10 +1,10 @@ -Index: llvm-toolchain-snapshot_3.5~svn201241/lldb/lib/Makefile +Index: llvm-toolchain-snapshot_3.7~svn241915/lldb/lib/Makefile =================================================================== ---- llvm-toolchain-snapshot_3.5~svn201241.orig/lldb/lib/Makefile 2014-02-12 17:04:14.743875515 +0100 -+++ llvm-toolchain-snapshot_3.5~svn201241/lldb/lib/Makefile 2014-02-12 17:06:32.408601271 +0100 -@@ -151,6 +151,10 @@ +--- llvm-toolchain-snapshot_3.7~svn241915.orig/lldb/lib/Makefile ++++ llvm-toolchain-snapshot_3.7~svn241915/lldb/lib/Makefile +@@ -191,6 +191,10 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), L # Link in python - LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel + LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel -lpthread LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) + ifneq (,$(filter $(shell dpkg-architecture -qDEB_HOST_ARCH), mips mipsel powerpc powerpcspe)) + # Link GCC atomic helper library diff --git a/debian/patches/lldb-soname.diff b/debian/patches/lldb-soname.diff index 60763b4e..51631b7a 100644 --- a/debian/patches/lldb-soname.diff +++ b/debian/patches/lldb-soname.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_3.5~svn211089/lldb/lib/Makefile +Index: llvm-toolchain-snapshot_3.7~svn241915/lldb/lib/Makefile =================================================================== ---- llvm-toolchain-snapshot_3.5~svn211089.orig/lldb/lib/Makefile -+++ llvm-toolchain-snapshot_3.5~svn211089/lldb/lib/Makefile +--- llvm-toolchain-snapshot_3.7~svn241915.orig/lldb/lib/Makefile ++++ llvm-toolchain-snapshot_3.7~svn241915/lldb/lib/Makefile @@ -16,6 +16,7 @@ LIBRARYNAME = lldb NO_BUILD_ARCHIVE = 1 LINK_LIBS_IN_SHARED = 1 @@ -10,10 +10,10 @@ Index: llvm-toolchain-snapshot_3.5~svn211089/lldb/lib/Makefile ifeq (,$(findstring -DLLDB_DISABLE_PYTHON,$(CXXFLAGS))) PYTHON_BUILD_FLAGS = $(shell python-config --ldflags) -@@ -169,7 +170,7 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), L +@@ -190,7 +191,7 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), L LLVMLibsOptions += -Wl,--no-undefined # Link in python - LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel + LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel -lpthread - LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) + LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT).$(SONAME_EXTENSION) ifneq (,$(filter $(shell dpkg-architecture -qDEB_HOST_ARCH), mips mipsel powerpc powerpcspe)) diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff index 51c3fb03..182edb5f 100644 --- a/debian/patches/scan-build-clang-path.diff +++ b/debian/patches/scan-build-clang-path.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_3.5~svn199197/clang/tools/scan-build/scan-build +Index: llvm-toolchain-snapshot_3.7~svn241915/clang/tools/scan-build/scan-build =================================================================== ---- llvm-toolchain-snapshot_3.5~svn199197.orig/clang/tools/scan-build/scan-build 2014-01-14 11:30:50.852868672 +0100 -+++ llvm-toolchain-snapshot_3.5~svn199197/clang/tools/scan-build/scan-build 2014-01-14 11:30:50.848868672 +0100 -@@ -1559,7 +1559,7 @@ +--- llvm-toolchain-snapshot_3.7~svn241915.orig/clang/tools/scan-build/scan-build ++++ llvm-toolchain-snapshot_3.7~svn241915/clang/tools/scan-build/scan-build +@@ -1579,7 +1579,7 @@ if (!@ARGV and !$RequestDisplayHelp) { # Find 'clang' if (!defined $AnalyzerDiscoveryMethod) {