Skip to content

Commit ef46229

Browse files
committed
cmake: armlink: update CMake library to arch__arm__core__cortex_m
Fixes: zephyrproject-rtos#62589 Follow-up: zephyrproject-rtos#60031 The PR zephyrproject-rtos#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 <[email protected]>
1 parent 2779dd9 commit ef46229

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

cmake/linker/armlink/target.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ function(toolchain_ld_link_elf)
6565
)
6666

6767
foreach(lib ${ZEPHYR_LIBS_PROPERTY})
68-
if(NOT ${lib} STREQUAL arch__arm__core__aarch32__cortex_m)
68+
if(NOT ${lib} STREQUAL arch__arm__core__cortex_m)
6969
list(APPEND ZEPHYR_LIBS_OBJECTS $<TARGET_OBJECTS:${lib}>)
7070
list(APPEND ZEPHYR_LIBS_OBJECTS $<TARGET_PROPERTY:${lib},LINK_LIBRARIES>)
7171
endif()
@@ -76,7 +76,7 @@ function(toolchain_ld_link_elf)
7676
${TOOLCHAIN_LD_LINK_ELF_LIBRARIES_PRE_SCRIPT}
7777
--scatter=${TOOLCHAIN_LD_LINK_ELF_LINKER_SCRIPT}
7878
${TOOLCHAIN_LD_LINK_ELF_LIBRARIES_POST_SCRIPT}
79-
$<TARGET_OBJECTS:arch__arm__core__aarch32__cortex_m>
79+
$<TARGET_OBJECTS:arch__arm__core__cortex_m>
8080
--map --list=${TOOLCHAIN_LD_LINK_ELF_OUTPUT_MAP}
8181
${ZEPHYR_LIBS_OBJECTS}
8282
kernel

0 commit comments

Comments
 (0)