diff --git a/debian/patches/0001-llvm-cmake-resolve-symlinks-in-LLVMConfig.cmake.patch b/debian/patches/0001-llvm-cmake-resolve-symlinks-in-LLVMConfig.cmake.patch index a89ca383..b0dc8153 100644 --- a/debian/patches/0001-llvm-cmake-resolve-symlinks-in-LLVMConfig.cmake.patch +++ b/debian/patches/0001-llvm-cmake-resolve-symlinks-in-LLVMConfig.cmake.patch @@ -12,11 +12,11 @@ Partially addresses PR37128 cmake/modules/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/llvm/cmake/modules/CMakeLists.txt +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/cmake/modules/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/llvm/cmake/modules/CMakeLists.txt -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/llvm/cmake/modules/CMakeLists.txt -@@ -88,10 +88,10 @@ file(COPY . +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/llvm/cmake/modules/CMakeLists.txt ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/cmake/modules/CMakeLists.txt +@@ -101,10 +101,10 @@ file(COPY . # Generate LLVMConfig.cmake for the install tree. set(LLVM_CONFIG_CODE " # Compute the installation prefix from this LLVMConfig.cmake file location. diff --git a/debian/patches/0001-tools-clang-cmake-resolve-symlinks-in-ClangConfig.cmake.patch b/debian/patches/0001-tools-clang-cmake-resolve-symlinks-in-ClangConfig.cmake.patch index f3811312..d4cf166d 100644 --- a/debian/patches/0001-tools-clang-cmake-resolve-symlinks-in-ClangConfig.cmake.patch +++ b/debian/patches/0001-tools-clang-cmake-resolve-symlinks-in-ClangConfig.cmake.patch @@ -12,11 +12,11 @@ Partially addresses PR37128 cmake/modules/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/cmake/modules/CMakeLists.txt +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/cmake/modules/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/clang/cmake/modules/CMakeLists.txt -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/cmake/modules/CMakeLists.txt -@@ -30,10 +30,10 @@ set(CLANG_CONFIG_EXPORTS_FILE) +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/clang/cmake/modules/CMakeLists.txt ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/cmake/modules/CMakeLists.txt +@@ -31,10 +31,10 @@ set(CLANG_CONFIG_LLVM_CMAKE_DIR) # Generate ClangConfig.cmake for the install tree. set(CLANG_CONFIG_CODE " # Compute the installation prefix from this LLVMConfig.cmake file location. diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff index 03b95ebc..89a23063 100644 --- a/debian/patches/0044-soname.diff +++ b/debian/patches/0044-soname.diff @@ -3,11 +3,11 @@ tools/llvm-shlib/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_13~++20210405105538+828ec9e9e5da/clang/tools/libclang/CMakeLists.txt +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/tools/libclang/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_13~++20210405105538+828ec9e9e5da.orig/clang/tools/libclang/CMakeLists.txt -+++ llvm-toolchain-snapshot_13~++20210405105538+828ec9e9e5da/clang/tools/libclang/CMakeLists.txt -@@ -96,7 +96,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/clang/tools/libclang/CMakeLists.txt ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/tools/libclang/CMakeLists.txt +@@ -117,7 +117,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE remove_definitions("-D_XOPEN_SOURCE=700") endif() @@ -16,10 +16,10 @@ Index: llvm-toolchain-snapshot_13~++20210405105538+828ec9e9e5da/clang/tools/libc OUTPUT_NAME ${output_name} ${SOURCES} -Index: llvm-toolchain-snapshot_13~++20210405105538+828ec9e9e5da/llvm/tools/llvm-shlib/CMakeLists.txt +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/tools/llvm-shlib/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_13~++20210405105538+828ec9e9e5da.orig/llvm/tools/llvm-shlib/CMakeLists.txt -+++ llvm-toolchain-snapshot_13~++20210405105538+828ec9e9e5da/llvm/tools/llvm-shlib/CMakeLists.txt +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/llvm/tools/llvm-shlib/CMakeLists.txt ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/tools/llvm-shlib/CMakeLists.txt @@ -32,6 +32,8 @@ if(LLVM_BUILD_LLVM_DYLIB) endif() add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES}) diff --git a/debian/patches/19-clang_debian_version.patch b/debian/patches/19-clang_debian_version.patch index 0bb32879..89ac6bdc 100644 --- a/debian/patches/19-clang_debian_version.patch +++ b/debian/patches/19-clang_debian_version.patch @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_11~++20200708031542+64363a9d930/clang/lib/Basic/Version.cpp +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/lib/Basic/Version.cpp =================================================================== ---- llvm-toolchain-snapshot_11~++20200708031542+64363a9d930.orig/clang/lib/Basic/Version.cpp -+++ llvm-toolchain-snapshot_11~++20200708031542+64363a9d930/clang/lib/Basic/Version.cpp +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/clang/lib/Basic/Version.cpp ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/lib/Basic/Version.cpp @@ -14,6 +14,7 @@ #include "clang/Basic/LLVM.h" #include "clang/Config/config.h" @@ -10,7 +10,7 @@ Index: llvm-toolchain-snapshot_11~++20200708031542+64363a9d930/clang/lib/Basic/V #include #include -@@ -97,7 +98,7 @@ std::string getClangToolFullVersion(Stri +@@ -95,7 +96,7 @@ std::string getClangToolFullVersion(Stri #ifdef CLANG_VENDOR OS << CLANG_VENDOR; #endif diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff index 5397517c..7a431b45 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_12~++20201029014435+d6d6fdb068a/clang/include/clang/Basic/Builtins.def +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/include/clang/Basic/Builtins.def =================================================================== ---- llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a.orig/clang/include/clang/Basic/Builtins.def -+++ llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/clang/include/clang/Basic/Builtins.def -@@ -557,8 +557,8 @@ BUILTIN(__builtin___memset_chk, "v*v*izz +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/clang/include/clang/Basic/Builtins.def ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/include/clang/Basic/Builtins.def +@@ -615,8 +615,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,7 +22,7 @@ Index: llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/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") -@@ -1039,8 +1039,8 @@ LIBBUILTIN(getcontext, "iK*", "fjT", +@@ -1108,8 +1108,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 @@ -33,11 +33,11 @@ Index: llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/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_12~++20201029014435+d6d6fdb068a/clang/lib/AST/Decl.cpp +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a.orig/clang/lib/AST/Decl.cpp -+++ llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/clang/lib/AST/Decl.cpp -@@ -3913,13 +3913,13 @@ unsigned FunctionDecl::getMemoryFunction +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/clang/lib/AST/Decl.cpp ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/lib/AST/Decl.cpp +@@ -4055,13 +4055,13 @@ unsigned FunctionDecl::getMemoryFunction case Builtin::BImemmove: return Builtin::BImemmove; @@ -57,11 +57,11 @@ Index: llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/clang/lib/AST/Dec case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/clang/lib/Sema/SemaChecking.cpp +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a.orig/clang/lib/Sema/SemaChecking.cpp -+++ llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/clang/lib/Sema/SemaChecking.cpp -@@ -654,8 +654,8 @@ void Sema::checkFortifiedBuiltinMemoryFu +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/clang/lib/Sema/SemaChecking.cpp ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/lib/Sema/SemaChecking.cpp +@@ -832,8 +832,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_12~++20201029014435+d6d6fdb068a/clang/lib/Sema/Se case Builtin::BI__builtin___strncat_chk: case Builtin::BI__builtin___strncpy_chk: case Builtin::BI__builtin___stpncpy_chk: -@@ -4501,10 +4501,10 @@ bool Sema::CheckFunctionCall(FunctionDec +@@ -5212,10 +5212,10 @@ bool Sema::CheckFunctionCall(FunctionDec switch (CMId) { case 0: return false; @@ -85,11 +85,11 @@ Index: llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/clang/lib/Sema/Se case Builtin::BIstrncat: CheckStrncatArguments(TheCall, FnInfo); break; -Index: llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -+++ llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -@@ -478,9 +478,9 @@ GenericTaintChecker::TaintPropagationRul +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +@@ -490,9 +490,9 @@ GenericTaintChecker::TaintPropagationRul case Builtin::BIstrncpy: case Builtin::BIstrncat: return {{1, 2}, {0, ReturnValueIndex}}; @@ -101,10 +101,10 @@ Index: llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/clang/lib/StaticA case Builtin::BIstrndup: return {{0, 1}, {ReturnValueIndex}}; -Index: llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/clang/test/Sema/builtins.c +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/test/Sema/builtins.c =================================================================== ---- llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a.orig/clang/test/Sema/builtins.c -+++ llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/clang/test/Sema/builtins.c +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/clang/test/Sema/builtins.c ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/test/Sema/builtins.c @@ -199,11 +199,9 @@ void test18() { ptr = __builtin___memccpy_chk(dst, src, '\037', sizeof(src), sizeof(dst)); @@ -147,9 +147,9 @@ Index: llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/clang/test/Sema/b // rdar://11076881 char * Test20(char *p, const char *in, unsigned n) { -Index: llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a/clang/test/Sema/warn-strlcpycat-size.c +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/test/Sema/warn-strlcpycat-size.c =================================================================== ---- llvm-toolchain-snapshot_12~++20201029014435+d6d6fdb068a.orig/clang/test/Sema/warn-strlcpycat-size.c +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.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/26-set-correct-float-abi.diff b/debian/patches/26-set-correct-float-abi.diff index 2249f716..426bcb7a 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-12_12.0.1~+rc2/clang/lib/Driver/ToolChains/Arch/ARM.cpp +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/lib/Driver/ToolChains/Arch/ARM.cpp =================================================================== ---- llvm-toolchain-12_12.0.1~+rc2.orig/clang/lib/Driver/ToolChains/Arch/ARM.cpp -+++ llvm-toolchain-12_12.0.1~+rc2/clang/lib/Driver/ToolChains/Arch/ARM.cpp -@@ -220,7 +220,7 @@ arm::FloatABI arm::getDefaultFloatABI(co +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/clang/lib/Driver/ToolChains/Arch/ARM.cpp ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/lib/Driver/ToolChains/Arch/ARM.cpp +@@ -361,7 +361,7 @@ arm::FloatABI arm::getDefaultFloatABI(co case llvm::Triple::MuslEABI: case llvm::Triple::EABI: // EABI is always AAPCS, and if it was not marked 'hard', it's softfp diff --git a/debian/patches/930008-arm.diff b/debian/patches/930008-arm.diff index 50c7dc19..dee0bce8 100644 --- a/debian/patches/930008-arm.diff +++ b/debian/patches/930008-arm.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/llvm/lib/Support/Triple.cpp +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/lib/Support/Triple.cpp =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/llvm/lib/Support/Triple.cpp -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/llvm/lib/Support/Triple.cpp -@@ -1658,7 +1658,7 @@ StringRef Triple::getARMCPUForArch(Strin +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/llvm/lib/Support/Triple.cpp ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/lib/Support/Triple.cpp +@@ -1830,7 +1830,7 @@ StringRef Triple::getARMCPUForArch(Strin case llvm::Triple::EABIHF: case llvm::Triple::GNUEABIHF: case llvm::Triple::MuslEABIHF: diff --git a/debian/patches/D98575.patch b/debian/patches/D98575.patch index 19aa24a4..602d1e87 100644 --- a/debian/patches/D98575.patch +++ b/debian/patches/D98575.patch @@ -1,6 +1,8 @@ ---- llvm-toolchain-snapshot-13~++20210129063721+010b176cdefb.orig/compiler-rt/cmake/base-config-ix.cmake -+++ llvm-toolchain-snapshot-13~++20210129063721+010b176cdefb/compiler-rt/cmake/base-config-ix.cmake -@@ -189,8 +189,12 @@ macro(test_targets) +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/compiler-rt/cmake/base-config-ix.cmake +=================================================================== +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/compiler-rt/cmake/base-config-ix.cmake ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/compiler-rt/cmake/base-config-ix.cmake +@@ -220,8 +220,12 @@ macro(test_targets) elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "s390x") test_target_arch(s390x "" "") elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "sparc") diff --git a/debian/patches/clang-analyzer-force-version.diff b/debian/patches/clang-analyzer-force-version.diff index 90a6f118..e69b2a84 100644 --- a/debian/patches/clang-analyzer-force-version.diff +++ b/debian/patches/clang-analyzer-force-version.diff @@ -1,11 +1,11 @@ # Force the version of clang in the analyzer # This was causing the static analyzer to fail silently if the clang & clang++ are # not installed -Index: llvm-toolchain-snapshot_14~++20200326142000+4673699a470/clang/tools/scan-build/libexec/ccc-analyzer +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/tools/scan-build/libexec/ccc-analyzer =================================================================== ---- llvm-toolchain-snapshot_14~++20200326142000+4673699a470.orig/clang/tools/scan-build/libexec/ccc-analyzer -+++ llvm-toolchain-snapshot_14~++20200326142000+4673699a470/clang/tools/scan-build/libexec/ccc-analyzer -@@ -90,7 +90,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/ +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/clang/tools/scan-build/libexec/ccc-analyzer ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/tools/scan-build/libexec/ccc-analyzer +@@ -93,7 +93,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/ if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCXXCompiler; } $Clang = $ENV{'CLANG_CXX'}; @@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_14~++20200326142000+4673699a470/clang/tools/scan- $IsCXX = 1 } -@@ -99,7 +99,7 @@ else { +@@ -102,7 +102,7 @@ else { if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCCompiler; } $Clang = $ENV{'CLANG'}; diff --git a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch index 54c8f26f..a2699b1b 100644 --- a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch +++ b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_12~++20210114102728+0975604cc013/llvm/include/llvm/Support/ARMTargetParser.def +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/include/llvm/Support/ARMTargetParser.def =================================================================== ---- llvm-toolchain-snapshot_12~++20210114102728+0975604cc013.orig/llvm/include/llvm/Support/ARMTargetParser.def -+++ llvm-toolchain-snapshot_12~++20210114102728+0975604cc013/llvm/include/llvm/Support/ARMTargetParser.def +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/llvm/include/llvm/Support/ARMTargetParser.def ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/include/llvm/Support/ARMTargetParser.def @@ -76,7 +76,7 @@ ARM_ARCH("armv6kz", ARMV6KZ, "6KZ", "v6k ARM_ARCH("armv6-m", ARMV6M, "6-M", "v6m", ARMBuildAttrs::CPUArch::v6_M, FK_NONE, ARM::AEK_NONE) @@ -11,11 +11,11 @@ Index: llvm-toolchain-snapshot_12~++20210114102728+0975604cc013/llvm/include/llv ARM_ARCH("armv7ve", ARMV7VE, "7VE", "v7ve", ARMBuildAttrs::CPUArch::v7, FK_NEON, (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT | ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP)) -Index: llvm-toolchain-snapshot_12~++20210114102728+0975604cc013/llvm/lib/Target/ARM/ARM.td +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/lib/Target/ARM/ARM.td =================================================================== ---- llvm-toolchain-snapshot_12~++20210114102728+0975604cc013.orig/llvm/lib/Target/ARM/ARM.td -+++ llvm-toolchain-snapshot_12~++20210114102728+0975604cc013/llvm/lib/Target/ARM/ARM.td -@@ -725,7 +725,8 @@ def ARMv6sm : Architecture<"armv6s-m", +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/llvm/lib/Target/ARM/ARM.td ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/lib/Target/ARM/ARM.td +@@ -743,7 +743,8 @@ def ARMv6sm : Architecture<"armv6s-m", FeatureStrictAlign]>; def ARMv7a : Architecture<"armv7-a", "ARMv7a", [HasV7Ops, diff --git a/debian/patches/clang-baseline-fix-i386.patch b/debian/patches/clang-baseline-fix-i386.patch index 85b3aa5b..72039ca5 100644 --- a/debian/patches/clang-baseline-fix-i386.patch +++ b/debian/patches/clang-baseline-fix-i386.patch @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_12~++20200809124138+04a23f1fe08/clang/lib/Driver/ToolChains/Arch/X86.cpp +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/lib/Driver/ToolChains/Arch/X86.cpp =================================================================== ---- llvm-toolchain-snapshot_12~++20200809124138+04a23f1fe08.orig/clang/lib/Driver/ToolChains/Arch/X86.cpp -+++ llvm-toolchain-snapshot_12~++20200809124138+04a23f1fe08/clang/lib/Driver/ToolChains/Arch/X86.cpp -@@ -102,8 +102,8 @@ std::string x86::getX86TargetCPU(const A +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/clang/lib/Driver/ToolChains/Arch/X86.cpp ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/lib/Driver/ToolChains/Arch/X86.cpp +@@ -109,8 +109,8 @@ std::string x86::getX86TargetCPU(const D case llvm::Triple::FreeBSD: return "i686"; default: diff --git a/debian/patches/clang-tidy-run-bin.diff b/debian/patches/clang-tidy-run-bin.diff index 12720c1c..e3d33a2d 100644 --- a/debian/patches/clang-tidy-run-bin.diff +++ b/debian/patches/clang-tidy-run-bin.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_14~++20200423143502+bbb7921da97/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py =================================================================== ---- llvm-toolchain-snapshot_14~++20200423143502+bbb7921da97.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -+++ llvm-toolchain-snapshot_14~++20200423143502+bbb7921da97/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -@@ -186,10 +186,10 @@ def main(): +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py +@@ -194,10 +194,10 @@ def main(): action='store_true', help='allow alpha checkers from ' 'clang-analyzer.') parser.add_argument('-clang-tidy-binary', metavar='PATH', diff --git a/debian/patches/clangd-atomic-cmake.patch b/debian/patches/clangd-atomic-cmake.patch index 60ffd1ec..be7ee153 100644 --- a/debian/patches/clangd-atomic-cmake.patch +++ b/debian/patches/clangd-atomic-cmake.patch @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_13~++20210714114159+03a4702c884a/clang-tools-extra/clangd/CMakeLists.txt +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang-tools-extra/clangd/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_13~++20210714114159+03a4702c884a.orig/clang-tools-extra/clangd/CMakeLists.txt -+++ llvm-toolchain-snapshot_13~++20210714114159+03a4702c884a/clang-tools-extra/clangd/CMakeLists.txt +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/clang-tools-extra/clangd/CMakeLists.txt ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang-tools-extra/clangd/CMakeLists.txt @@ -52,6 +52,11 @@ endif() include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}/../clang-tidy") @@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_13~++20210714114159+03a4702c884a/clang-tools-extr add_clang_library(clangDaemon AST.cpp ASTSignals.cpp -@@ -163,6 +168,7 @@ clang_target_link_libraries(clangDaemon +@@ -164,6 +169,7 @@ clang_target_link_libraries(clangDaemon target_link_libraries(clangDaemon PRIVATE ${LLVM_PTHREAD_LIB} diff --git a/debian/patches/compilerrt-build-scudo-standalone-option.diff b/debian/patches/compilerrt-build-scudo-standalone-option.diff index 8f9059ed..c9b8c943 100644 --- a/debian/patches/compilerrt-build-scudo-standalone-option.diff +++ b/debian/patches/compilerrt-build-scudo-standalone-option.diff @@ -1,10 +1,10 @@ add option to disable compiler-rt scudo standalone allocator as it is not always supported by all arch profiles such as arm5vt of ARM32 arch -Index: llvm-toolchain-13_13.0.0/compiler-rt/CMakeLists.txt +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/compiler-rt/CMakeLists.txt =================================================================== ---- llvm-toolchain-13_13.0.0.orig/compiler-rt/CMakeLists.txt -+++ llvm-toolchain-13_13.0.0/compiler-rt/CMakeLists.txt -@@ -250,6 +250,12 @@ option(COMPILER_RT_USE_BUILTINS_LIBRARY +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/compiler-rt/CMakeLists.txt ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/compiler-rt/CMakeLists.txt +@@ -256,6 +256,12 @@ option(COMPILER_RT_USE_BUILTINS_LIBRARY include(config-ix) diff --git a/debian/patches/compilerrt-builtins-arch-fix-armhf.diff b/debian/patches/compilerrt-builtins-arch-fix-armhf.diff index d762b29c..69842dd4 100644 --- a/debian/patches/compilerrt-builtins-arch-fix-armhf.diff +++ b/debian/patches/compilerrt-builtins-arch-fix-armhf.diff @@ -1,10 +1,10 @@ fix builtins armhf default arch detection by adding the same armhf triple handling use for compiler-rt -Index: llvm-toolchain-12_12.0.1/compiler-rt/lib/builtins/CMakeLists.txt +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/compiler-rt/lib/builtins/CMakeLists.txt =================================================================== ---- llvm-toolchain-12_12.0.1.orig/compiler-rt/lib/builtins/CMakeLists.txt -+++ llvm-toolchain-12_12.0.1/compiler-rt/lib/builtins/CMakeLists.txt -@@ -16,6 +16,11 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/compiler-rt/lib/builtins/CMakeLists.txt ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/compiler-rt/lib/builtins/CMakeLists.txt +@@ -19,6 +19,11 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR load_llvm_config() construct_compiler_rt_default_triple() diff --git a/debian/patches/compilerrt-fix-warn-xray-testing.diff b/debian/patches/compilerrt-fix-warn-xray-testing.diff index 38babc96..bddd5f29 100644 --- a/debian/patches/compilerrt-fix-warn-xray-testing.diff +++ b/debian/patches/compilerrt-fix-warn-xray-testing.diff @@ -1,9 +1,9 @@ suppress warnings for xray and testing when not enabled -Index: llvm-toolchain-12_12.0.1/compiler-rt/cmake/Modules/CompilerRTUtils.cmake +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/compiler-rt/cmake/Modules/CompilerRTUtils.cmake =================================================================== ---- llvm-toolchain-12_12.0.1.orig/compiler-rt/cmake/Modules/CompilerRTUtils.cmake -+++ llvm-toolchain-12_12.0.1/compiler-rt/cmake/Modules/CompilerRTUtils.cmake -@@ -242,15 +242,15 @@ macro(load_llvm_config) +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/compiler-rt/cmake/Modules/CompilerRTUtils.cmake ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/compiler-rt/cmake/Modules/CompilerRTUtils.cmake +@@ -323,15 +323,15 @@ macro(load_llvm_config) # Detect if we have the LLVMXRay and TestingSupport library installed and # available from llvm-config. @@ -22,7 +22,7 @@ Index: llvm-toolchain-12_12.0.1/compiler-rt/cmake/Modules/CompilerRTUtils.cmake string(REGEX REPLACE "[ \t]*[\r\n]+[ \t]*" ";" CONFIG_OUTPUT ${CONFIG_OUTPUT}) list(GET CONFIG_OUTPUT 0 LDFLAGS) list(GET CONFIG_OUTPUT 1 LIBLIST) -@@ -267,7 +267,7 @@ macro(load_llvm_config) +@@ -348,7 +348,7 @@ macro(load_llvm_config) RESULT_VARIABLE HAD_ERROR OUTPUT_VARIABLE CONFIG_OUTPUT ERROR_QUIET) diff --git a/debian/patches/debug-jit-path.diff b/debian/patches/debug-jit-path.diff index 80016757..65667490 100644 --- a/debian/patches/debug-jit-path.diff +++ b/debian/patches/debug-jit-path.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp -@@ -301,8 +301,8 @@ bool PerfJITEventListener::InitDebugging +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp +@@ -304,8 +304,8 @@ bool PerfJITEventListener::InitDebugging // search for location to dump data to if (const char *BaseDir = getenv("JITDUMPDIR")) Path.append(BaseDir); diff --git a/debian/patches/declare_clear_cache.diff b/debian/patches/declare_clear_cache.diff index e66e2da6..2fa2c634 100644 --- a/debian/patches/declare_clear_cache.diff +++ b/debian/patches/declare_clear_cache.diff @@ -2,11 +2,11 @@ lib/Support/Unix/Memory.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/llvm/lib/Support/Unix/Memory.inc +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/lib/Support/Unix/Memory.inc =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/llvm/lib/Support/Unix/Memory.inc -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/llvm/lib/Support/Unix/Memory.inc -@@ -253,7 +253,7 @@ void Memory::InvalidateInstructionCache( +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/llvm/lib/Support/Unix/Memory.inc ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/lib/Support/Unix/Memory.inc +@@ -245,7 +245,7 @@ void Memory::InvalidateInstructionCache( // FIXME: Can we safely always call this for __GNUC__ everywhere? const char *Start = static_cast(Addr); const char *End = Start + Len; diff --git a/debian/patches/disable-sse2-old-x86.diff b/debian/patches/disable-sse2-old-x86.diff index 30a4f8b2..803efb3f 100644 --- a/debian/patches/disable-sse2-old-x86.diff +++ b/debian/patches/disable-sse2-old-x86.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_14~++20210824065029+d2e103644be3/llvm/include/llvm/Support/X86TargetParser.def +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/include/llvm/Support/X86TargetParser.def =================================================================== ---- llvm-toolchain-snapshot_14~++20210824065029+d2e103644be3.orig/llvm/include/llvm/Support/X86TargetParser.def -+++ llvm-toolchain-snapshot_14~++20210824065029+d2e103644be3/llvm/include/llvm/Support/X86TargetParser.def -@@ -224,7 +224,7 @@ CPU_SPECIFIC("pentium_mmx", 'D', "+mmx") +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/llvm/include/llvm/Support/X86TargetParser.def ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/include/llvm/Support/X86TargetParser.def +@@ -225,7 +225,7 @@ CPU_SPECIFIC("pentium_mmx", 'D', "+mmx") CPU_SPECIFIC("pentium_ii", 'E', "+cmov,+mmx") CPU_SPECIFIC("pentium_iii", 'H', "+cmov,+mmx,+sse") CPU_SPECIFIC_ALIAS("pentium_iii_no_xmm_regs", "pentium_iii") diff --git a/debian/patches/do-not-fail-on-unexpected-pass.diff b/debian/patches/do-not-fail-on-unexpected-pass.diff index 5bddc8b3..d26f56bc 100644 --- a/debian/patches/do-not-fail-on-unexpected-pass.diff +++ b/debian/patches/do-not-fail-on-unexpected-pass.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_11~++20200617103614+2eaadfc4fe6/llvm/utils/lit/lit/Test.py +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/utils/lit/lit/Test.py =================================================================== ---- llvm-toolchain-snapshot_11~++20200617103614+2eaadfc4fe6.orig/llvm/utils/lit/lit/Test.py -+++ llvm-toolchain-snapshot_11~++20200617103614+2eaadfc4fe6/llvm/utils/lit/lit/Test.py -@@ -51,7 +51,7 @@ XFAIL = ResultCode('XFAIL', +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/llvm/utils/lit/lit/Test.py ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/utils/lit/lit/Test.py +@@ -52,7 +52,7 @@ XFAIL = ResultCode('XFAIL', UNRESOLVED = ResultCode('UNRESOLVED', 'Unresolved', True) TIMEOUT = ResultCode('TIMEOUT', 'Timed Out', True) FAIL = ResultCode('FAIL', 'Failed', True) diff --git a/debian/patches/hurd/hurd-pathmax.diff b/debian/patches/hurd/hurd-pathmax.diff index a29ef236..67641966 100644 --- a/debian/patches/hurd/hurd-pathmax.diff +++ b/debian/patches/hurd/hurd-pathmax.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_11~++20200624084348+31c40f2d6bc/clang/lib/Basic/FileManager.cpp +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/lib/Basic/FileManager.cpp =================================================================== ---- llvm-toolchain-snapshot_11~++20200624084348+31c40f2d6bc.orig/clang/lib/Basic/FileManager.cpp -+++ llvm-toolchain-snapshot_11~++20200624084348+31c40f2d6bc/clang/lib/Basic/FileManager.cpp -@@ -528,6 +528,12 @@ FileManager::getNoncachedStatValue(Strin +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/clang/lib/Basic/FileManager.cpp ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/lib/Basic/FileManager.cpp +@@ -592,6 +592,12 @@ FileManager::getNoncachedStatValue(Strin return std::error_code(); } @@ -15,10 +15,10 @@ Index: llvm-toolchain-snapshot_11~++20200624084348+31c40f2d6bc/clang/lib/Basic/F void FileManager::GetUniqueIDMapping( SmallVectorImpl &UIDToFiles) const { UIDToFiles.clear(); -Index: llvm-toolchain-snapshot_11~++20200624084348+31c40f2d6bc/lldb/include/lldb/lldb-defines.h +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/lldb/include/lldb/lldb-defines.h =================================================================== ---- llvm-toolchain-snapshot_11~++20200624084348+31c40f2d6bc.orig/lldb/include/lldb/lldb-defines.h -+++ llvm-toolchain-snapshot_11~++20200624084348+31c40f2d6bc/lldb/include/lldb/lldb-defines.h +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/lldb/include/lldb/lldb-defines.h ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/lldb/include/lldb/lldb-defines.h @@ -27,6 +27,11 @@ #define INT32_MAX 2147483647 #endif @@ -31,10 +31,10 @@ Index: llvm-toolchain-snapshot_11~++20200624084348+31c40f2d6bc/lldb/include/lldb #if !defined(UINT32_MAX) #define UINT32_MAX 4294967295U #endif -Index: llvm-toolchain-snapshot_11~++20200624084348+31c40f2d6bc/polly/lib/External/ppcg/cuda_common.c +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/polly/lib/External/ppcg/cuda_common.c =================================================================== ---- llvm-toolchain-snapshot_11~++20200624084348+31c40f2d6bc.orig/polly/lib/External/ppcg/cuda_common.c -+++ llvm-toolchain-snapshot_11~++20200624084348+31c40f2d6bc/polly/lib/External/ppcg/cuda_common.c +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/polly/lib/External/ppcg/cuda_common.c ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/polly/lib/External/ppcg/cuda_common.c @@ -15,6 +15,11 @@ #include "cuda_common.h" #include "ppcg.h" diff --git a/debian/patches/libclc-fix-prepare_builtins-rpath.diff b/debian/patches/libclc-fix-prepare_builtins-rpath.diff index c1f87571..7b888e0b 100644 --- a/debian/patches/libclc-fix-prepare_builtins-rpath.diff +++ b/debian/patches/libclc-fix-prepare_builtins-rpath.diff @@ -1,10 +1,10 @@ set rpath for prepare_builtins build utility to find correct stage2 libs at runtime when executed as part of a build -Index: llvm-toolchain-12_12.0.1/libclc/CMakeLists.txt +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libclc/CMakeLists.txt =================================================================== ---- llvm-toolchain-12_12.0.1.orig/libclc/CMakeLists.txt -+++ llvm-toolchain-12_12.0.1/libclc/CMakeLists.txt -@@ -139,6 +139,9 @@ target_compile_options( prepare_builtins +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/libclc/CMakeLists.txt ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libclc/CMakeLists.txt +@@ -149,6 +149,9 @@ target_compile_options( prepare_builtins target_compile_definitions( prepare_builtins PRIVATE ${LLVM_VERSION_DEFINE} ) target_link_libraries( prepare_builtins PRIVATE ${LLVM_LIBS} ) target_link_libraries( prepare_builtins PRIVATE ${LLVM_SYSTEM_LIBS} ) diff --git a/debian/patches/libcxx-armhf-ftbfs.diff b/debian/patches/libcxx-armhf-ftbfs.diff index 774e6121..7d88aa4a 100644 --- a/debian/patches/libcxx-armhf-ftbfs.diff +++ b/debian/patches/libcxx-armhf-ftbfs.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_14~++20210731093534+61da95e8a16a/libcxx/include/atomic +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxx/include/atomic =================================================================== ---- llvm-toolchain-snapshot_14~++20210731093534+61da95e8a16a.orig/libcxx/include/atomic -+++ llvm-toolchain-snapshot_14~++20210731093534+61da95e8a16a/libcxx/include/atomic -@@ -2822,10 +2822,15 @@ typedef conditional<_LIBCPP_CONTENTION_L +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/libcxx/include/atomic ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxx/include/atomic +@@ -2675,10 +2675,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 diff --git a/debian/patches/libcxx-libatomic-only-with-gcc-rtlib.diff b/debian/patches/libcxx-libatomic-only-with-gcc-rtlib.diff index 41662966..9919ae23 100644 --- a/debian/patches/libcxx-libatomic-only-with-gcc-rtlib.diff +++ b/debian/patches/libcxx-libatomic-only-with-gcc-rtlib.diff @@ -1,9 +1,9 @@ if libatomic is found only link it if libgcc is the rtlib -Index: llvm-toolchain-12_12.0.1/libcxx/CMakeLists.txt +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxx/CMakeLists.txt =================================================================== ---- llvm-toolchain-12_12.0.1.orig/libcxx/CMakeLists.txt -+++ llvm-toolchain-12_12.0.1/libcxx/CMakeLists.txt -@@ -756,12 +756,14 @@ function(cxx_link_system_libraries targe +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/libcxx/CMakeLists.txt ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxx/CMakeLists.txt +@@ -800,12 +800,14 @@ function(cxx_link_system_libraries targe endif() elseif (LIBCXX_HAS_GCC_LIB) target_link_libraries(${target} PRIVATE gcc) diff --git a/debian/patches/libcxx/libcxx-silent-test-libcxx.diff b/debian/patches/libcxx/libcxx-silent-test-libcxx.diff index d9b6e654..d0cd3495 100644 --- a/debian/patches/libcxx/libcxx-silent-test-libcxx.diff +++ b/debian/patches/libcxx/libcxx-silent-test-libcxx.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f.orig/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp -+++ llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp @@ -11,6 +11,8 @@ // template // RealType generate_canonical(URNG& g); @@ -11,11 +11,11 @@ Index: llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f/libcxx/test/std/ #include #include -Index: llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f/libcxx/test/std/re/re.traits/isctype.pass.cpp +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxx/test/std/re/re.traits/isctype.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f.orig/libcxx/test/std/re/re.traits/isctype.pass.cpp -+++ llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f/libcxx/test/std/re/re.traits/isctype.pass.cpp -@@ -14,6 +14,7 @@ +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/libcxx/test/std/re/re.traits/isctype.pass.cpp ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxx/test/std/re/re.traits/isctype.pass.cpp +@@ -15,6 +15,7 @@ // bool isctype(charT c, char_class_type f) const; @@ -23,10 +23,10 @@ Index: llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f/libcxx/test/std/ #include #include -Index: llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f/libcxxabi/test/catch_multi_level_pointer.pass.cpp +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxxabi/test/catch_multi_level_pointer.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f.orig/libcxxabi/test/catch_multi_level_pointer.pass.cpp -+++ llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f/libcxxabi/test/catch_multi_level_pointer.pass.cpp +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/libcxxabi/test/catch_multi_level_pointer.pass.cpp ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxxabi/test/catch_multi_level_pointer.pass.cpp @@ -11,6 +11,8 @@ // 1b00fc5d8133 made it in the dylib in macOS 10.11 // XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10}} @@ -36,10 +36,10 @@ Index: llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f/libcxxabi/test/c #include #include #include -Index: llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f.orig/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp -+++ llvm-toolchain-snapshot_13~++20210701114351+e4b9fecd392f/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp @@ -15,6 +15,8 @@ // template void construct(T* p, Args&&... args); diff --git a/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch b/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch index 42324ea5..c594cf69 100644 --- a/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch +++ b/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch @@ -10,11 +10,11 @@ To set instruction support one can check __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 defi Bug: https://llvm.org/bugs/show_bug.cgi?id=19355 -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp -@@ -21,6 +21,14 @@ +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp +@@ -24,6 +24,14 @@ # error Feature test macro missing. #endif diff --git a/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch b/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch index a5328e5c..8e26cf32 100644 --- a/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch +++ b/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch @@ -7,10 +7,10 @@ sure their ABI stays in sync. No known upstream bug about this. -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/libcxxabi/src/cxa_exception.cpp +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxxabi/src/cxa_exception.cpp =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/libcxxabi/src/cxa_exception.cpp -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/libcxxabi/src/cxa_exception.cpp +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/libcxxabi/src/cxa_exception.cpp ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxxabi/src/cxa_exception.cpp @@ -275,15 +275,16 @@ __cxa_throw(void *thrown_object, std::ty #ifdef __USING_SJLJ_EXCEPTIONS__ @@ -30,7 +30,7 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/libcxxabi/src/cxa // 2.5.3 Exception Handlers /* The adjusted pointer is computed by the personality routine during phase 1 -@@ -546,7 +547,11 @@ void __cxa_end_catch() { +@@ -551,7 +552,11 @@ void __cxa_end_catch() { // to touch a foreign exception in any way, that is undefined // behavior. They likely can't since the only way to catch // a foreign exception is with catch (...)! @@ -42,7 +42,7 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/libcxxabi/src/cxa globals->caughtExceptions = 0; } } -@@ -603,8 +608,10 @@ void __cxa_rethrow() { +@@ -608,8 +613,10 @@ void __cxa_rethrow() { } #ifdef __USING_SJLJ_EXCEPTIONS__ _Unwind_SjLj_RaiseException(&exception_header->unwindHeader); @@ -54,7 +54,7 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/libcxxabi/src/cxa #endif // If we get here, some kind of unwinding error has occurred. -@@ -728,8 +735,10 @@ __cxa_rethrow_primary_exception(void* th +@@ -733,8 +740,10 @@ __cxa_rethrow_primary_exception(void* th dep_exception_header->unwindHeader.exception_cleanup = dependent_exception_cleanup; #ifdef __USING_SJLJ_EXCEPTIONS__ _Unwind_SjLj_RaiseException(&dep_exception_header->unwindHeader); @@ -66,10 +66,10 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/libcxxabi/src/cxa #endif // Some sort of unwinding error. Note that terminate is a handler. __cxa_begin_catch(&dep_exception_header->unwindHeader); -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/libcxxabi/src/cxa_exception.h +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxxabi/src/cxa_exception.h =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/libcxxabi/src/cxa_exception.h -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/libcxxabi/src/cxa_exception.h +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/libcxxabi/src/cxa_exception.h ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxxabi/src/cxa_exception.h @@ -27,6 +27,45 @@ _LIBCXXABI_HIDDEN uint64_t __getExceptio _LIBCXXABI_HIDDEN void __setExceptionClass ( _Unwind_Exception*, uint64_t); _LIBCXXABI_HIDDEN bool __isOurExceptionClass(const _Unwind_Exception*); diff --git a/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch b/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch index a89c565b..929398ee 100644 --- a/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch +++ b/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch @@ -2,11 +2,11 @@ Powerpc has extended double that doesn't match x86 coding. Power format would need special tests to verify correctness but for now it is enough to prevent incorrect test from running. -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/libcxxabi/test/test_demangle.pass.cpp +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxxabi/test/test_demangle.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/libcxxabi/test/test_demangle.pass.cpp -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/libcxxabi/test/test_demangle.pass.cpp -@@ -29834,7 +29834,7 @@ const char* invalid_cases[] = +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/libcxxabi/test/test_demangle.pass.cpp ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxxabi/test/test_demangle.pass.cpp +@@ -29902,7 +29902,7 @@ const char* invalid_cases[] = "NSoERj5E=Y1[uM:ga", "Aon_PmKVPDk7?fg4XP5smMUL6;Vl<>IL8ayHpiVDDDXTY;^o9;i", "_ZNSt16allocator_traitsISaIN4llvm3sys2fs18directory_iteratorEEE9constructIS3_IS3_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS4_PT_DpOS7_", diff --git a/debian/patches/libcxxabi-fix-link-builtins.diff b/debian/patches/libcxxabi-fix-link-builtins.diff index 7a71c4f1..d67936e4 100644 --- a/debian/patches/libcxxabi-fix-link-builtins.diff +++ b/debian/patches/libcxxabi-fix-link-builtins.diff @@ -1,16 +1,17 @@ if LIBCXXABI_USE_COMPILER_RT=ON, add builtins to libcxxabi library flags, otherwise add libgcc following how libunwind does the same -Index: llvm-toolchain-12_12.0.1/libcxxabi/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxxabi/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-12_12.0.1.orig/libcxxabi/src/CMakeLists.txt -+++ llvm-toolchain-12_12.0.1/libcxxabi/src/CMakeLists.txt -@@ -104,7 +104,9 @@ if (ANDROID AND ANDROID_PLATFORM_LEVEL L +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/libcxxabi/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxxabi/src/CMakeLists.txt +@@ -111,7 +111,9 @@ if (ANDROID AND ANDROID_PLATFORM_LEVEL L list(APPEND LIBCXXABI_LIBRARIES android_support) endif() - + -if (NOT LIBCXXABI_USE_COMPILER_RT) +if (LIBCXXABI_USE_COMPILER_RT) + add_library_flags("${LIBCXXABI_BUILTINS_LIBRARY}") +else() add_library_flags_if(LIBCXXABI_HAS_GCC_LIB gcc) endif () + diff --git a/debian/patches/lldb-soname.diff b/debian/patches/lldb-soname.diff index 676fb3eb..604c800e 100644 --- a/debian/patches/lldb-soname.diff +++ b/debian/patches/lldb-soname.diff @@ -2,10 +2,10 @@ lldb/source/API/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -Index: llvm-toolchain-snapshot_13~++20210610102058+aaaeb4b160fe/lldb/source/API/CMakeLists.txt +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/lldb/source/API/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_13~++20210610102058+aaaeb4b160fe.orig/lldb/source/API/CMakeLists.txt -+++ llvm-toolchain-snapshot_13~++20210610102058+aaaeb4b160fe/lldb/source/API/CMakeLists.txt +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/lldb/source/API/CMakeLists.txt ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/lldb/source/API/CMakeLists.txt @@ -19,7 +19,12 @@ if(LLDB_ENABLE_LUA) set(lldb_lua_wrapper ${lua_bindings_dir}/LLDBWrapLua.cpp) endif() @@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_13~++20210610102058+aaaeb4b160fe/lldb/source/API/ SBAddress.cpp SBAttachInfo.cpp SBBlock.cpp -@@ -163,7 +168,7 @@ endif() +@@ -162,7 +167,7 @@ endif() set_target_properties(liblldb PROPERTIES @@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_13~++20210610102058+aaaeb4b160fe/lldb/source/API/ ) if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows") -@@ -182,12 +187,12 @@ if (NOT CMAKE_SYSTEM_NAME MATCHES "Windo +@@ -181,12 +186,12 @@ if (NOT CMAKE_SYSTEM_NAME MATCHES "Windo set_target_properties(liblldb_exports PROPERTIES FOLDER "lldb misc") endif() diff --git a/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch b/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch index 70a5de3e..2c198053 100644 --- a/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch +++ b/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch @@ -12,11 +12,11 @@ which could then break something else. This probably should have upstream bug but I couldn't find any existing report. -Index: llvm-toolchain-snapshot_14~++20201021041841+fa5fa63fd14/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp =================================================================== ---- llvm-toolchain-snapshot_14~++20201021041841+fa5fa63fd14.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp -+++ llvm-toolchain-snapshot_14~++20201021041841+fa5fa63fd14/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp -@@ -35,6 +35,7 @@ +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +@@ -34,6 +34,7 @@ #include "lldb/Utility/StreamString.h" #include "llvm/ADT/SmallString.h" #include "llvm/Support/ScopedPrinter.h" @@ -24,7 +24,7 @@ Index: llvm-toolchain-snapshot_14~++20201021041841+fa5fa63fd14/lldb/source/Plugi #include "ProcessGDBRemoteLog.h" -@@ -43,7 +44,7 @@ +@@ -42,7 +43,7 @@ #elif defined(_WIN32) #define DEBUGSERVER_BASENAME "lldb-server.exe" #else diff --git a/debian/patches/lldb/lldb-disable-swig-error.diff b/debian/patches/lldb/lldb-disable-swig-error.diff index 4a49ec15..8d9d97fa 100644 --- a/debian/patches/lldb/lldb-disable-swig-error.diff +++ b/debian/patches/lldb/lldb-disable-swig-error.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_12~++20200812084744+2ad7e1a301f/lldb/bindings/python/python.swig +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/lldb/bindings/python/python.swig =================================================================== ---- llvm-toolchain-snapshot_12~++20200812084744+2ad7e1a301f.orig/lldb/bindings/python/python.swig -+++ llvm-toolchain-snapshot_12~++20200812084744+2ad7e1a301f/lldb/bindings/python/python.swig -@@ -50,7 +50,7 @@ except ImportError: +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/lldb/bindings/python/python.swig ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/lldb/bindings/python/python.swig +@@ -54,7 +54,7 @@ except ImportError: %enddef // These versions will not generate working python modules, so error out early. #if SWIG_VERSION >= 0x030009 && SWIG_VERSION < 0x030011 diff --git a/debian/patches/lldb/lldb-missing-install.diff b/debian/patches/lldb/lldb-missing-install.diff index 4f63457a..8b0d0bf5 100644 --- a/debian/patches/lldb/lldb-missing-install.diff +++ b/debian/patches/lldb/lldb-missing-install.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_12~++20201021041841+fa5fa63fd14/lldb/tools/argdumper/CMakeLists.txt +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/lldb/tools/argdumper/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_12~++20201021041841+fa5fa63fd14.orig/lldb/tools/argdumper/CMakeLists.txt -+++ llvm-toolchain-snapshot_12~++20201021041841+fa5fa63fd14/lldb/tools/argdumper/CMakeLists.txt +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/lldb/tools/argdumper/CMakeLists.txt ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/lldb/tools/argdumper/CMakeLists.txt @@ -6,3 +6,6 @@ add_lldb_tool(lldb-argdumper ADD_TO_FRAM ) @@ -9,11 +9,11 @@ Index: llvm-toolchain-snapshot_12~++20201021041841+fa5fa63fd14/lldb/tools/argdum + +install(TARGETS lldb-argdumper + RUNTIME DESTINATION bin) -Index: llvm-toolchain-snapshot_12~++20201021041841+fa5fa63fd14/lldb/tools/lldb-server/CMakeLists.txt +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/lldb/tools/lldb-server/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_12~++20201021041841+fa5fa63fd14.orig/lldb/tools/lldb-server/CMakeLists.txt -+++ llvm-toolchain-snapshot_12~++20201021041841+fa5fa63fd14/lldb/tools/lldb-server/CMakeLists.txt -@@ -68,3 +68,7 @@ add_dependencies(lldb-server +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/lldb/tools/lldb-server/CMakeLists.txt ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/lldb/tools/lldb-server/CMakeLists.txt +@@ -66,3 +66,7 @@ add_dependencies(lldb-server ) target_include_directories(lldb-server PRIVATE "${LLDB_SOURCE_DIR}/source") target_link_libraries(lldb-server PRIVATE ${LLDB_SYSTEM_LIBS}) diff --git a/debian/patches/llvm-fix-lld-linker-check.diff b/debian/patches/llvm-fix-lld-linker-check.diff index bad28992..6f7174c9 100644 --- a/debian/patches/llvm-fix-lld-linker-check.diff +++ b/debian/patches/llvm-fix-lld-linker-check.diff @@ -1,10 +1,10 @@ remove regex anchor in lld linker detection to account for vendor, if specified, being prepended to lld version string -Index: llvm-toolchain-12_12.0.1/llvm/cmake/modules/AddLLVM.cmake +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/cmake/modules/AddLLVM.cmake =================================================================== ---- llvm-toolchain-12_12.0.1.orig/llvm/cmake/modules/AddLLVM.cmake -+++ llvm-toolchain-12_12.0.1/llvm/cmake/modules/AddLLVM.cmake -@@ -196,7 +196,7 @@ if (NOT DEFINED LLVM_LINKER_DETECTED) +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/llvm/cmake/modules/AddLLVM.cmake ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/cmake/modules/AddLLVM.cmake +@@ -210,7 +210,7 @@ if (NOT DEFINED LLVM_LINKER_DETECTED AND set(LLVM_LINKER_DETECTED YES CACHE INTERNAL "") set(LLVM_LINKER_IS_GOLD YES CACHE INTERNAL "") message(STATUS "Linker detection: GNU Gold") diff --git a/debian/patches/llvm-runtimes-builtins-build-check.diff b/debian/patches/llvm-runtimes-builtins-build-check.diff index b4f7eab9..f3b250f5 100644 --- a/debian/patches/llvm-runtimes-builtins-build-check.diff +++ b/debian/patches/llvm-runtimes-builtins-build-check.diff @@ -1,10 +1,10 @@ add a check and only set up and build compiler-rt builtins if they have not been disabled -Index: llvm-toolchain-12_12.0.1/llvm/runtimes/CMakeLists.txt +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/runtimes/CMakeLists.txt =================================================================== ---- llvm-toolchain-12_12.0.1.orig/llvm/runtimes/CMakeLists.txt -+++ llvm-toolchain-12_12.0.1/llvm/runtimes/CMakeLists.txt -@@ -131,7 +131,12 @@ endfunction() +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/llvm/runtimes/CMakeLists.txt ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/runtimes/CMakeLists.txt +@@ -132,7 +132,12 @@ endfunction() # is required because the other runtimes need the builtin libraries present # before the just-built compiler can pass the configuration tests. get_compiler_rt_path(compiler_rt_path) diff --git a/debian/patches/lower-python-dep.diff b/debian/patches/lower-python-dep.diff index feea5c80..dd9a067c 100644 --- a/debian/patches/lower-python-dep.diff +++ b/debian/patches/lower-python-dep.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_14~++20210731093534+61da95e8a16a/llvm/cmake/modules/HandleLLVMOptions.cmake +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/cmake/modules/HandleLLVMOptions.cmake =================================================================== ---- llvm-toolchain-snapshot_14~++20210731093534+61da95e8a16a.orig/llvm/cmake/modules/HandleLLVMOptions.cmake -+++ llvm-toolchain-snapshot_14~++20210731093534+61da95e8a16a/llvm/cmake/modules/HandleLLVMOptions.cmake -@@ -1224,8 +1224,8 @@ if(LLVM_USE_RELATIVE_PATHS_IN_FILES) +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/llvm/cmake/modules/HandleLLVMOptions.cmake ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/cmake/modules/HandleLLVMOptions.cmake +@@ -1213,8 +1213,8 @@ if(LLVM_USE_RELATIVE_PATHS_IN_FILES) endif() if(LLVM_INCLUDE_TESTS) diff --git a/debian/patches/mips/mips-D101773-reloc.patch b/debian/patches/mips/mips-D101773-reloc.patch index dfb89020..ece0d4b0 100644 --- a/debian/patches/mips/mips-D101773-reloc.patch +++ b/debian/patches/mips/mips-D101773-reloc.patch @@ -24,11 +24,11 @@ Differential Revision: https://reviews.llvm.org/D101773 2 files changed, 33 insertions(+) create mode 100644 llvm/test/MC/Mips/mips_lo16.s -Index: llvm-toolchain-12_12.0.1~+rc2/llvm/lib/MC/ELFObjectWriter.cpp +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/lib/MC/ELFObjectWriter.cpp =================================================================== ---- llvm-toolchain-12_12.0.1~+rc2.orig/llvm/lib/MC/ELFObjectWriter.cpp -+++ llvm-toolchain-12_12.0.1~+rc2/llvm/lib/MC/ELFObjectWriter.cpp -@@ -1408,6 +1408,17 @@ bool ELFObjectWriter::shouldRelocateWith +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/llvm/lib/MC/ELFObjectWriter.cpp ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/lib/MC/ELFObjectWriter.cpp +@@ -1376,6 +1376,17 @@ bool ELFObjectWriter::shouldRelocateWith if (TargetObjectWriter->getEMachine() == ELF::EM_MIPS && !hasRelocationAddend()) return true; diff --git a/debian/patches/mips/mips-fpxx-enable.diff b/debian/patches/mips/mips-fpxx-enable.diff index d8d862f9..193860af 100644 --- a/debian/patches/mips/mips-fpxx-enable.diff +++ b/debian/patches/mips/mips-fpxx-enable.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/lib/Driver/ToolChains/Arch/Mips.cpp +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/lib/Driver/ToolChains/Arch/Mips.cpp =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/clang/lib/Driver/ToolChains/Arch/Mips.cpp -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/lib/Driver/ToolChains/Arch/Mips.cpp -@@ -468,10 +468,10 @@ bool mips::isFP64ADefault(const llvm::Tr +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/clang/lib/Driver/ToolChains/Arch/Mips.cpp ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/lib/Driver/ToolChains/Arch/Mips.cpp +@@ -467,10 +467,10 @@ bool mips::isFP64ADefault(const llvm::Tr bool mips::isFPXXDefault(const llvm::Triple &Triple, StringRef CPUName, StringRef ABIName, mips::FloatABI FloatABI) { diff --git a/debian/patches/openmp-soname.diff b/debian/patches/openmp-soname.diff index e2e96e39..2511978a 100644 --- a/debian/patches/openmp-soname.diff +++ b/debian/patches/openmp-soname.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/openmp/runtime/CMakeLists.txt +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/openmp/runtime/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/openmp/runtime/CMakeLists.txt -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/openmp/runtime/CMakeLists.txt -@@ -341,7 +341,8 @@ else() +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/openmp/runtime/CMakeLists.txt ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/openmp/runtime/CMakeLists.txt +@@ -371,7 +371,8 @@ else() set(LIBOMP_INSTALL_KIND ARCHIVE) endif() diff --git a/debian/patches/openmp/openmp-mips-affinity.patch b/debian/patches/openmp/openmp-mips-affinity.patch index 12473eeb..fd614565 100644 --- a/debian/patches/openmp/openmp-mips-affinity.patch +++ b/debian/patches/openmp/openmp-mips-affinity.patch @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/openmp/runtime/src/kmp_affinity.h +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/openmp/runtime/src/kmp_affinity.h =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/openmp/runtime/src/kmp_affinity.h -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/openmp/runtime/src/kmp_affinity.h -@@ -211,28 +211,29 @@ public: +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/openmp/runtime/src/kmp_affinity.h ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/openmp/runtime/src/kmp_affinity.h +@@ -231,28 +231,29 @@ public: #elif __NR_sched_getaffinity != 223 #error Wrong code for getaffinity system call. #endif /* __NR_sched_getaffinity */ diff --git a/debian/patches/print-lldb-path.patch b/debian/patches/print-lldb-path.patch index fc53f74d..3c140e87 100644 --- a/debian/patches/print-lldb-path.patch +++ b/debian/patches/print-lldb-path.patch @@ -1,11 +1,11 @@ Author: Gianfranco Costamagna Last-Update: 2020-01-21 -Index: llvm-toolchain-snapshot_14~++20210731093534+61da95e8a16a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp =================================================================== ---- llvm-toolchain-snapshot_14~++20210731093534+61da95e8a16a.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp -+++ llvm-toolchain-snapshot_14~++20210731093534+61da95e8a16a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp -@@ -384,6 +384,8 @@ void ScriptInterpreterPython::ComputePyt +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +@@ -383,6 +383,8 @@ void ScriptInterpreterPython::ComputePyt // x86_64, or bin on Windows). llvm::sys::path::remove_filename(path); llvm::sys::path::append(path, LLDB_PYTHON_RELATIVE_LIBDIR); diff --git a/debian/patches/python-clangpath.diff b/debian/patches/python-clangpath.diff index 5d6d8810..953d5922 100644 --- a/debian/patches/python-clangpath.diff +++ b/debian/patches/python-clangpath.diff @@ -2,11 +2,11 @@ clang/bindings/python/clang/cindex.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_14~++20200326142000+4673699a470/clang/bindings/python/clang/cindex.py +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/bindings/python/clang/cindex.py =================================================================== ---- llvm-toolchain-snapshot_14~++20200326142000+4673699a470.orig/clang/bindings/python/clang/cindex.py -+++ llvm-toolchain-snapshot_14~++20200326142000+4673699a470/clang/bindings/python/clang/cindex.py -@@ -4160,7 +4160,7 @@ class Config(object): +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/clang/bindings/python/clang/cindex.py ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/bindings/python/clang/cindex.py +@@ -4162,7 +4162,7 @@ class Config(object): elif name == 'Windows': file = 'libclang.dll' else: diff --git a/debian/patches/remove-apple-clang-manpage.diff b/debian/patches/remove-apple-clang-manpage.diff index af482f44..c3b2a1b0 100644 --- a/debian/patches/remove-apple-clang-manpage.diff +++ b/debian/patches/remove-apple-clang-manpage.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/docs/CommandGuide/clang.rst +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/docs/CommandGuide/clang.rst =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/clang/docs/CommandGuide/clang.rst -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/docs/CommandGuide/clang.rst -@@ -319,20 +319,10 @@ Clang fully supports cross compilation a +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/clang/docs/CommandGuide/clang.rst ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/docs/CommandGuide/clang.rst +@@ -321,20 +321,10 @@ Clang fully supports cross compilation a Depending on how your version of Clang is configured, it may have support for a number of cross compilers, or may only support a native target. @@ -24,7 +24,7 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/docs/Comman .. option:: --print-supported-cpus Print out a list of supported processors for the given target (specified -@@ -635,11 +625,6 @@ ENVIRONMENT +@@ -653,11 +643,6 @@ ENVIRONMENT These environment variables specify additional paths, as for :envvar:`CPATH`, which are only used when processing the appropriate language. diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff index b9ecd7b5..7235c65f 100644 --- a/debian/patches/scan-build-clang-path.diff +++ b/debian/patches/scan-build-clang-path.diff @@ -2,11 +2,11 @@ clang/tools/scan-build/bin/scan-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_14~++20200326142000+4673699a470/clang/tools/scan-build/bin/scan-build +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/tools/scan-build/bin/scan-build =================================================================== ---- llvm-toolchain-snapshot_14~++20200326142000+4673699a470.orig/clang/tools/scan-build/bin/scan-build -+++ llvm-toolchain-snapshot_14~++20200326142000+4673699a470/clang/tools/scan-build/bin/scan-build -@@ -1478,7 +1478,7 @@ sub FindClang { +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/clang/tools/scan-build/bin/scan-build ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/tools/scan-build/bin/scan-build +@@ -1486,7 +1486,7 @@ sub FindClang { if (!defined $Options{AnalyzerDiscoveryMethod}) { $Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang"); if (!defined $Clang || ! -x $Clang) { diff --git a/debian/patches/symbolizer-path.diff b/debian/patches/symbolizer-path.diff index 69caab13..7af67099 100644 --- a/debian/patches/symbolizer-path.diff +++ b/debian/patches/symbolizer-path.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-12_12.0.1/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp =================================================================== ---- llvm-toolchain-12_12.0.1.orig/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp -+++ llvm-toolchain-12_12.0.1/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp @@ -25,6 +25,10 @@ #include "sanitizer_symbolizer_internal.h" #include "sanitizer_symbolizer_libbacktrace.h" @@ -13,7 +13,7 @@ Index: llvm-toolchain-12_12.0.1/compiler-rt/lib/sanitizer_common/sanitizer_symbo #include // for dlsym() #include -@@ -433,7 +437,7 @@ static SymbolizerTool *ChooseExternalSym +@@ -442,7 +446,7 @@ static SymbolizerTool *ChooseExternalSym return new(*allocator) AtosSymbolizer(found_path, allocator); } #endif // SANITIZER_MAC @@ -22,11 +22,11 @@ Index: llvm-toolchain-12_12.0.1/compiler-rt/lib/sanitizer_common/sanitizer_symbo VReport(2, "Using llvm-symbolizer found at: %s\n", found_path); return new(*allocator) LLVMSymbolizer(found_path, allocator); } -Index: llvm-toolchain-12_12.0.1/compiler-rt/lib/sanitizer_common/CMakeLists.txt +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/compiler-rt/lib/sanitizer_common/CMakeLists.txt =================================================================== ---- llvm-toolchain-12_12.0.1.orig/compiler-rt/lib/sanitizer_common/CMakeLists.txt -+++ llvm-toolchain-12_12.0.1/compiler-rt/lib/sanitizer_common/CMakeLists.txt -@@ -195,6 +195,7 @@ set(SANITIZER_IMPL_HEADERS +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/compiler-rt/lib/sanitizer_common/CMakeLists.txt ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/compiler-rt/lib/sanitizer_common/CMakeLists.txt +@@ -196,6 +196,7 @@ set(SANITIZER_IMPL_HEADERS ) include_directories(..) diff --git a/debian/patches/x86-fuzzer.patch b/debian/patches/x86-fuzzer.patch index 56b66e28..177e59e2 100644 --- a/debian/patches/x86-fuzzer.patch +++ b/debian/patches/x86-fuzzer.patch @@ -1,11 +1,11 @@ Description: fuzzer: EMULATION_ARGUMENT is also required when building on i386 for x86_64 Author: Adrian Bunk -Index: llvm-toolchain-snapshot_13~++20210516062812+d539357e1b8a/compiler-rt/lib/fuzzer/CMakeLists.txt +Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/compiler-rt/lib/fuzzer/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_13~++20210516062812+d539357e1b8a.orig/compiler-rt/lib/fuzzer/CMakeLists.txt -+++ llvm-toolchain-snapshot_13~++20210516062812+d539357e1b8a/compiler-rt/lib/fuzzer/CMakeLists.txt -@@ -138,6 +138,8 @@ if(OS_NAME MATCHES "Linux|Fuchsia" AND +--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/compiler-rt/lib/fuzzer/CMakeLists.txt ++++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/compiler-rt/lib/fuzzer/CMakeLists.txt +@@ -140,6 +140,8 @@ if(OS_NAME MATCHES "Linux|Fuchsia" AND macro(partially_link_libcxx name dir arch) if(${arch} MATCHES "i386") set(EMULATION_ARGUMENT "-m" "elf_i386")