armclang: Fix setting CMAKE_SYSTEM_PROCESSOR for mps2_an521

On mps2_an521 GCC_M_CPU gets set to cortex-m33+nodsp, however that is not a valid setting for CMAKE_SYSTEM_PROCESSOR. We need to strip the extra options (+<OPTION>) from GCC_M_CPU so that we get just cortex-m33. Signed-off-by: Kumar Gala <[email protected]>
ucb-bar · Apr 26, 2023 · 91919d3 · 91919d3
1 parent 8565c9c
commit 91919d3
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/cmake/compiler/armclang/target.cmake b/cmake/compiler/armclang/target.cmake
@@ -11,7 +11,10 @@ find_program(CMAKE_ASM_COMPILER ${CROSS_COMPILE}armclang PATHS ${TOOLCHAIN_HOME}
 #
 include(${ZEPHYR_BASE}/cmake/gcc-m-cpu.cmake)
 include(${ZEPHYR_BASE}/cmake/gcc-m-fpu.cmake)
-set(CMAKE_SYSTEM_PROCESSOR ${GCC_M_CPU})
+
+# Strip out any trailing +<FOO> from GCC_M_CPU for cases when GCC_M_CPU is
+# 'cortex-m33+nodsp' we need that to be 'cortex-m33' for CMAKE_SYSTEM_PROCESSOR
+string(REGEX REPLACE "\\+.*" "" CMAKE_SYSTEM_PROCESSOR ${GCC_M_CPU})
 
 list(APPEND TOOLCHAIN_C_FLAGS
   -fshort-enums