From 71e862e79c5dc3089860546c962a298423a700f7 Mon Sep 17 00:00:00 2001 From: Evgeniy Paltsev Date: Fri, 6 Sep 2024 21:14:39 +0100 Subject: [PATCH] MWDT: linker: fix regresion Fixes commit 5badbfe2a2b11fda3df7026cd1f9da9de3f9bd9f ("cmake: move toolchain_ld_baremetal to linker properties.") which broke build for ARC MWDT toolchain. Fixes failure: ``` lldac: error: cannot open ,--orphan-handling=warn: No such file or directory ninja: build stopped: subcommand failed. ``` Signed-off-by: Eugeniy Paltsev Signed-off-by: Evgeniy Paltsev --- cmake/linker/arcmwdt/target.cmake | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cmake/linker/arcmwdt/target.cmake b/cmake/linker/arcmwdt/target.cmake index 997bc8afb0c..4eaf824b7c0 100644 --- a/cmake/linker/arcmwdt/target.cmake +++ b/cmake/linker/arcmwdt/target.cmake @@ -4,7 +4,7 @@ set_property(TARGET linker PROPERTY devices_start_symbol "_device_list_start") find_program(CMAKE_LINKER ${CROSS_COMPILE}lldac PATHS ${TOOLCHAIN_HOME} NO_DEFAULT_PATH) # the prefix to transfer linker options from compiler -set_ifndef(LINKERFLAGPREFIX -Wl,) +set_ifndef(LINKERFLAGPREFIX -Wl) # Run $LINKER_SCRIPT file through the C preprocessor, producing ${linker_script_gen} # NOTE: ${linker_script_gen} will be produced at build-time; not at configure-time @@ -63,7 +63,7 @@ endmacro() # Force symbols to be entered in the output file as undefined symbols function(toolchain_ld_force_undefined_symbols) foreach(symbol ${ARGN}) - zephyr_link_libraries(${LINKERFLAGPREFIX}-u${symbol}) + zephyr_link_libraries(${LINKERFLAGPREFIX},-u${symbol}) endforeach() endfunction() @@ -90,14 +90,14 @@ function(toolchain_ld_link_elf) target_link_libraries( ${TOOLCHAIN_LD_LINK_ELF_TARGET_ELF} ${TOOLCHAIN_LD_LINK_ELF_LIBRARIES_PRE_SCRIPT} - ${LINKERFLAGPREFIX}-T${TOOLCHAIN_LD_LINK_ELF_LINKER_SCRIPT} + ${LINKERFLAGPREFIX},-T${TOOLCHAIN_LD_LINK_ELF_LINKER_SCRIPT} ${TOOLCHAIN_LD_LINK_ELF_LIBRARIES_POST_SCRIPT} - ${LINKERFLAGPREFIX}--gc-sections - ${LINKERFLAGPREFIX}--entry=__start - ${LINKERFLAGPREFIX}--Map=${TOOLCHAIN_LD_LINK_ELF_OUTPUT_MAP} - ${LINKERFLAGPREFIX}--whole-archive + ${LINKERFLAGPREFIX},--gc-sections + ${LINKERFLAGPREFIX},--entry=__start + ${LINKERFLAGPREFIX},--Map=${TOOLCHAIN_LD_LINK_ELF_OUTPUT_MAP} + ${LINKERFLAGPREFIX},--whole-archive ${WHOLE_ARCHIVE_LIBS} - ${LINKERFLAGPREFIX}--no-whole-archive + ${LINKERFLAGPREFIX},--no-whole-archive ${NO_WHOLE_ARCHIVE_LIBS} $ ${LIB_INCLUDE_DIR}