diff --git a/libs/libc/machine/arm/Kconfig b/libs/libc/machine/arm/Kconfig
index f263aa80b7e..a56ac5707ec 100644
--- a/libs/libc/machine/arm/Kconfig
+++ b/libs/libc/machine/arm/Kconfig
@@ -3,26 +3,27 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
-if ARCH_ARM7TDMI || ARCH_ARM920T || ARCH_ARM926EJS
+if ARCH_ARM7TDMI || ARCH_ARM920T || ARCH_ARM926EJS || \
+   ARCH_ARM1136J || ARCH_ARM1156T2 || ARCH_ARM1176JZ
 source libs/libc/machine/arm/arm/Kconfig
 endif
 
-if ARCH_CORTEXA5 || ARCH_CORTEXA8 || ARCH_CORTEXA9
+if ARCH_ARMV7A
 source libs/libc/machine/arm/armv7-a/Kconfig
 endif
 
-if ARCH_CORTEXR4 || ARCH_CORTEXR5 || ARCH_CORTEXR7
+if ARCH_ARMV7R
 source libs/libc/machine/arm/armv7-r/Kconfig
 endif
 
-if ARCH_CORTEXM0
+if ARCH_ARMV6M
 source libs/libc/machine/arm/armv6-m/Kconfig
 endif
 
-if ARCH_CORTEXM3 || ARCH_CORTEXM4 || ARCH_CORTEXM7
+if ARCH_ARMV7M
 source libs/libc/machine/arm/armv7-m/Kconfig
 endif
 
-if ARCH_CORTEXM33
+if ARCH_ARMV8M
 source libs/libc/machine/arm/armv8/Kconfig
 endif
diff --git a/libs/libc/machine/arm/Make.defs b/libs/libc/machine/arm/Make.defs
index 0afb80c558b..89e008e887c 100644
--- a/libs/libc/machine/arm/Make.defs
+++ b/libs/libc/machine/arm/Make.defs
@@ -37,17 +37,23 @@ ifeq ($(CONFIG_ARCH_ARM7TDMI),y)        # ARM7TDMI is ARMv4T
 include $(TOPDIR)/libs/libc/machine/arm/arm/Make.defs
 else ifeq ($(CONFIG_ARCH_ARM920T),y)    # ARM920T is ARMv4T
 include $(TOPDIR)/libs/libc/machine/arm/arm/Make.defs
-else ifeq ($(CONFIG_ARCH_ARM926EJS),y)  # ARM926EJS is ARMv5TE
+else ifeq ($(CONFIG_ARCH_ARM926EJS),y)  # ARM926EJS is ARMv5TEJ
+include $(TOPDIR)/libs/libc/machine/arm/arm/Make.defs
+else ifeq ($(CONFIG_ARCH_ARM1136J),y)   # ARM1136J is ARMv6
+include $(TOPDIR)/libs/libc/machine/arm/arm/Make.defs
+else ifeq ($(CONFIG_ARCH_ARM1156T2),y)  # ARM1156T2 is ARMv6T2
+include $(TOPDIR)/libs/libc/machine/arm/arm/Make.defs
+else ifeq ($(CONFIG_ARCH_ARM1176JZ),y)  # ARM1176JZ is ARMv6Z
 include $(TOPDIR)/libs/libc/machine/arm/arm/Make.defs
 else ifeq ($(CONFIG_ARCH_ARMV7A),y)     # All ARMv7-A
 include $(TOPDIR)/libs/libc/machine/arm/armv7-a/Make.defs
 else ifeq ($(CONFIG_ARCH_ARMV7R),y)     # All ARMv7-R
 include $(TOPDIR)/libs/libc/machine/arm/armv7-r/Make.defs
-else ifeq ($(CONFIG_ARCH_CORTEXM0),y)   # Cortex-M0 is ARMv6-M
+else ifeq ($(CONFIG_ARCH_ARMV6M),y)     # All ARMv6-M
 include $(TOPDIR)/libs/libc/machine/arm/armv6-m/Make.defs
 else ifeq ($(CONFIG_ARCH_ARMV7M),y)     # All ARMv7-M
 include $(TOPDIR)/libs/libc/machine/arm/armv7-m/Make.defs
-else ifeq ($(CONFIG_ARCH_CORTEXM33),y)  # Cortex-M33 is ARMv8-M
+else ifeq ($(CONFIG_ARCH_ARMV8M),y)     # All ARMv8-M
 include $(TOPDIR)/libs/libc/machine/arm/armv8/Make.defs
 endif
 
diff --git a/libs/libc/machine/arm/armv8/Kconfig b/libs/libc/machine/arm/armv8/Kconfig
index 002c44d1f9f..dab8132cf33 100644
--- a/libs/libc/machine/arm/armv8/Kconfig
+++ b/libs/libc/machine/arm/armv8/Kconfig
@@ -3,7 +3,7 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
-if ARCH_CORTEXM33
+if ARCH_ARMV8M
 
 config ARMV8_LIBM
 	bool "Architecture specific optimizations"