diff --git a/debian/changelog b/debian/changelog index f064653d..150cb7b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-snapshot (1:3.6~svn218379-1~exp1) experimental; urgency=medium + + * New snapshot release + + -- Sylvestre Ledru Wed, 24 Sep 2014 14:20:49 +0200 + llvm-toolchain-snapshot (1:3.6~svn216933-1~exp2) experimental; urgency=medium * Fix bad dependencies on lldb 3.6 diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff index 63172546..1e4f55ed 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.6~svn217737/clang/include/clang/Basic/Builtins.def +Index: llvm-toolchain-snapshot_3.6~svn218379/clang/include/clang/Basic/Builtins.def =================================================================== ---- llvm-toolchain-snapshot_3.6~svn217737.orig/clang/include/clang/Basic/Builtins.def -+++ llvm-toolchain-snapshot_3.6~svn217737/clang/include/clang/Basic/Builtins.def +--- llvm-toolchain-snapshot_3.6~svn218379.orig/clang/include/clang/Basic/Builtins.def ++++ llvm-toolchain-snapshot_3.6~svn218379/clang/include/clang/Basic/Builtins.def @@ -474,8 +474,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") @@ -24,11 +24,11 @@ Index: llvm-toolchain-snapshot_3.6~svn217737/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~svn217737/clang/lib/Sema/SemaChecking.cpp +Index: llvm-toolchain-snapshot_3.6~svn218379/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-toolchain-snapshot_3.6~svn217737.orig/clang/lib/Sema/SemaChecking.cpp -+++ llvm-toolchain-snapshot_3.6~svn217737/clang/lib/Sema/SemaChecking.cpp -@@ -958,9 +958,10 @@ bool Sema::CheckFunctionCall(FunctionDec +--- llvm-toolchain-snapshot_3.6~svn218379.orig/clang/lib/Sema/SemaChecking.cpp ++++ llvm-toolchain-snapshot_3.6~svn218379/clang/lib/Sema/SemaChecking.cpp +@@ -1007,9 +1007,10 @@ bool Sema::CheckFunctionCall(FunctionDec return false; // Handle memory setting and copying functions. @@ -42,10 +42,10 @@ Index: llvm-toolchain-snapshot_3.6~svn217737/clang/lib/Sema/SemaChecking.cpp CheckStrncatArguments(TheCall, FnInfo); else CheckMemaccessArguments(TheCall, CMId, FnInfo); -Index: llvm-toolchain-snapshot_3.6~svn217737/clang/lib/AST/Decl.cpp +Index: llvm-toolchain-snapshot_3.6~svn218379/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-toolchain-snapshot_3.6~svn217737.orig/clang/lib/AST/Decl.cpp -+++ llvm-toolchain-snapshot_3.6~svn217737/clang/lib/AST/Decl.cpp +--- llvm-toolchain-snapshot_3.6~svn218379.orig/clang/lib/AST/Decl.cpp ++++ llvm-toolchain-snapshot_3.6~svn218379/clang/lib/AST/Decl.cpp @@ -3187,13 +3187,13 @@ unsigned FunctionDecl::getMemoryFunction case Builtin::BImemmove: return Builtin::BImemmove; @@ -66,10 +66,10 @@ Index: llvm-toolchain-snapshot_3.6~svn217737/clang/lib/AST/Decl.cpp case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-toolchain-snapshot_3.6~svn217737/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain-snapshot_3.6~svn218379/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-toolchain-snapshot_3.6~svn217737.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -+++ llvm-toolchain-snapshot_3.6~svn217737/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +--- llvm-toolchain-snapshot_3.6~svn218379.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp ++++ llvm-toolchain-snapshot_3.6~svn218379/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp @@ -237,9 +237,9 @@ GenericTaintChecker::TaintPropagationRul case Builtin::BIstrncpy: case Builtin::BIstrncat: @@ -83,9 +83,9 @@ Index: llvm-toolchain-snapshot_3.6~svn217737/clang/lib/StaticAnalyzer/Checkers/G case Builtin::BIstrndup: return TaintPropagationRule(0, 1, ReturnValueIndex); -Index: llvm-toolchain-snapshot_3.6~svn217737/clang/test/Sema/warn-strlcpycat-size.c +Index: llvm-toolchain-snapshot_3.6~svn218379/clang/test/Sema/warn-strlcpycat-size.c =================================================================== ---- llvm-toolchain-snapshot_3.6~svn217737.orig/clang/test/Sema/warn-strlcpycat-size.c +--- llvm-toolchain-snapshot_3.6~svn218379.orig/clang/test/Sema/warn-strlcpycat-size.c +++ /dev/null @@ -1,55 +0,0 @@ -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s @@ -143,10 +143,10 @@ Index: llvm-toolchain-snapshot_3.6~svn217737/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~svn217737/clang/test/Sema/builtins.c +Index: llvm-toolchain-snapshot_3.6~svn218379/clang/test/Sema/builtins.c =================================================================== ---- llvm-toolchain-snapshot_3.6~svn217737.orig/clang/test/Sema/builtins.c -+++ llvm-toolchain-snapshot_3.6~svn217737/clang/test/Sema/builtins.c +--- llvm-toolchain-snapshot_3.6~svn218379.orig/clang/test/Sema/builtins.c ++++ llvm-toolchain-snapshot_3.6~svn218379/clang/test/Sema/builtins.c @@ -185,11 +185,11 @@ void test18() { ptr = __builtin___memccpy_chk(dst, src, '\037', sizeof(src), sizeof(dst)); @@ -177,10 +177,11 @@ Index: llvm-toolchain-snapshot_3.6~svn217737/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}} \\ -@@ -220,5 +220,5 @@ void Test19(void) - strlcat(buf, b, sizeof(b)); // expected-warning {{size argument in 'strlcat' 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}} +@@ -224,6 +224,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-note {{change size argument to be 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}} ++ */ } + + // rdar://11076881 diff --git a/debian/patches/kfreebsd-lldb-mi.diff b/debian/patches/kfreebsd-lldb-mi.diff deleted file mode 100644 index 97da385a..00000000 --- a/debian/patches/kfreebsd-lldb-mi.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: llvm-toolchain-snapshot-3.6~svn215195/lldb/tools/Makefile -=================================================================== ---- llvm-toolchain-snapshot-3.6~svn215195.orig/lldb/tools/Makefile 2014-08-11 08:42:54.000000000 +0200 -+++ llvm-toolchain-snapshot-3.6~svn215195/lldb/tools/Makefile 2014-08-11 08:43:35.918401006 +0200 -@@ -25,7 +25,7 @@ - DIRS += debugserver - endif - --ifeq ($(HOST_OS),Linux) -+ifneq (,$(strip $(filter $(HOST_OS), Linux GNU/kFreeBSD))) - DIRS += lldb-mi - endif - diff --git a/debian/patches/series b/debian/patches/series index 1ba50697..900fd6f2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -36,6 +36,5 @@ force-link-pass.o.diff follow-parallel-var.diff hurd-EIEIO-undef.diff silent-MCJIIT-tests.diff -kfreebsd-lldb-mi.diff lldb-libname.diff strip-svn.diff