From 59c423885acbbcefb66ba79c82117dedd6d1d47c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 1 Dec 2022 23:39:56 +0100 Subject: [PATCH] rebase of the patches --- debian/patches/force-sse2-compiler-rt.diff | 8 ++-- debian/patches/revert-update-doc.diff | 42 ++++++++++----------- debian/patches/unwind-force-pthread-dl.diff | 8 ++-- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/debian/patches/force-sse2-compiler-rt.diff b/debian/patches/force-sse2-compiler-rt.diff index 22323f29..c9693e0d 100644 --- a/debian/patches/force-sse2-compiler-rt.diff +++ b/debian/patches/force-sse2-compiler-rt.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_16~++20220829104310+329b972d416a/compiler-rt/lib/builtins/CMakeLists.txt +Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/compiler-rt/lib/builtins/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_16~++20220829104310+329b972d416a.orig/compiler-rt/lib/builtins/CMakeLists.txt -+++ llvm-toolchain-snapshot_16~++20220829104310+329b972d416a/compiler-rt/lib/builtins/CMakeLists.txt -@@ -709,8 +709,11 @@ else () +--- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/compiler-rt/lib/builtins/CMakeLists.txt ++++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/compiler-rt/lib/builtins/CMakeLists.txt +@@ -742,8 +742,11 @@ else () if (COMPILER_RT_HAS_FCF_PROTECTION_FLAG) append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full BUILTIN_CFLAGS) endif() diff --git a/debian/patches/revert-update-doc.diff b/debian/patches/revert-update-doc.diff index ca17cede..aeea4c23 100644 --- a/debian/patches/revert-update-doc.diff +++ b/debian/patches/revert-update-doc.diff @@ -15,10 +15,10 @@ Date: Tue Feb 1 23:13:01 2022 -0800 Differential Revision: https://reviews.llvm.org/D112181 -Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/clang-tools-extra/docs/conf.py +Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/clang-tools-extra/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/clang-tools-extra/docs/conf.py -+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/clang-tools-extra/docs/conf.py +--- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/clang-tools-extra/docs/conf.py ++++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/clang-tools-extra/docs/conf.py @@ -44,6 +44,15 @@ master_doc = 'index' project = u'Extra Clang Tools' copyright = u'2007-%d, The Clang Team' % date.today().year @@ -47,10 +47,10 @@ Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/clang-tools-extr # -- Options for HTML output --------------------------------------------------- -Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/clang/docs/conf.py +Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/clang/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/clang/docs/conf.py -+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/clang/docs/conf.py +--- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/clang/docs/conf.py ++++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/clang/docs/conf.py @@ -62,6 +62,15 @@ master_doc = 'index' project = u'Clang' copyright = u'2007-%d, The Clang Team' % date.today().year @@ -67,9 +67,9 @@ Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/clang/docs/conf. # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. #language = None -@@ -96,11 +105,6 @@ pygments_style = 'friendly' - # A list of ignored prefixes for module index sorting. - #modindex_common_prefix = [] +@@ -93,11 +102,6 @@ exclude_patterns = ['_build'] + # The name of the Pygments (syntax highlighting) style to use. + pygments_style = 'friendly' -in_progress_title = "(In-Progress) " if tags.has("PreRelease") else "" - @@ -79,10 +79,10 @@ Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/clang/docs/conf. # -- Options for HTML output --------------------------------------------------- -Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/lld/docs/conf.py +Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/lld/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/lld/docs/conf.py -+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/lld/docs/conf.py +--- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/lld/docs/conf.py ++++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/lld/docs/conf.py @@ -43,6 +43,15 @@ master_doc = 'index' project = u'lld' copyright = u'2011-%d, LLVM Project' % date.today().year @@ -99,10 +99,10 @@ Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/lld/docs/conf.py # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. #language = None -Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/llvm/cmake/modules/AddSphinxTarget.cmake +Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/llvm/cmake/modules/AddSphinxTarget.cmake =================================================================== ---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/llvm/cmake/modules/AddSphinxTarget.cmake -+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/llvm/cmake/modules/AddSphinxTarget.cmake +--- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/llvm/cmake/modules/AddSphinxTarget.cmake ++++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/llvm/cmake/modules/AddSphinxTarget.cmake @@ -39,10 +39,6 @@ function (add_sphinx_target builder proj set(ARG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") endif() @@ -124,10 +124,10 @@ Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/llvm/cmake/modul ${SPHINX_WARNINGS_AS_ERRORS_FLAG} # Treat warnings as errors if requested "${ARG_SOURCE_DIR}" # Source "${SPHINX_BUILD_DIR}" # Output -Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/llvm/docs/conf.py +Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/llvm/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/llvm/docs/conf.py -+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/llvm/docs/conf.py +--- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/llvm/docs/conf.py ++++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/llvm/docs/conf.py @@ -61,6 +61,15 @@ master_doc = 'index' project = u'LLVM' copyright = u'2003-%d, LLVM Project' % date.today().year @@ -144,10 +144,10 @@ Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/llvm/docs/conf.p # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. #language = None -Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/polly/docs/conf.py +Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/polly/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/polly/docs/conf.py -+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/polly/docs/conf.py +--- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/polly/docs/conf.py ++++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/polly/docs/conf.py @@ -44,6 +44,15 @@ master_doc = 'index' project = u'Polly' copyright = u'2010-%d, The Polly Team' % date.today().year diff --git a/debian/patches/unwind-force-pthread-dl.diff b/debian/patches/unwind-force-pthread-dl.diff index 5e76165e..d389bca4 100644 --- a/debian/patches/unwind-force-pthread-dl.diff +++ b/debian/patches/unwind-force-pthread-dl.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/libunwind/CMakeLists.txt +Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/libunwind/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/libunwind/CMakeLists.txt -+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/libunwind/CMakeLists.txt -@@ -309,14 +309,17 @@ if (MSVC) +--- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/libunwind/CMakeLists.txt ++++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/libunwind/CMakeLists.txt +@@ -308,14 +308,17 @@ if (MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS) endif()