rebase of the patches

This commit is contained in:
Sylvestre Ledru 2021-01-14 22:38:19 +01:00
parent 86258a0179
commit 5a61ca6f21
2 changed files with 13 additions and 13 deletions

View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/llvm/include/llvm/Support/ARMTargetParser.def
Index: llvm-toolchain-snapshot_12~++20210114102728+0975604cc013/llvm/include/llvm/Support/ARMTargetParser.def
===================================================================
--- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/llvm/include/llvm/Support/ARMTargetParser.def
+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/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
@@ -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_11~++20200326111000+4673699a470/llvm/include/llvm
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_11~++20200326111000+4673699a470/llvm/lib/Target/ARM/ARM.td
Index: llvm-toolchain-snapshot_12~++20210114102728+0975604cc013/llvm/lib/Target/ARM/ARM.td
===================================================================
--- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/llvm/lib/Target/ARM/ARM.td
+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/llvm/lib/Target/ARM/ARM.td
@@ -691,7 +691,8 @@ def ARMv6sm : Architecture<"armv6s-m",
--- 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",
FeatureStrictAlign]>;
def ARMv7a : Architecture<"armv7-a", "ARMv7a", [HasV7Ops,

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_12~++20201104064833+d8f531c42c7/clang-tools-extra/clangd/CMakeLists.txt
Index: llvm-toolchain-snapshot_12~++20210114102728+0975604cc013/clang-tools-extra/clangd/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_12~++20201104064833+d8f531c42c7.orig/clang-tools-extra/clangd/CMakeLists.txt
+++ llvm-toolchain-snapshot_12~++20201104064833+d8f531c42c7/clang-tools-extra/clangd/CMakeLists.txt
@@ -38,6 +38,11 @@ endif()
--- llvm-toolchain-snapshot_12~++20210114102728+0975604cc013.orig/clang-tools-extra/clangd/CMakeLists.txt
+++ llvm-toolchain-snapshot_12~++20210114102728+0975604cc013/clang-tools-extra/clangd/CMakeLists.txt
@@ -44,6 +44,11 @@ endif()
include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}/../clang-tidy")
@ -13,8 +13,8 @@ Index: llvm-toolchain-snapshot_12~++20201104064833+d8f531c42c7/clang-tools-extra
+
add_clang_library(clangDaemon
AST.cpp
ClangdLSPServer.cpp
@@ -142,6 +147,7 @@ clang_target_link_libraries(clangDaemon
ASTSignals.cpp
@@ -151,6 +156,7 @@ clang_target_link_libraries(clangDaemon
target_link_libraries(clangDaemon
PRIVATE
${LLVM_PTHREAD_LIB}