diff --git a/cmake/oomph_common.cmake b/cmake/oomph_common.cmake
index cdf5d088..317b10b6 100644
--- a/cmake/oomph_common.cmake
+++ b/cmake/oomph_common.cmake
@@ -46,6 +46,9 @@ function(oomph_shared_lib_options target)
     oomph_target_compile_options(${target})
     oomph_target_link_options(${target})
     target_link_libraries(${target} PUBLIC HWMALLOC::hwmalloc)
+    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        target_link_libraries(${target} PUBLIC atomic)
+    endif()
 endfunction()
 
 # ---------------------------------------------------------------------
diff --git a/ext/hwmalloc b/ext/hwmalloc
index c0333304..25a5a3bf 160000
--- a/ext/hwmalloc
+++ b/ext/hwmalloc
@@ -1 +1 @@
-Subproject commit c03333044fcf2964c2c9f6f21405f901178ecad2
+Subproject commit 25a5a3bf6e67c71229b64196322e7c58280f1615