Index: llvm-toolchain-snapshot_11~++20200617103614+2eaadfc4fe6/clang-tools-extra/clangd/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_11~++20200617103614+2eaadfc4fe6.orig/clang-tools-extra/clangd/CMakeLists.txt
+++ llvm-toolchain-snapshot_11~++20200617103614+2eaadfc4fe6/clang-tools-extra/clangd/CMakeLists.txt
@@ -27,6 +27,11 @@ set(LLVM_LINK_COMPONENTS
   FrontendOpenMP
   )
 
+if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i386" OR
+   CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686")
+  list(APPEND CLANGD_ATOMIC_LIB "atomic")
+endif()
+
 add_clang_library(clangDaemon
   AST.cpp
   ClangdLSPServer.cpp
@@ -99,6 +104,7 @@ add_clang_library(clangDaemon
   clangdSupport
   clangTidy
   ${LLVM_PTHREAD_LIB}
+  ${CLANGD_ATOMIC_LIB}
   ${ALL_CLANG_TIDY_CHECKS}
   )