Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -3,6 +3,7 @@
 include(cmake/modules/LLDBStandalone.cmake)
 include(cmake/modules/LLDBConfig.cmake)
 include(cmake/modules/AddLLDB.cmake)
+include(cmake/modules/CheckLLDBAtomic.cmake)
 
 if (__ANDROID_NDK__ OR (CMAKE_SYSTEM_NAME MATCHES "Windows"))
   set(LLDB_DEFAULT_DISABLE_LIBEDIT 1)
@@ -17,6 +18,12 @@
   add_definitions( -DLLDB_DISABLE_LIBEDIT )
 endif()
 
+# Check if libatomic needs to be specified explicitly
+if (NOT HAVE_LLDB_ATOMICS_WITHOUT_LIB)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-latomic")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-latomic")
+endif()
+
 # add_subdirectory(include)
 add_subdirectory(docs)
 if (NOT LLDB_DISABLE_PYTHON)
Index: cmake/modules/CheckLLDBAtomic.cmake
===================================================================
--- /dev/null
+++ cmake/modules/CheckLLDBAtomic.cmake
@@ -0,0 +1,33 @@
+INCLUDE(CheckCXXSourceCompiles)
+
+# To ensure libatomic get link.
+
+function(check_cxx_atomics varname)
+  set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
+  set(CMAKE_REQUIRED_FLAGS "-std=c++11 ${CMAKE_REQUIRED_FLAGS}")
+  check_cxx_source_compiles("
+#include <atomic>
+#include <cstdint>
+std::atomic<uint64_t> x (0);
+int main() {
+  uint64_t i = x.load(std::memory_order_relaxed);
+  return 0;
+}
+" ${varname})
+  set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
+endfunction(check_cxx_atomics)
+
+check_cxx_atomics(HAVE_LLDB_ATOMICS_WITHOUT_LIB)
+# If not, check if the library exists, and atomics work with it.
+if(NOT HAVE_LLDB_ATOMICS_WITHOUT_LIB)
+  check_library_exists(atomic __atomic_load_8 "" HAVE_LLDB_LIBATOMIC)
+  if(HAVE_LLDB_LIBATOMIC)
+    list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
+    check_cxx_atomics(HAVE_LLDB_ATOMICS_WITH_LIB)
+    if (NOT HAVE_LLDB_ATOMICS_WITH_LIB)
+      message(FATAL_ERROR "Host compiler must support std::atomic!")
+    endif()
+  else()
+    message(FATAL_ERROR "Host compiler appears to require libatomic, but cannot find it.")
+  endif()
+endif()