(nuttx) branch releases/12.12 updated: arch/arm: Aligned Cmake with Make

[simbit18]

This is an automated email from the ASF dual-hosted git repository.

simbit18 pushed a commit to branch releases/12.12
in repository https://gitbox.apache.org/repos/asf/nuttx.git


The following commit(s) were added to refs/heads/releases/12.12 by this push:
     new 7c6cb4ffe18 arch/arm: Aligned Cmake with Make
7c6cb4ffe18 is described below

commit 7c6cb4ffe1894d363d3255f735a85ba5cf1e620f
Author: simbit18 <101105604+simbi...@users.noreply.github.com>
AuthorDate: Sun Dec 21 15:24:51 2025 +0100

    arch/arm: Aligned Cmake with Make
    
    - use chip specific vectors to allow smpcall update regs apache#14363
    
    Signed-off-by: simbit18 <simbi...@gmail.com>
---
 arch/arm/src/armv6-m/CMakeLists.txt | 7 +++++--
 arch/arm/src/armv7-m/CMakeLists.txt | 6 ++++--
 arch/arm/src/armv8-m/CMakeLists.txt | 7 +++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

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)