mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-12-30 18:48:55 +00:00
rebase of the patches
This commit is contained in:
parent
12239b388a
commit
986f5cf543
@ -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-snapshot_14~++20211208022428+88c183e978ed/compiler-rt/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/compiler-rt/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_14~++20211208022428+88c183e978ed.orig/compiler-rt/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_14~++20211208022428+88c183e978ed/compiler-rt/CMakeLists.txt
|
||||
@@ -237,6 +237,12 @@ option(COMPILER_RT_USE_BUILTINS_LIBRARY
|
||||
--- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/compiler-rt/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/compiler-rt/CMakeLists.txt
|
||||
@@ -267,6 +267,12 @@ option(COMPILER_RT_USE_BUILTINS_LIBRARY
|
||||
|
||||
include(config-ix)
|
||||
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
fix builtins armhf default arch detection by adding the same armhf triple
|
||||
handling use for compiler-rt
|
||||
Index: llvm-toolchain-snapshot_14~++20220105111900+cdbad62c526c/compiler-rt/lib/builtins/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/compiler-rt/lib/builtins/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_14~++20220105111900+cdbad62c526c.orig/compiler-rt/lib/builtins/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_14~++20220105111900+cdbad62c526c/compiler-rt/lib/builtins/CMakeLists.txt
|
||||
--- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/compiler-rt/lib/builtins/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/compiler-rt/lib/builtins/CMakeLists.txt
|
||||
@@ -27,6 +27,11 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
|
||||
|
||||
load_llvm_config()
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
suppress warnings for xray and testing when not enabled
|
||||
Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
|
||||
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
|
||||
===================================================================
|
||||
--- 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)
|
||||
--- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
|
||||
+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
|
||||
@@ -324,15 +324,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-snapshot_14~++20211114120952+5b4bfd8c2415/compiler-rt/cmak
|
||||
string(REGEX REPLACE "[ \t]*[\r\n]+[ \t]*" ";" CONFIG_OUTPUT ${CONFIG_OUTPUT})
|
||||
list(GET CONFIG_OUTPUT 0 LDFLAGS)
|
||||
list(GET CONFIG_OUTPUT 1 LIBLIST)
|
||||
@@ -348,7 +348,7 @@ macro(load_llvm_config)
|
||||
@@ -349,7 +349,7 @@ macro(load_llvm_config)
|
||||
RESULT_VARIABLE HAD_ERROR
|
||||
OUTPUT_VARIABLE CONFIG_OUTPUT
|
||||
ERROR_QUIET)
|
||||
|
||||
6
debian/patches/force-sse2-compiler-rt.diff
vendored
6
debian/patches/force-sse2-compiler-rt.diff
vendored
@ -1,7 +1,7 @@
|
||||
Index: llvm-toolchain-snapshot-15~++20220703041804+e1f61d864214/compiler-rt/lib/builtins/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/compiler-rt/lib/builtins/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot-15~++20220703041804+e1f61d864214.orig/compiler-rt/lib/builtins/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot-15~++20220703041804+e1f61d864214/compiler-rt/lib/builtins/CMakeLists.txt
|
||||
--- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/compiler-rt/lib/builtins/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/compiler-rt/lib/builtins/CMakeLists.txt
|
||||
@@ -700,8 +700,11 @@ else ()
|
||||
if (COMPILER_RT_HAS_FCF_PROTECTION_FLAG)
|
||||
append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full BUILTIN_CFLAGS)
|
||||
|
||||
8
debian/patches/issue-54242.diff
vendored
8
debian/patches/issue-54242.diff
vendored
@ -1,8 +1,8 @@
|
||||
Index: llvm-toolchain-snapshot_15~++20220510015754+64c85742099d/mlir/lib/ExecutionEngine/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/mlir/lib/ExecutionEngine/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_15~++20220510015754+64c85742099d.orig/mlir/lib/ExecutionEngine/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_15~++20220510015754+64c85742099d/mlir/lib/ExecutionEngine/CMakeLists.txt
|
||||
@@ -51,7 +51,7 @@ add_mlir_library(MLIRExecutionEngineUtil
|
||||
--- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/mlir/lib/ExecutionEngine/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/mlir/lib/ExecutionEngine/CMakeLists.txt
|
||||
@@ -57,7 +57,7 @@ endif(LLVM_USE_PERF)
|
||||
add_mlir_library(MLIRExecutionEngine
|
||||
ExecutionEngine.cpp
|
||||
|
||||
|
||||
@ -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-snapshot_14~++20211114120952+5b4bfd8c2415/libclc/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/libclc/CMakeLists.txt
|
||||
===================================================================
|
||||
--- 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
|
||||
--- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/libclc/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/libclc/CMakeLists.txt
|
||||
@@ -151,6 +151,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} )
|
||||
|
||||
10
debian/patches/libclc-llvm-spirv.diff
vendored
10
debian/patches/libclc-llvm-spirv.diff
vendored
@ -1,8 +1,8 @@
|
||||
diff --git a/libclc/CMakeLists.txt b/libclc/CMakeLists.txt
|
||||
index b8b5ceff086c..5964468358f2 100644
|
||||
--- a/libclc/CMakeLists.txt
|
||||
+++ b/libclc/CMakeLists.txt
|
||||
@@ -97,7 +97,7 @@ find_program( LLVM_CLANG clang PATHS ${LLVM_BINDIR} NO_DEFAULT_PATH )
|
||||
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/libclc/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/libclc/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/libclc/CMakeLists.txt
|
||||
@@ -99,7 +99,7 @@ find_program( LLVM_CLANG clang PATHS ${L
|
||||
find_program( LLVM_AS llvm-as PATHS ${LLVM_BINDIR} NO_DEFAULT_PATH )
|
||||
find_program( LLVM_LINK llvm-link PATHS ${LLVM_BINDIR} NO_DEFAULT_PATH )
|
||||
find_program( LLVM_OPT opt PATHS ${LLVM_BINDIR} NO_DEFAULT_PATH )
|
||||
|
||||
8
debian/patches/libcxx-armhf-ftbfs.diff
vendored
8
debian/patches/libcxx-armhf-ftbfs.diff
vendored
@ -1,8 +1,8 @@
|
||||
Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/libcxx/include/atomic
|
||||
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/libcxx/include/atomic
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/libcxx/include/atomic
|
||||
+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/libcxx/include/atomic
|
||||
@@ -2683,9 +2683,13 @@ typedef conditional<_LIBCPP_CONTENTION_L
|
||||
--- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/libcxx/include/atomic
|
||||
+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/libcxx/include/atomic
|
||||
@@ -2687,9 +2687,13 @@ typedef conditional<_LIBCPP_CONTENTION_L
|
||||
#endif
|
||||
|
||||
#if !defined(_LIBCPP_NO_LOCK_FREE_TYPES)
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
if libatomic is found only link it if libgcc is the rtlib
|
||||
Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxx/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/libcxx/CMakeLists.txt
|
||||
===================================================================
|
||||
--- 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
|
||||
--- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/libcxx/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/libcxx/CMakeLists.txt
|
||||
@@ -774,12 +774,14 @@ function(cxx_link_system_libraries targe
|
||||
endif()
|
||||
elseif (LIBCXX_HAS_GCC_LIB)
|
||||
target_link_libraries(${target} PRIVATE gcc)
|
||||
|
||||
@ -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-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/cmake/modules/AddLLVM.cmake
|
||||
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/llvm/cmake/modules/AddLLVM.cmake
|
||||
===================================================================
|
||||
--- 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
|
||||
--- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/llvm/cmake/modules/AddLLVM.cmake
|
||||
+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/llvm/cmake/modules/AddLLVM.cmake
|
||||
@@ -217,7 +217,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")
|
||||
|
||||
@ -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-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/runtimes/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/llvm/runtimes/CMakeLists.txt
|
||||
===================================================================
|
||||
--- 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()
|
||||
--- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/llvm/runtimes/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/llvm/runtimes/CMakeLists.txt
|
||||
@@ -134,7 +134,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)
|
||||
|
||||
8
debian/patches/lower-python-dep.diff
vendored
8
debian/patches/lower-python-dep.diff
vendored
@ -1,8 +1,8 @@
|
||||
Index: llvm-toolchain-snapshot_15~++20220314071859+3b61587c9e27/llvm/cmake/modules/HandleLLVMOptions.cmake
|
||||
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/llvm/cmake/modules/HandleLLVMOptions.cmake
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_15~++20220314071859+3b61587c9e27.orig/llvm/cmake/modules/HandleLLVMOptions.cmake
|
||||
+++ llvm-toolchain-snapshot_15~++20220314071859+3b61587c9e27/llvm/cmake/modules/HandleLLVMOptions.cmake
|
||||
@@ -1236,8 +1236,8 @@ if(LLVM_USE_RELATIVE_PATHS_IN_FILES)
|
||||
--- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/llvm/cmake/modules/HandleLLVMOptions.cmake
|
||||
+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/llvm/cmake/modules/HandleLLVMOptions.cmake
|
||||
@@ -1255,8 +1255,8 @@ if(LLVM_USE_RELATIVE_PATHS_IN_FILES)
|
||||
endif()
|
||||
|
||||
if(LLVM_INCLUDE_TESTS)
|
||||
|
||||
8
debian/patches/omp-riscv64.patch
vendored
8
debian/patches/omp-riscv64.patch
vendored
@ -1,9 +1,11 @@
|
||||
Description: Define the affinity for riscv64
|
||||
Last-Update: 2021-08-27
|
||||
|
||||
--- llvm-toolchain-12-12.0.1.orig/openmp/runtime/src/kmp_affinity.h
|
||||
+++ llvm-toolchain-12-12.0.1/openmp/runtime/src/kmp_affinity.h
|
||||
@@ -209,6 +209,17 @@ public:
|
||||
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/openmp/runtime/src/kmp_affinity.h
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/openmp/runtime/src/kmp_affinity.h
|
||||
+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/openmp/runtime/src/kmp_affinity.h
|
||||
@@ -210,6 +210,17 @@ public:
|
||||
#elif __NR_sched_getaffinity != 123
|
||||
#error Wrong code for getaffinity system call.
|
||||
#endif /* __NR_sched_getaffinity */
|
||||
|
||||
8
debian/patches/print-lldb-path.patch
vendored
8
debian/patches/print-lldb-path.patch
vendored
@ -1,10 +1,10 @@
|
||||
Author: Gianfranco Costamagna <locutusofborg@debian.org>
|
||||
Last-Update: 2020-01-21
|
||||
|
||||
Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
|
||||
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
|
||||
+++ llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
|
||||
--- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
|
||||
+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
|
||||
@@ -239,6 +239,8 @@ void ScriptInterpreterPython::ComputePyt
|
||||
// x86_64, or bin on Windows).
|
||||
llvm::sys::path::remove_filename(path);
|
||||
@ -13,4 +13,4 @@ Index: llvm-toolchain-snapshot_15~++20220723123759+d959324e1efe/lldb/source/Plug
|
||||
+ std::replace(path.begin(), path.end(), '/lib/lib/', '/lib/');
|
||||
|
||||
#if defined(_WIN32)
|
||||
// This will be injected directly through FileSpec.SetDirectory(),
|
||||
// This will be injected directly through FileSpec.GetDirectory().SetString(),
|
||||
|
||||
52
debian/patches/revert-update-doc.diff
vendored
52
debian/patches/revert-update-doc.diff
vendored
@ -15,10 +15,10 @@ Date: Tue Feb 1 23:13:01 2022 -0800
|
||||
|
||||
Differential Revision: https://reviews.llvm.org/D112181
|
||||
|
||||
diff --git b/clang-tools-extra/docs/conf.py a/clang-tools-extra/docs/conf.py
|
||||
index bf8dd05cb6f8..24dbcb144677 100644
|
||||
--- b/clang-tools-extra/docs/conf.py
|
||||
+++ a/clang-tools-extra/docs/conf.py
|
||||
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/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
|
||||
@@ -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 bf8dd05cb6f8..24dbcb144677 100644
|
||||
|
||||
# -- Options for HTML output ---------------------------------------------------
|
||||
|
||||
diff --git b/clang/docs/conf.py a/clang/docs/conf.py
|
||||
index b8a42018191a..690c8430a321 100644
|
||||
--- b/clang/docs/conf.py
|
||||
+++ a/clang/docs/conf.py
|
||||
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/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
|
||||
@@ -62,6 +62,15 @@ master_doc = 'index'
|
||||
project = u'Clang'
|
||||
copyright = u'2007-%d, The Clang Team' % date.today().year
|
||||
@ -79,10 +79,10 @@ index b8a42018191a..690c8430a321 100644
|
||||
|
||||
# -- Options for HTML output ---------------------------------------------------
|
||||
|
||||
diff --git b/lld/docs/conf.py a/lld/docs/conf.py
|
||||
index 95befddf80ea..8d0fec72caf8 100644
|
||||
--- b/lld/docs/conf.py
|
||||
+++ a/lld/docs/conf.py
|
||||
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/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
|
||||
@@ -43,6 +43,15 @@ master_doc = 'index'
|
||||
project = u'lld'
|
||||
copyright = u'2011-%d, LLVM Project' % date.today().year
|
||||
@ -99,11 +99,11 @@ index 95befddf80ea..8d0fec72caf8 100644
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
#language = None
|
||||
diff --git b/llvm/cmake/modules/AddSphinxTarget.cmake a/llvm/cmake/modules/AddSphinxTarget.cmake
|
||||
index bbc889c6b085..5bd368b6d553 100644
|
||||
--- b/llvm/cmake/modules/AddSphinxTarget.cmake
|
||||
+++ a/llvm/cmake/modules/AddSphinxTarget.cmake
|
||||
@@ -39,10 +39,6 @@ function (add_sphinx_target builder project)
|
||||
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/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
|
||||
@@ -39,10 +39,6 @@ function (add_sphinx_target builder proj
|
||||
set(ARG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
endif()
|
||||
|
||||
@ -114,7 +114,7 @@ index bbc889c6b085..5bd368b6d553 100644
|
||||
add_custom_target(${SPHINX_TARGET_NAME}
|
||||
COMMAND ${CMAKE_COMMAND} -E env ${ARG_ENV_VARS}
|
||||
${SPHINX_EXECUTABLE}
|
||||
@@ -50,9 +46,6 @@ function (add_sphinx_target builder project)
|
||||
@@ -50,9 +46,6 @@ function (add_sphinx_target builder proj
|
||||
-d "${SPHINX_DOC_TREE_DIR}"
|
||||
-q # Quiet: no output other than errors and warnings.
|
||||
-t builder-${builder} # tag for builder
|
||||
@ -124,10 +124,10 @@ index bbc889c6b085..5bd368b6d553 100644
|
||||
${SPHINX_WARNINGS_AS_ERRORS_FLAG} # Treat warnings as errors if requested
|
||||
"${ARG_SOURCE_DIR}" # Source
|
||||
"${SPHINX_BUILD_DIR}" # Output
|
||||
diff --git b/llvm/docs/conf.py a/llvm/docs/conf.py
|
||||
index 80aef2202bcd..5be2e8671111 100644
|
||||
--- b/llvm/docs/conf.py
|
||||
+++ a/llvm/docs/conf.py
|
||||
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/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
|
||||
@@ -61,6 +61,15 @@ master_doc = 'index'
|
||||
project = u'LLVM'
|
||||
copyright = u'2003-%d, LLVM Project' % date.today().year
|
||||
@ -144,10 +144,10 @@ index 80aef2202bcd..5be2e8671111 100644
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
#language = None
|
||||
diff --git b/polly/docs/conf.py a/polly/docs/conf.py
|
||||
index b35c4a2ae9bc..cf757f12d969 100644
|
||||
--- b/polly/docs/conf.py
|
||||
+++ a/polly/docs/conf.py
|
||||
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/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
|
||||
@@ -44,6 +44,15 @@ master_doc = 'index'
|
||||
project = u'Polly'
|
||||
copyright = u'2010-%d, The Polly Team' % date.today().year
|
||||
|
||||
8
debian/patches/unbreak-atomic-mips.diff
vendored
8
debian/patches/unbreak-atomic-mips.diff
vendored
@ -1,8 +1,8 @@
|
||||
Index: llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678/compiler-rt/lib/scudo/standalone/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/compiler-rt/lib/scudo/standalone/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678.orig/compiler-rt/lib/scudo/standalone/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678/compiler-rt/lib/scudo/standalone/CMakeLists.txt
|
||||
@@ -144,6 +144,13 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH MATCH
|
||||
--- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/compiler-rt/lib/scudo/standalone/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/compiler-rt/lib/scudo/standalone/CMakeLists.txt
|
||||
@@ -145,6 +145,13 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH MATCH
|
||||
list(APPEND SCUDO_LINK_LIBS atomic)
|
||||
endif()
|
||||
|
||||
|
||||
6
debian/patches/unwind-force-pthread-dl.diff
vendored
6
debian/patches/unwind-force-pthread-dl.diff
vendored
@ -1,7 +1,7 @@
|
||||
Index: llvm-toolchain-snapshot-15~++20220521115334+295d032762ad/libunwind/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/libunwind/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot-15~++20220521115334+295d032762ad.orig/libunwind/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot-15~++20220521115334+295d032762ad/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)
|
||||
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
|
||||
endif()
|
||||
|
||||
6
debian/patches/wasm-ld-path.diff
vendored
6
debian/patches/wasm-ld-path.diff
vendored
@ -1,7 +1,7 @@
|
||||
Index: llvm-toolchain-snapshot_15~++20220204082107+5e97d37b9608/clang/lib/Driver/ToolChains/WebAssembly.h
|
||||
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/clang/lib/Driver/ToolChains/WebAssembly.h
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_15~++20220204082107+5e97d37b9608.orig/clang/lib/Driver/ToolChains/WebAssembly.h
|
||||
+++ llvm-toolchain-snapshot_15~++20220204082107+5e97d37b9608/clang/lib/Driver/ToolChains/WebAssembly.h
|
||||
--- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/clang/lib/Driver/ToolChains/WebAssembly.h
|
||||
+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/clang/lib/Driver/ToolChains/WebAssembly.h
|
||||
@@ -10,9 +10,13 @@
|
||||
#define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_WEBASSEMBLY_H
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user