From 449c8d81f5b0c4d75c632b7849ddd9966cfd71cf Mon Sep 17 00:00:00 2001 From: Ledion Daja Date: Tue, 21 Jun 2022 12:22:13 +0200 Subject: Remove CMake workaround for Arm Clang Previous version of CMake did not allow CMAKE_SYSTEM_PROCESSOR to contain CPU features for Arm Clang toolchain. A workaround was added to manually strip the CPU features. Recent versions of CMake have removed this limitation and instead requires the toolchain to manually add -mcpu=, which means that the workaround can be removed. Change-Id: I3e8647c47df27a96cdd103614ecf2540f150ab36 --- rtos/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'rtos/CMakeLists.txt') diff --git a/rtos/CMakeLists.txt b/rtos/CMakeLists.txt index 753b307..6c91a83 100644 --- a/rtos/CMakeLists.txt +++ b/rtos/CMakeLists.txt @@ -24,12 +24,14 @@ endif() # Include ThreadX # Only enable cortex-m55 until cortex-m33 is sorted out upstream -if((CMAKE_SYSTEM_PROCESSOR STREQUAL "cortex-m55") AND +if((CMAKE_SYSTEM_PROCESSOR MATCHES "cortex-m55") AND (CORE_SOFTWARE_RTOS_LOWER STREQUAL "threadx" OR CORE_SOFTWARE_RTOS_LOWER STREQUAL "all")) #threadx build requires 2 defines: THREADX_ARCH (format: cortex_m4) and THREADX_TOOLCHAIN (ac5/ac6/gnu). #set them according to existing defines CMAKE_SYSTEM_PROCESSOR and CMAKE_CXX_COMPILER_ID: - string(REPLACE "-" "_" THREADX_ARCH ${CMAKE_SYSTEM_PROCESSOR}) + string(REGEX MATCH "^cortex-m([0-9]+[a-z]*)" THREADX_ARCH ${CMAKE_SYSTEM_PROCESSOR}) + string(REPLACE "-" "_" THREADX_ARCH ${THREADX_ARCH}) string(TOLOWER ${CMAKE_CXX_COMPILER_ID} THREADX_TOOLCHAIN) + #if armclang, change the format to "ac6". if(THREADX_TOOLCHAIN STREQUAL "armclang") set(THREADX_TOOLCHAIN "ac6") -- cgit v1.2.1