Skip to content

cmake: extensions: use INTERFACE_SOURCES as property for code relocation #81249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nashif merged 1 commit into from
Nov 16, 2024
Merged

cmake: extensions: use INTERFACE_SOURCES as property for code relocation #81249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/linker/arcmwdt/target.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ macro(toolchain_ld_relocation)
${ZEPHYR_BASE}/scripts/build/gen_relocate_app.py
$<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
-d ${APPLICATION_BINARY_DIR}
-i \"$<TARGET_PROPERTY:code_data_relocation_target,COMPILE_DEFINITIONS>\"
-i \"$<TARGET_PROPERTY:code_data_relocation_target,INTERFACE_SOURCES>\"
-o ${MEM_RELOCATION_LD}
-s ${MEM_RELOCATION_SRAM_DATA_LD}
-b ${MEM_RELOCATION_SRAM_BSS_LD}
Expand Down
2 changes: 1 addition & 1 deletion cmake/linker/ld/target_relocation.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ macro(toolchain_ld_relocation)
OUTPUT
${DICT_FILE}
CONTENT
$<TARGET_PROPERTY:code_data_relocation_target,COMPILE_DEFINITIONS>
$<TARGET_PROPERTY:code_data_relocation_target,INTERFACE_SOURCES>
)

add_custom_command(
Expand Down
4 changes: 2 additions & 2 deletions cmake/modules/extensions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1526,9 +1526,9 @@ function(zephyr_code_relocate)
# each directive can embed multiple CMake lists, representing flags and files,
# the latter of which can come from generator expressions.
get_property(code_rel_str TARGET code_data_relocation_target
PROPERTY COMPILE_DEFINITIONS)
PROPERTY INTERFACE_SOURCES)
set_property(TARGET code_data_relocation_target
PROPERTY COMPILE_DEFINITIONS
PROPERTY INTERFACE_SOURCES
"${code_rel_str}|${CODE_REL_LOCATION}:${flag_list}:${file_list}")
endfunction()

Expand Down
Loading