Skip to content
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

Jump to bottom

linker: __data_region_start equal to __data_start #38817

Merged
merged 3 commits into from
Sep 24, 2021
Merged

linker: __data_region_start equal to __data_start #38817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70c4322
linker: __data_region_start equal to __data_start
tejlmand Sep 23, 2021
574295b
cmake: linker generator: group symbol from section
tejlmand Sep 24, 2021
72783f0
cmake: linker: arm: utilize zephyr_linker_group(... SYMBOL SECTION)
tejlmand Sep 24, 2021
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
15 changes: 12 additions & 3 deletions cmake/extensions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3083,8 +3083,8 @@ function(zephyr_linker_dts_memory)
endfunction()

# Usage:
# zephyr_linker_group(NAME <name> [VMA <region|group>] [LMA <region|group>])
# zephyr_linker_group(NAME <name> GROUP <group>)
# zephyr_linker_group(NAME <name> [VMA <region|group>] [LMA <region|group>] [SYMBOL <SECTION>])
# zephyr_linker_group(NAME <name> GROUP <group> [SYMBOL <SECTION>])
#
# Zephyr linker group.
# This function specifies a group inside a memory region or another group.
Expand All @@ -3108,6 +3108,8 @@ endfunction()
# If a group is used then the VMA region of that group will be used.
# LMA <region|group> : Memory region or group to be used for this group.
# GROUP <group> : Place the new group inside the existing group <group>
# SYMBOL <SECTION> : Specify that start symbol of the region should be identical
# to the start address of the first section in the group.
#
# Note: VMA and LMA are mutual exclusive with GROUP
#
Expand Down Expand Up @@ -3153,7 +3155,8 @@ endfunction()
# | |
# +---------------------+
function(zephyr_linker_group)
set(single_args "NAME;GROUP;LMA;VMA")
set(single_args "NAME;GROUP;LMA;SYMBOL;VMA")
set(symbol_values SECTION)
cmake_parse_arguments(GROUP "" "${single_args}" "" ${ARGN})

if(GROUP_UNPARSED_ARGUMENTS)
Expand All @@ -3168,6 +3171,12 @@ function(zephyr_linker_group)
)
endif()

if(DEFINED GROUP_SYMBOL)
if(NOT ${GROUP_SYMBOL} IN_LIST symbol_values)
message(FATAL_ERROR "zephyr_linker_group(SYMBOL ...) given unknown value")
endif()
endif()

set(GROUP)
zephyr_linker_arg_val_list(GROUP "${single_args}")

Expand Down
18 changes: 17 additions & 1 deletion cmake/linker/ld/ld_script.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,19 @@ function(group_to_string)
set(${STRING_STRING} "${${STRING_STRING}}\n . = ${address};\n\n")
else()
get_property(name GLOBAL PROPERTY ${STRING_OBJECT}_NAME)
get_property(symbol GLOBAL PROPERTY ${STRING_OBJECT}_SYMBOL)
string(TOLOWER ${name} name)
set(${STRING_STRING} "${${STRING_STRING}}\n __${name}_start = .;\n")

get_objects(LIST sections OBJECT ${STRING_OBJECT} TYPE SECTION)
list(GET sections 0 section)
get_property(first_section_name GLOBAL PROPERTY ${section}_NAME)

if(DEFINED first_section_name AND "${symbol}" STREQUAL "SECTION")
set_property(GLOBAL APPEND PROPERTY ${section}_START_SYMBOLS __${name}_start)
else()
set(${STRING_STRING} "${${STRING_STRING}}\n __${name}_start = .;\n")
endif()

set(${STRING_STRING} "${${STRING_STRING}}\n __${name}_size = __${name}_end - __${name}_start;\n")
set(${STRING_STRING} "${${STRING_STRING}}\n __${name}_load_start = LOADADDR(${first_section_name});\n")
endif()
Expand Down Expand Up @@ -178,6 +184,7 @@ function(section_to_string)
get_property(noinit GLOBAL PROPERTY ${STRING_SECTION}_NOINIT)
get_property(nosymbols GLOBAL PROPERTY ${STRING_SECTION}_NOSYMBOLS)
get_property(parent GLOBAL PROPERTY ${STRING_SECTION}_PARENT)
get_property(start_syms GLOBAL PROPERTY ${STRING_SECTION}_START_SYMBOLS)

string(REGEX REPLACE "^[\.]" "" name_clean "${name}")
string(REPLACE "." "_" name_clean "${name_clean}")
Expand All @@ -204,6 +211,11 @@ function(section_to_string)
endif()

set(TEMP "${name} ${address}${type} :${secalign}\n{")

foreach(start_symbol ${start_syms})
set(TEMP "${TEMP}\n ${start_symbol} = .;")
endforeach()

if(NOT nosymbols)
set(TEMP "${TEMP}\n __${name_clean}_start = .;")
endif()
Expand Down Expand Up @@ -273,6 +285,10 @@ function(section_to_string)
set(TEMP "${TEMP}\n __${name_clean}_end = .;")
endif()

