Commit 568a8817 authored by Sandrine Bailleux's avatar Sandrine Bailleux Committed by TrustedFirmware Code Review
Browse files

Merge "linker_script: move .rela.dyn section to bl_common.ld.h" into integration

parents 1ba168cf e8ad6168
...@@ -105,17 +105,7 @@ SECTIONS ...@@ -105,17 +105,7 @@ SECTIONS
__DATA_RAM_START__ = __DATA_START__; __DATA_RAM_START__ = __DATA_START__;
__DATA_RAM_END__ = __DATA_END__; __DATA_RAM_END__ = __DATA_END__;
/* RELA_SECTION >RAM
* .rela.dyn needs to come after .data for the read-elf utility to parse
* this section correctly. Ensure 8-byte alignment so that the fields of
* RELA data structure are aligned.
*/
. = ALIGN(8);
__RELA_START__ = .;
.rela.dyn . : {
} >RAM
__RELA_END__ = .;
STACK_SECTION >RAM STACK_SECTION >RAM
BSS_SECTION >RAM BSS_SECTION >RAM
XLAT_TABLE_SECTION >RAM XLAT_TABLE_SECTION >RAM
......
...@@ -115,17 +115,7 @@ SECTIONS ...@@ -115,17 +115,7 @@ SECTIONS
__RW_START__ = . ; __RW_START__ = . ;
DATA_SECTION >RAM DATA_SECTION >RAM
RELA_SECTION >RAM
/*
* .rela.dyn needs to come after .data for the read-elf utility to parse
* this section correctly. Ensure 8-byte alignment so that the fields of
* RELA data structure are aligned.
*/
. = ALIGN(8);
__RELA_START__ = .;
.rela.dyn . : {
} >RAM
__RELA_END__ = .;
#ifdef BL31_PROGBITS_LIMIT #ifdef BL31_PROGBITS_LIMIT
ASSERT(. <= BL31_PROGBITS_LIMIT, "BL31 progbits has exceeded its limit.") ASSERT(. <= BL31_PROGBITS_LIMIT, "BL31 progbits has exceeded its limit.")
......
...@@ -71,17 +71,7 @@ SECTIONS ...@@ -71,17 +71,7 @@ SECTIONS
__RW_START__ = . ; __RW_START__ = . ;
DATA_SECTION >RAM DATA_SECTION >RAM
RELA_SECTION >RAM
/*
* .rela.dyn needs to come after .data for the read-elf utility to parse
* this section correctly. Ensure 8-byte alignment so that the fields of
* RELA data structure are aligned.
*/
. = ALIGN(8);
__RELA_START__ = .;
.rela.dyn . : {
} >RAM
__RELA_END__ = .;
#ifdef TSP_PROGBITS_LIMIT #ifdef TSP_PROGBITS_LIMIT
ASSERT(. <= TSP_PROGBITS_LIMIT, "TSP progbits has exceeded its limit.") ASSERT(. <= TSP_PROGBITS_LIMIT, "TSP progbits has exceeded its limit.")
......
...@@ -101,6 +101,17 @@ ...@@ -101,6 +101,17 @@
__DATA_END__ = .; \ __DATA_END__ = .; \
} }
/*
* .rela.dyn needs to come after .data for the read-elf utility to parse
* this section correctly.
*/
#define RELA_SECTION \
.rela.dyn : ALIGN(STRUCT_ALIGN) { \
__RELA_START__ = .; \
*(.rela*) \
__RELA_END__ = .; \
}
#if !(defined(IMAGE_BL31) && RECLAIM_INIT_CODE) #if !(defined(IMAGE_BL31) && RECLAIM_INIT_CODE)
#define STACK_SECTION \ #define STACK_SECTION \
stacks (NOLOAD) : { \ stacks (NOLOAD) : { \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment