From f39f72b84838b974e8db3f5afff3d228a1c3bea4 Mon Sep 17 00:00:00 2001 From: Torsten Rasmussen Date: Wed, 13 Sep 2023 13:48:37 +0200 Subject: [PATCH] cmake: armlink: update CMake library to arch__arm__core__cortex_m Fixes: #62589 Follow-up: #60031 The PR #60031 moved CMake code to new folder location causing generated library names to change. This change impacted the use of those libraries in the Zephyr armlink CMake code, causing CMake failures at configure time. This PR fixes this failure by updating the armlink CMake code to use the new library names. Signed-off-by: Torsten Rasmussen --- cmake/linker/armlink/target.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/linker/armlink/target.cmake b/cmake/linker/armlink/target.cmake index 8f777c7800d412a..e8511aea244923b 100644 --- a/cmake/linker/armlink/target.cmake +++ b/cmake/linker/armlink/target.cmake @@ -65,7 +65,7 @@ function(toolchain_ld_link_elf) ) foreach(lib ${ZEPHYR_LIBS_PROPERTY}) - if(NOT ${lib} STREQUAL arch__arm__core__aarch32__cortex_m) + if(NOT ${lib} STREQUAL arch__arm__core__cortex_m) list(APPEND ZEPHYR_LIBS_OBJECTS $) list(APPEND ZEPHYR_LIBS_OBJECTS $) endif() @@ -76,7 +76,7 @@ function(toolchain_ld_link_elf) ${TOOLCHAIN_LD_LINK_ELF_LIBRARIES_PRE_SCRIPT} --scatter=${TOOLCHAIN_LD_LINK_ELF_LINKER_SCRIPT} ${TOOLCHAIN_LD_LINK_ELF_LIBRARIES_POST_SCRIPT} - $ + $ --map --list=${TOOLCHAIN_LD_LINK_ELF_OUTPUT_MAP} ${ZEPHYR_LIBS_OBJECTS} kernel