michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: Add sorting of linker snippets by key

Browse source 
Allows snippets to be placed in a predictable order into the linker
script. This is useful for data that must be placed at a particular
location.

Signed-off-by: Øyvind Rønningstad <oyvind.ronningstad@nordicsemi.no>
This commit is contained in:
Øyvind Rønningstad 2019-11-28 16:57:04 +01:00 • committed by Anas Nashif
commit 1a2ff6deda
1 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

30
cmake/extensions.cmake
View file

@ -863,7 +863,7 @@ function(zephyr_check_compiler_flag_hardcoded lang option check exists)
endif() endif()
endfunction(zephyr_check_compiler_flag_hardcoded) endfunction(zephyr_check_compiler_flag_hardcoded)
# zephyr_linker_sources(<location> <files>) # zephyr_linker_sources(<location> [SORT_KEY <sort_key>] <files>)
# #
# <files> is one or more .ld formatted files whose contents will be # <files> is one or more .ld formatted files whose contents will be
# copied/included verbatim into the given <location> in the global linker.ld. # copied/included verbatim into the given <location> in the global linker.ld.
@ -878,6 +878,9 @@ endfunction(zephyr_check_compiler_flag_hardcoded)
# RAM_SECTIONS Inside the RAMABLE_REGION GROUP. # RAM_SECTIONS Inside the RAMABLE_REGION GROUP.
# SECTIONS Near the end of the file. Don't use this when linking into # SECTIONS Near the end of the file. Don't use this when linking into
# RAMABLE_REGION, use RAM_SECTIONS instead. # RAMABLE_REGION, use RAM_SECTIONS instead.
# <sort_key> is an optional key to sort by inside of each location. The key must
# be alphanumeric, and the keys are sorted alphabetically. If no key is
# given, the key 'default' is used. Keys are case-sensitive.
# #
# Use NOINIT, RWDATA, and RODATA unless they don't work for your use case. # Use NOINIT, RWDATA, and RODATA unless they don't work for your use case.
# #
@ -945,7 +948,13 @@ function(zephyr_linker_sources location)
message(fatal_error "Must choose valid location for linker snippet.") message(fatal_error "Must choose valid location for linker snippet.")
endif() endif()
foreach(file IN ITEMS ${ARGN}) cmake_parse_arguments(L "" "SORT_KEY" "" ${ARGN})
set(SORT_KEY default)
if(DEFINED L_SORT_KEY)
set(SORT_KEY ${L_SORT_KEY})
endif()
foreach(file IN ITEMS ${L_UNPARSED_ARGUMENTS})
# Resolve path. # Resolve path.
if(IS_ABSOLUTE ${file}) if(IS_ABSOLUTE ${file})
set(path ${file}) set(path ${file})
@ -957,11 +966,18 @@ function(zephyr_linker_sources location)
message(FATAL_ERROR "zephyr_linker_sources() was called on a directory") message(FATAL_ERROR "zephyr_linker_sources() was called on a directory")
endif() endif()
# Append the file contents to the relevant destination file. # Find the relative path to the linker file from the include folder.
file(READ ${path} snippet) file(RELATIVE_PATH relpath ${ZEPHYR_BASE}/include ${path})
file(RELATIVE_PATH relpath ${ZEPHYR_BASE} ${path})
file(APPEND ${snippet_path} # Create strings to be written into the file
"\n/* From \${ZEPHYR_BASE}/${relpath}: */\n" "${snippet}\n") set (include_str "/* Sort key: \"${SORT_KEY}\" */#include \"${relpath}\"")
# Add new line to existing lines, sort them, and write them back.
file(STRINGS ${snippet_path} lines) # Get current lines (without newlines).
list(APPEND lines ${include_str})
list(SORT lines)
string(REPLACE ";" "\n;" lines "${lines}") # Add newline to each line.
file(WRITE ${snippet_path} ${lines} "\n")
endforeach() endforeach()
endfunction(zephyr_linker_sources) endfunction(zephyr_linker_sources)