diff -ru server/configure.cmake server-changed/configure.cmake
--- server/configure.cmake	2020-10-11 07:10:24.891032655 +0100
+++ server-changed/configure.cmake	2020-10-11 08:34:43.000000000 +0100
@@ -854,7 +854,8 @@
 
 MARK_AS_ADVANCED(NO_ALARM)
 
-
+SET(SAVE_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
+SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} atomic)
 CHECK_CXX_SOURCE_COMPILES("
 int main()
 {
@@ -863,6 +864,7 @@
   return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
 }"
 HAVE_GCC_C11_ATOMICS)
+SET(CMAKE_REQUIRED_LIBRARIES ${SAVE_CMAKE_REQUIRED_LIBRARIES})
 
 IF(WITH_VALGRIND)
   SET(HAVE_valgrind 1)
diff -ru server/libmysqld/CMakeLists.txt server-changed/libmysqld/CMakeLists.txt
--- server/libmysqld/CMakeLists.txt	2020-10-11 07:10:25.071031371 +0100
+++ server-changed/libmysqld/CMakeLists.txt	2020-10-11 08:36:22.000000000 +0100
@@ -162,6 +162,7 @@
   ${LIBWRAP} ${LIBCRYPT} ${LIBDL}
   ${EMBEDDED_PLUGIN_LIBS}
   sql_embedded
+  atomic
 )
 
 # Some storage engine were compiled for embedded specifically
diff -ru server/sql/CMakeLists.txt server-changed/sql/CMakeLists.txt
--- server/sql/CMakeLists.txt	2020-10-11 07:11:22.500621752 +0100
+++ server-changed/sql/CMakeLists.txt	2020-10-11 08:37:24.000000000 +0100
@@ -196,7 +196,8 @@
   tpool
   ${LIBWRAP} ${LIBCRYPT} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT}
   ${SSL_LIBRARIES}
-  ${LIBSYSTEMD})
+  ${LIBSYSTEMD}
+  atomic)
 
 IF(TARGET pcre2)
   ADD_DEPENDENCIES(sql pcre2)
diff -ru server/storage/perfschema/unittest/CMakeLists.txt server-changed/storage/perfschema/unittest/CMakeLists.txt
--- server/storage/perfschema/unittest/CMakeLists.txt	2020-10-11 07:11:28.720577389 +0100
+++ server-changed/storage/perfschema/unittest/CMakeLists.txt	2020-10-11 08:38:26.000000000 +0100
@@ -37,4 +37,4 @@
 MY_ADD_TESTS(pfs_instr_class pfs_instr_class-oom pfs_instr pfs_instr-oom
              pfs_account-oom pfs_host-oom pfs_timer pfs_user-oom pfs_noop pfs
              pfs_misc
-  EXT "cc" LINK_LIBRARIES perfschema mysys pfs_server_stubs)
+  EXT "cc" LINK_LIBRARIES perfschema mysys pfs_server_stubs atomic)
diff -ru server/storage/rocksdb/build_rocksdb.cmake server-changed/storage/rocksdb/build_rocksdb.cmake
--- server/storage/rocksdb/build_rocksdb.cmake	2020-10-11 07:11:28.730577317 +0100
+++ server-changed/storage/rocksdb/build_rocksdb.cmake	2020-10-11 08:40:58.000000000 +0100
@@ -497,7 +497,7 @@
 list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc)
 
 ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES})
-target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
+target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS} atomic)
 IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -Wno-error")
 endif()
diff -ru server/unittest/mysys/CMakeLists.txt server-changed/unittest/mysys/CMakeLists.txt
--- server/unittest/mysys/CMakeLists.txt	2020-10-11 07:12:10.900276549 +0100
+++ server-changed/unittest/mysys/CMakeLists.txt	2020-10-11 08:42:21.000000000 +0100
@@ -15,7 +15,7 @@
 
 MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
              byte_order
-             queues stacktrace crc32 LINK_LIBRARIES mysys)
+             queues stacktrace crc32 LINK_LIBRARIES mysys atomic)
 MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
 MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
 ADD_DEFINITIONS(${SSL_DEFINES})