rebase of the patch

This commit is contained in:
Sylvestre Ledru 2022-03-14 19:25:57 +01:00
parent d71742ff5e
commit a51e060bee
6 changed files with 328 additions and 340 deletions

View File

@ -1,16 +1,14 @@
Index: llvm-toolchain-snapshot_15~++20211115120952+5b4bfd8c2415/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py Index: llvm-toolchain-snapshot_15~++20220314071859+3b61587c9e27/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_15~++20211115120952+5b4bfd8c2415.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py --- llvm-toolchain-snapshot_15~++20220314071859+3b61587c9e27.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+++ llvm-toolchain-snapshot_15~++20211115120952+5b4bfd8c2415/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py +++ llvm-toolchain-snapshot_15~++20220314071859+3b61587c9e27/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
@@ -194,10 +194,10 @@ def main(): @@ -219,8 +219,10 @@ def main():
action='store_true', help='allow alpha checkers from ' action='store_true', help='allow alpha checkers from '
'clang-analyzer.') 'clang-analyzer.')
parser.add_argument('-clang-tidy-binary', metavar='PATH', parser.add_argument('-clang-tidy-binary', metavar='PATH',
- default='clang-tidy',
+ default='clang-tidy-15', + default='clang-tidy-15',
help='path to clang-tidy binary') help='path to clang-tidy binary')
parser.add_argument('-clang-apply-replacements-binary', metavar='PATH', parser.add_argument('-clang-apply-replacements-binary', metavar='PATH',
- default='clang-apply-replacements',
+ default='clang-apply-replacements-15', + default='clang-apply-replacements-15',
help='path to clang-apply-replacements binary') help='path to clang-apply-replacements binary')
parser.add_argument('-checks', default=None, parser.add_argument('-checks', default=None,

View File

@ -1,13 +1,13 @@
Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/include/llvm/Support/X86TargetParser.def Index: llvm-toolchain-snapshot_15~++20220314071859+3b61587c9e27/llvm/include/llvm/Support/X86TargetParser.def
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/llvm/include/llvm/Support/X86TargetParser.def --- llvm-toolchain-snapshot_15~++20220314071859+3b61587c9e27.orig/llvm/include/llvm/Support/X86TargetParser.def
+++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/include/llvm/Support/X86TargetParser.def +++ llvm-toolchain-snapshot_15~++20220314071859+3b61587c9e27/llvm/include/llvm/Support/X86TargetParser.def
@@ -225,7 +225,7 @@ CPU_SPECIFIC("pentium_mmx", 'D', "+mmx") @@ -225,7 +225,7 @@ CPU_SPECIFIC("pentium_mmx", "pentium-mmx
CPU_SPECIFIC("pentium_ii", 'E', "+cmov,+mmx") CPU_SPECIFIC("pentium_ii", "pentium2", 'E', "+cmov,+mmx")
CPU_SPECIFIC("pentium_iii", 'H', "+cmov,+mmx,+sse") CPU_SPECIFIC("pentium_iii", "pentium3", 'H', "+cmov,+mmx,+sse")
CPU_SPECIFIC_ALIAS("pentium_iii_no_xmm_regs", "pentium_iii") CPU_SPECIFIC_ALIAS("pentium_iii_no_xmm_regs", "pentium3", "pentium_iii")
-CPU_SPECIFIC("pentium_4", 'J', "+cmov,+mmx,+sse,+sse2") -CPU_SPECIFIC("pentium_4", "pentium4", 'J', "+cmov,+mmx,+sse,+sse2")
+CPU_SPECIFIC("pentium_4", 'J', "+cmov,+mmx,+sse") +CPU_SPECIFIC("pentium_4", "pentium4", 'J', "+cmov,+mmx,+sse")
CPU_SPECIFIC("pentium_m", 'K', "+cmov,+mmx,+sse,+sse2") CPU_SPECIFIC("pentium_m", "pentium-m", 'K', "+cmov,+mmx,+sse,+sse2")
CPU_SPECIFIC("pentium_4_sse3", 'L', "+cmov,+mmx,+sse,+sse2,+sse3") CPU_SPECIFIC("pentium_4_sse3", "prescott", 'L', "+cmov,+mmx,+sse,+sse2,+sse3")
CPU_SPECIFIC("core_2_duo_ssse3", 'M', "+cmov,+mmx,+sse,+sse2,+sse3,+ssse3") CPU_SPECIFIC("core_2_duo_ssse3", "core2", 'M', "+cmov,+mmx,+sse,+sse2,+sse3,+ssse3")

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_14~++20220128082735+c962b3fdf8dd/libcxx/include/atomic Index: llvm-toolchain-snapshot_15~++20220314071859+3b61587c9e27/libcxx/include/atomic
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_14~++20220128082735+c962b3fdf8dd.orig/libcxx/include/atomic --- llvm-toolchain-snapshot_15~++20220314071859+3b61587c9e27.orig/libcxx/include/atomic
+++ llvm-toolchain-snapshot_14~++20220128082735+c962b3fdf8dd/libcxx/include/atomic +++ llvm-toolchain-snapshot_15~++20220314071859+3b61587c9e27/libcxx/include/atomic
@@ -2696,9 +2696,13 @@ typedef conditional<_LIBCPP_CONTENTION_L @@ -2682,9 +2682,13 @@ typedef conditional<_LIBCPP_CONTENTION_L
#endif #endif
#if !defined(_LIBCPP_NO_LOCK_FREE_TYPES) #if !defined(_LIBCPP_NO_LOCK_FREE_TYPES)

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/cmake/modules/HandleLLVMOptions.cmake Index: llvm-toolchain-snapshot_15~++20220314071859+3b61587c9e27/llvm/cmake/modules/HandleLLVMOptions.cmake
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/llvm/cmake/modules/HandleLLVMOptions.cmake --- llvm-toolchain-snapshot_15~++20220314071859+3b61587c9e27.orig/llvm/cmake/modules/HandleLLVMOptions.cmake
+++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/cmake/modules/HandleLLVMOptions.cmake +++ llvm-toolchain-snapshot_15~++20220314071859+3b61587c9e27/llvm/cmake/modules/HandleLLVMOptions.cmake
@@ -1213,8 +1213,8 @@ if(LLVM_USE_RELATIVE_PATHS_IN_FILES) @@ -1236,8 +1236,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_14~++20211114120952+5b4bfd8c2415/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp Index: llvm-toolchain-snapshot_15~++20220314071859+3b61587c9e27/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp --- llvm-toolchain-snapshot_15~++20220314071859+3b61587c9e27.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
+++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +++ llvm-toolchain-snapshot_15~++20220314071859+3b61587c9e27/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
@@ -383,6 +383,8 @@ void ScriptInterpreterPython::ComputePyt @@ -265,6 +265,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