commit 5f2200d06aa096fd707d87ff5bdf0d01c44009c7
author Ledion Daja <ledion.daja@arm.com> Wed Sep 21 16:36:57 2022 +0200
committer Kristofer Jonsson <kristofer.jonsson@arm.com> Fri Sep 30 10:44:57 2022 +0000
tree 896d4b1e30462200ca3995c06a16edfa68ae3aa0
parent ee3c61375665b796d334a6e05fc01887338693c7

Fix cmake CMAKE_SYSTEM_PROCESSOR string matches

To avoid unwanted matches of regexps, example: "cortex-m3" matches
string "cortex-m33", several string MATCHES have been reworked.

Change-Id: Ifa7982d82a8f02154f373b1c6f058aa98c6ad3e0

cmake/toolchain/arm-none-eabi-gcc.cmake

diff --git a/cmake/toolchain/arm-none-eabi-gcc.cmake b/cmake/toolchain/arm-none-eabi-gcc.cmake
index 182643f..093005e 100644
--- a/cmake/toolchain/arm-none-eabi-gcc.cmake
+++ b/cmake/toolchain/arm-none-eabi-gcc.cmake
@@ -58,16 +58,16 @@
     --specs=nosys.specs)
 
 # Set floating point unit
-if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "\\+fp")
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "\\+fp")
     set(FLOAT hard)
-elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "\\+nofp")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "\\+nofp")
     set(FLOAT soft)
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m33" OR
-       CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m55" OR
-       CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m85")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m33(\\+|$)" OR
+       CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m55(\\+|$)" OR
+       CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m85(\\+|$)")
     set(FLOAT hard)
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m4" OR
-       CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m7")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m4(\\+|$)" OR
+       CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m7(\\+|$)")
     set(FLOAT hard)
     set(FPU_CONFIG "fpv4-sp-d16")
     add_compile_options(-mfpu=${FPU_CONFIG})