mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2026-01-02 23:56:58 +00:00
rebase of the patch
This commit is contained in:
parent
ca864dee61
commit
205421c133
14
debian/patches/clangd-atomic-cmake.patch
vendored
14
debian/patches/clangd-atomic-cmake.patch
vendored
@ -1,10 +1,10 @@
|
||||
Index: llvm-toolchain-snapshot_12~++20200720020250+6384ec40994/clang-tools-extra/clangd/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_12~++20200911085730+f787fe15d8e/clang-tools-extra/clangd/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_12~++20200720020250+6384ec40994.orig/clang-tools-extra/clangd/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_12~++20200720020250+6384ec40994/clang-tools-extra/clangd/CMakeLists.txt
|
||||
@@ -32,6 +32,11 @@ if(MSVC AND NOT CLANG_CL)
|
||||
set_source_files_properties(CompileCommands.cpp PROPERTIES COMPILE_FLAGS -wd4130) # disables C4130: logical operation on address of string constant
|
||||
endif()
|
||||
--- llvm-toolchain-snapshot_12~++20200911085730+f787fe15d8e.orig/clang-tools-extra/clangd/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_12~++20200911085730+f787fe15d8e/clang-tools-extra/clangd/CMakeLists.txt
|
||||
@@ -35,6 +35,11 @@ endif()
|
||||
|
||||
include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}/../clang-tidy")
|
||||
|
||||
+if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i386" OR
|
||||
+ CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686")
|
||||
@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_12~++20200720020250+6384ec40994/clang-tools-extra
|
||||
add_clang_library(clangDaemon
|
||||
AST.cpp
|
||||
ClangdLSPServer.cpp
|
||||
@@ -108,6 +113,7 @@ add_clang_library(clangDaemon
|
||||
@@ -111,6 +116,7 @@ add_clang_library(clangDaemon
|
||||
clangdSupport
|
||||
clangTidy
|
||||
${LLVM_PTHREAD_LIB}
|
||||
|
||||
8
debian/patches/libcxx-armhf-ftbfs.diff
vendored
8
debian/patches/libcxx-armhf-ftbfs.diff
vendored
@ -1,8 +1,8 @@
|
||||
Index: llvm-toolchain-11-11.0.0~+rc2/libcxx/include/atomic
|
||||
Index: llvm-toolchain-snapshot_12~++20200911085730+f787fe15d8e/libcxx/include/atomic
|
||||
===================================================================
|
||||
--- llvm-toolchain-11-11.0.0~+rc2.orig/libcxx/include/atomic
|
||||
+++ llvm-toolchain-11-11.0.0~+rc2/libcxx/include/atomic
|
||||
@@ -2775,10 +2775,15 @@ typedef conditional<_LIBCPP_CONTENTION_L
|
||||
--- llvm-toolchain-snapshot_12~++20200911085730+f787fe15d8e.orig/libcxx/include/atomic
|
||||
+++ llvm-toolchain-snapshot_12~++20200911085730+f787fe15d8e/libcxx/include/atomic
|
||||
@@ -2716,10 +2716,15 @@ typedef conditional<_LIBCPP_CONTENTION_L
|
||||
typedef conditional<_LIBCPP_CONTENTION_LOCK_FREE, __cxx_contention_t, unsigned char>::type __libcpp_unsigned_lock_free;
|
||||
#else
|
||||
// No signed/unsigned lock-free types
|
||||
|
||||
Loading…
Reference in New Issue
Block a user