if(DEFINED extra_symbol_end)
set(TEMP "${TEMP}\n ${extra_symbol_end} = .;")
endif()

set(TEMP "${TEMP}\n}")

get_property(parent_type GLOBAL PROPERTY ${parent}_OBJ_TYPE)
Expand Down
3 changes: 2 additions & 1 deletion cmake/linker/linker_script_common.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,12 @@ function(get_parent)
endfunction()

function(create_group)
cmake_parse_arguments(OBJECT "" "GROUP;LMA;NAME;OBJECT;VMA" "" ${ARGN})
cmake_parse_arguments(OBJECT "" "GROUP;LMA;NAME;OBJECT;SYMBOL;VMA" "" ${ARGN})

set_property(GLOBAL PROPERTY GROUP_${OBJECT_NAME} TRUE)
set_property(GLOBAL PROPERTY GROUP_${OBJECT_NAME}_OBJ_TYPE GROUP)
set_property(GLOBAL PROPERTY GROUP_${OBJECT_NAME}_NAME ${OBJECT_NAME})
set_property(GLOBAL PROPERTY GROUP_${OBJECT_NAME}_SYMBOL ${OBJECT_SYMBOL})

if(DEFINED OBJECT_GROUP)
find_object(OBJECT parent NAME ${OBJECT_GROUP})
Expand Down
4 changes: 2 additions & 2 deletions cmake/linker_script/arm/linker.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ else()
endif()

zephyr_linker_group(NAME RAM_REGION VMA RAM LMA ROM_REGION)
zephyr_linker_group(NAME TEXT_REGION GROUP ROM_REGION)
zephyr_linker_group(NAME TEXT_REGION GROUP ROM_REGION SYMBOL SECTION)
zephyr_linker_group(NAME RODATA_REGION GROUP ROM_REGION)
zephyr_linker_group(NAME DATA_REGION GROUP RAM_REGION)
zephyr_linker_group(NAME DATA_REGION GROUP RAM_REGION SYMBOL SECTION)

# should go to a relocation.cmake - from include/linker/rel-sections.ld - start
zephyr_linker_section(NAME .rel.plt HIDDEN)
Expand Down
3 changes: 1 addition & 2 deletions include/arch/arc/v2/linker.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,10 @@ SECTIONS {

GROUP_START(DATA_REGION)

__data_region_start = .;

SECTION_DATA_PROLOGUE(_DATA_SECTION_NAME,,) {

/* when XIP, .text is in ROM, but vector table must be at start of .data */
__data_region_start = .;
__data_start = .;
*(".data")
*(".data.*")
Expand Down
3 changes: 1 addition & 2 deletions include/arch/arm/aarch32/cortex_a_r/scripts/linker.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,10 +278,9 @@ SECTIONS

#include <linker/common-noinit.ld>

__data_region_start = .;

SECTION_DATA_PROLOGUE(_DATA_SECTION_NAME,,)
{
__data_region_start = .;
__data_start = .;
*(.data)
*(".data.*")
Expand Down
3 changes: 1 addition & 2 deletions include/arch/arm/aarch32/cortex_m/scripts/linker.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,10 +294,9 @@ SECTIONS

GROUP_START(DATA_REGION)

__data_region_start = .;

SECTION_DATA_PROLOGUE(_DATA_SECTION_NAME,,)
{
__data_region_start = .;
__data_start = .;
*(.data)
*(".data.*")
Expand Down
3 changes: 1 addition & 2 deletions include/arch/arm64/scripts/linker.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,10 +248,9 @@ SECTIONS

#include <linker/common-noinit.ld>

__data_region_start = .;

SECTION_DATA_PROLOGUE(_DATA_SECTION_NAME,,)
{
__data_region_start = .;
__data_start = .;
*(.data)
*(".data.*")
Expand Down
3 changes: 1 addition & 2 deletions include/arch/riscv/common/linker.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,12 +229,11 @@ SECTIONS
#include <linker/common-noinit.ld>
#include <linker/cplusplus-ram.ld>

__data_region_start = .;

SECTION_DATA_PROLOGUE(_DATA_SECTION_NAME,,)
{
. = ALIGN(4);
/* _image_ram_start = .; */
__data_region_start = .;
__data_start = .;

*(.data)
Expand Down
2 changes: 1 addition & 1 deletion include/arch/sparc/linker.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ SECTIONS
__rom_region_end = .;

__data_region_load_start = .;
__data_region_start = .;


SECTION_PROLOGUE(.plt,,)
Expand All @@ -85,6 +84,7 @@ SECTIONS
{
. = ALIGN(8);
_image_ram_start = .;
__data_region_start = .;
__data_start = .;

*(.data)
Expand Down
3 changes: 1 addition & 2 deletions soc/riscv/openisa_rv32m1/linker.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,11 @@ SECTIONS

GROUP_START(RAM)

__data_region_start = .;

SECTION_DATA_PROLOGUE(_DATA_SECTION_NAME,,)
{
. = ALIGN(4);
_image_ram_start = .;
__data_region_start = .;
__data_start = .;

*(.data)
Expand Down