diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff index f0c6c766..9e2d9b19 100644 --- a/debian/patches/23-strlcpy_strlcat_warning_removed.diff +++ b/debian/patches/23-strlcpy_strlcat_warning_removed.diff @@ -7,11 +7,11 @@ clang/test/Sema/warn-strlcpycat-size.c | 55 -------------- 6 files changed, 25 insertions(+), 78 deletions(-) -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/include/clang/Basic/Builtins.def +Index: llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/clang/include/clang/Basic/Builtins.def =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/clang/include/clang/Basic/Builtins.def -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/include/clang/Basic/Builtins.def -@@ -548,8 +548,8 @@ BUILTIN(__builtin___memset_chk, "v*v*izz +--- llvm-toolchain-snapshot_12~++20201001102642+456974ac78f.orig/clang/include/clang/Basic/Builtins.def ++++ llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/clang/include/clang/Basic/Builtins.def +@@ -557,8 +557,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") @@ -22,9 +22,9 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/include/cla 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") -@@ -1022,8 +1022,8 @@ LIBBUILTIN(getcontext, "iK*", "fj", - LIBBUILTIN(_longjmp, "vJi", "fr", "setjmp.h", ALL_GNU_LANGUAGES) - LIBBUILTIN(siglongjmp, "vSJi", "fr", "setjmp.h", ALL_GNU_LANGUAGES) +@@ -1037,8 +1037,8 @@ LIBBUILTIN(getcontext, "iK*", "fjT", + LIBBUILTIN(_longjmp, "vJi", "frT", "setjmp.h", ALL_GNU_LANGUAGES) + LIBBUILTIN(siglongjmp, "vSJi", "frT", "setjmp.h", ALL_GNU_LANGUAGES) // non-standard but very common -LIBBUILTIN(strlcpy, "zc*cC*z", "f", "string.h", ALL_GNU_LANGUAGES) -LIBBUILTIN(strlcat, "zc*cC*z", "f", "string.h", ALL_GNU_LANGUAGES) @@ -33,11 +33,11 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/include/cla // 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_11~++20200326111000+4673699a470/clang/lib/AST/Decl.cpp +Index: llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/clang/lib/AST/Decl.cpp -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/lib/AST/Decl.cpp -@@ -3872,13 +3872,13 @@ unsigned FunctionDecl::getMemoryFunction +--- llvm-toolchain-snapshot_12~++20201001102642+456974ac78f.orig/clang/lib/AST/Decl.cpp ++++ llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/clang/lib/AST/Decl.cpp +@@ -3895,13 +3895,13 @@ unsigned FunctionDecl::getMemoryFunction case Builtin::BImemmove: return Builtin::BImemmove; @@ -57,11 +57,11 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/lib/AST/Dec case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/lib/Sema/SemaChecking.cpp +Index: llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/clang/lib/Sema/SemaChecking.cpp -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/lib/Sema/SemaChecking.cpp -@@ -640,8 +640,8 @@ void Sema::checkFortifiedBuiltinMemoryFu +--- llvm-toolchain-snapshot_12~++20201001102642+456974ac78f.orig/clang/lib/Sema/SemaChecking.cpp ++++ llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/clang/lib/Sema/SemaChecking.cpp +@@ -654,8 +654,8 @@ void Sema::checkFortifiedBuiltinMemoryFu case Builtin::BI__builtin___memcpy_chk: case Builtin::BI__builtin___memmove_chk: case Builtin::BI__builtin___memset_chk: @@ -72,7 +72,7 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/lib/Sema/Se case Builtin::BI__builtin___strncat_chk: case Builtin::BI__builtin___strncpy_chk: case Builtin::BI__builtin___stpncpy_chk: -@@ -4056,9 +4056,10 @@ bool Sema::CheckFunctionCall(FunctionDec +@@ -4507,9 +4507,10 @@ bool Sema::CheckFunctionCall(FunctionDec return false; // Handle memory setting and copying functions. @@ -86,11 +86,11 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/lib/Sema/Se CheckStrncatArguments(TheCall, FnInfo); else CheckMemaccessArguments(TheCall, CMId, FnInfo); -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -@@ -476,9 +476,9 @@ GenericTaintChecker::TaintPropagationRul +--- llvm-toolchain-snapshot_12~++20201001102642+456974ac78f.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp ++++ llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +@@ -478,9 +478,9 @@ GenericTaintChecker::TaintPropagationRul case Builtin::BIstrncpy: case Builtin::BIstrncat: return {{1, 2}, {0, ReturnValueIndex}}; @@ -102,10 +102,10 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/lib/StaticA case Builtin::BIstrndup: return {{0, 1}, {ReturnValueIndex}}; -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/test/Sema/builtins.c +Index: llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/clang/test/Sema/builtins.c =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/clang/test/Sema/builtins.c -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/test/Sema/builtins.c +--- llvm-toolchain-snapshot_12~++20201001102642+456974ac78f.orig/clang/test/Sema/builtins.c ++++ llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/clang/test/Sema/builtins.c @@ -199,11 +199,9 @@ void test18() { ptr = __builtin___memccpy_chk(dst, src, '\037', sizeof(src), sizeof(dst)); @@ -148,9 +148,9 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/test/Sema/b // rdar://11076881 char * Test20(char *p, const char *in, unsigned n) { -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/test/Sema/warn-strlcpycat-size.c +Index: llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/clang/test/Sema/warn-strlcpycat-size.c =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/clang/test/Sema/warn-strlcpycat-size.c +--- llvm-toolchain-snapshot_12~++20201001102642+456974ac78f.orig/clang/test/Sema/warn-strlcpycat-size.c +++ /dev/null @@ -1,55 +0,0 @@ -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s diff --git a/debian/patches/libcxx-armhf-ftbfs.diff b/debian/patches/libcxx-armhf-ftbfs.diff index eb563c9a..2c699bee 100644 --- a/debian/patches/libcxx-armhf-ftbfs.diff +++ b/debian/patches/libcxx-armhf-ftbfs.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_12~++20200911085730+f787fe15d8e/libcxx/include/atomic +Index: llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/libcxx/include/atomic =================================================================== ---- llvm-toolchain-snapshot_12~++20200911085730+f787fe15d8e.orig/libcxx/include/atomic -+++ llvm-toolchain-snapshot_12~++20200911085730+f787fe15d8e/libcxx/include/atomic -@@ -2716,10 +2716,15 @@ typedef conditional<_LIBCPP_CONTENTION_L +--- llvm-toolchain-snapshot_12~++20201001102642+456974ac78f.orig/libcxx/include/atomic ++++ llvm-toolchain-snapshot_12~++20201001102642+456974ac78f/libcxx/include/atomic +@@ -2780,10 +2780,15 @@ typedef conditional<_LIBCPP_CONTENTION_L typedef conditional<_LIBCPP_CONTENTION_LOCK_FREE, __cxx_contention_t, unsigned char>::type __libcpp_unsigned_lock_free; #else // No signed/unsigned lock-free types