rebase of the patches

This commit is contained in:
Sylvestre Ledru 2021-07-31 09:46:30 +02:00
parent f16985f2ce
commit ad6134a2c8
4 changed files with 348 additions and 368 deletions

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_12~++20210126092700+956d8e02e8a5/libcxx/include/atomic Index: llvm-toolchain-snapshot_14~++20210731093534+61da95e8a16a/libcxx/include/atomic
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_12~++20210126092700+956d8e02e8a5.orig/libcxx/include/atomic --- llvm-toolchain-snapshot_14~++20210731093534+61da95e8a16a.orig/libcxx/include/atomic
+++ llvm-toolchain-snapshot_12~++20210126092700+956d8e02e8a5/libcxx/include/atomic +++ llvm-toolchain-snapshot_14~++20210731093534+61da95e8a16a/libcxx/include/atomic
@@ -2791,10 +2791,15 @@ typedef conditional<_LIBCPP_CONTENTION_L @@ -2822,10 +2822,15 @@ typedef conditional<_LIBCPP_CONTENTION_L
typedef conditional<_LIBCPP_CONTENTION_LOCK_FREE, __cxx_contention_t, unsigned char>::type __libcpp_unsigned_lock_free; typedef conditional<_LIBCPP_CONTENTION_LOCK_FREE, __cxx_contention_t, unsigned char>::type __libcpp_unsigned_lock_free;
#else #else
// No signed/unsigned lock-free types // No signed/unsigned lock-free types

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_13~++20210610090205+c0e6f2f43a4c/llvm/cmake/modules/HandleLLVMOptions.cmake Index: llvm-toolchain-snapshot_14~++20210731093534+61da95e8a16a/llvm/cmake/modules/HandleLLVMOptions.cmake
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_13~++20210610090205+c0e6f2f43a4c.orig/llvm/cmake/modules/HandleLLVMOptions.cmake --- llvm-toolchain-snapshot_14~++20210731093534+61da95e8a16a.orig/llvm/cmake/modules/HandleLLVMOptions.cmake
+++ llvm-toolchain-snapshot_13~++20210610090205+c0e6f2f43a4c/llvm/cmake/modules/HandleLLVMOptions.cmake +++ llvm-toolchain-snapshot_14~++20210731093534+61da95e8a16a/llvm/cmake/modules/HandleLLVMOptions.cmake
@@ -1216,8 +1216,8 @@ if(LLVM_USE_RELATIVE_PATHS_IN_FILES) @@ -1224,8 +1224,8 @@ if(LLVM_USE_RELATIVE_PATHS_IN_FILES)
endif() endif()
if(LLVM_INCLUDE_TESTS) if(LLVM_INCLUDE_TESTS)

View File

@ -1,11 +1,11 @@
Author: Gianfranco Costamagna <locutusofborg@debian.org> Author: Gianfranco Costamagna <locutusofborg@debian.org>
Last-Update: 2020-01-21 Last-Update: 2020-01-21
Index: llvm-toolchain-snapshot_12~++20210126092700+956d8e02e8a5/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp Index: llvm-toolchain-snapshot_14~++20210731093534+61da95e8a16a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_12~++20210126092700+956d8e02e8a5.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp --- llvm-toolchain-snapshot_14~++20210731093534+61da95e8a16a.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
+++ llvm-toolchain-snapshot_12~++20210126092700+956d8e02e8a5/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +++ llvm-toolchain-snapshot_14~++20210731093534+61da95e8a16a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
@@ -383,6 +383,8 @@ void ScriptInterpreterPython::ComputePyt @@ -384,6 +384,8 @@ void ScriptInterpreterPython::ComputePyt
// x86_64, or bin on Windows). // x86_64, or bin on Windows).
llvm::sys::path::remove_filename(path); llvm::sys::path::remove_filename(path);
llvm::sys::path::append(path, LLDB_PYTHON_RELATIVE_LIBDIR); llvm::sys::path::append(path, LLDB_PYTHON_RELATIVE_LIBDIR);

File diff suppressed because it is too large Load Diff