Index: llvm-toolchain-snapshot_12~++20210114102728+0975604cc013/clang-tools-extra/clangd/CMakeLists.txt
===================================================================
--- 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")
 
+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
   ASTSignals.cpp
@@ -151,6 +156,7 @@ clang_target_link_libraries(clangDaemon
 target_link_libraries(clangDaemon
   PRIVATE
   ${LLVM_PTHREAD_LIB}
+  ${CLANGD_ATOMIC_LIB}
 
   clangTidy
   ${ALL_CLANG_TIDY_CHECKS}