diff --git a/arch/arm/src/cmake/Toolchain.cmake b/arch/arm/src/cmake/Toolchain.cmake
index 1c6deb6f1dc..34c61c58ac7 100644
--- a/arch/arm/src/cmake/Toolchain.cmake
+++ b/arch/arm/src/cmake/Toolchain.cmake
@@ -61,6 +61,8 @@ if(CONFIG_ARCH_TOOLCHAIN_CLANG)
   # https://github.com/apache/incubator-nuttx/pull/5971
 
   add_compile_options(-fno-builtin)
+  add_compile_options(-Wno-atomic-alignment)
+  add_compile_options(-Wno-atomic-alignment)
 else()
   set(TOOLCHAIN_PREFIX arm-none-eabi)
   set(CMAKE_LIBRARY_ARCHITECTURE ${TOOLCHAIN_PREFIX})
diff --git a/arch/arm/src/common/Toolchain.defs b/arch/arm/src/common/Toolchain.defs
index d77c286b4b3..10950fba790 100644
--- a/arch/arm/src/common/Toolchain.defs
+++ b/arch/arm/src/common/Toolchain.defs
@@ -324,6 +324,8 @@ endif
 
 ifeq ($(CONFIG_ARCH_TOOLCHAIN_CLANG),y)
   ARCHOPTIMIZATION += -fshort-enums
+  ARCHCFLAGS += -Wno-atomic-alignment
+  ARCHCXXFLAGS += -Wno-atomic-alignment
 endif
 
 # Architecture flags