diff --git a/arch/arm/src/armv6-m/CMakeLists.txt b/arch/arm/src/armv6-m/CMakeLists.txt index ccbebc9b490..194788120d9 100644 --- a/arch/arm/src/armv6-m/CMakeLists.txt +++ b/arch/arm/src/armv6-m/CMakeLists.txt @@ -32,8 +32,11 @@ set(SRCS arm_svcall.c arm_systemreset.c arm_tcbinfo.c - arm_trigger_irq.c - arm_vectors.c) + arm_trigger_irq.c) + +if(NOT CONFIG_ARCH_HAVE_CUSTOM_VECTORS) + list(APPEND SRCS arm_vectors.c) +endif() if((DEFINED CONFIG_DEBUG_FEATURES AND CONFIG_DEBUG_FEATURES) OR (DEFINED CONFIG_ARM_COREDUMP_REGION AND CONFIG_ARM_COREDUMP_REGION)) diff --git a/arch/arm/src/armv7-m/CMakeLists.txt b/arch/arm/src/armv7-m/CMakeLists.txt index c8d415ea927..3490f5c581a 100644 --- a/arch/arm/src/armv7-m/CMakeLists.txt +++ b/arch/arm/src/armv7-m/CMakeLists.txt @@ -26,7 +26,6 @@ set(SRCS arm_exception.S arm_saveusercontext.S arm_busfault.c - arm_dbgmonitor.c arm_cache.c arm_cpuinfo.c arm_doirq.c @@ -42,9 +41,12 @@ set(SRCS arm_tcbinfo.c arm_trigger_irq.c arm_usagefault.c - arm_vectors.c arm_dbgmonitor.c) +if(NOT CONFIG_ARCH_HAVE_CUSTOM_VECTORS) + list(APPEND SRCS arm_vectors.c) +endif() + if(CONFIG_ARMV7M_SYSTICK) list(APPEND SRCS arm_systick.c) endif() diff --git a/arch/arm/src/armv8-m/CMakeLists.txt b/arch/arm/src/armv8-m/CMakeLists.txt index bd7dff82c6e..52542a7fda0 100644 --- a/arch/arm/src/armv8-m/CMakeLists.txt +++ b/arch/arm/src/armv8-m/CMakeLists.txt @@ -42,8 +42,11 @@ set(SRCS arm_systemreset.c arm_tcbinfo.c arm_trigger_irq.c - arm_usagefault.c - arm_vectors.c) + arm_usagefault.c) + +if(NOT CONFIG_ARCH_HAVE_CUSTOM_VECTORS) + list(APPEND SRCS arm_vectors.c) +endif() if(CONFIG_ARMV8M_SYSTICK) list(APPEND SRCS arm_systick.c)