feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

esp32[s2,s3]: fix _flash_rodata_align value in the linker scripts

Browse Source 
Regression from 4702feeee. The TLS segment is located inside
.flash.rodata, so we need to get the alignment of that section, not
.flash.rodata_noload.
This commit is contained in:
Ivan Grokhotkov
2021-07-01 16:00:35 +02:00
parent 8080c8d343
commit 64057d302a
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp32/ld/esp32.project.ld.in
View File

@@ -344,14 +344,14 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
} >default_rodata_seg } >default_rodata_seg
_flash_rodata_align = ALIGNOF(.flash.rodata);
.flash.rodata_noload (NOLOAD) : .flash.rodata_noload (NOLOAD) :
{ {
. = ALIGN (4); . = ALIGN (4);
mapping[rodata_noload] mapping[rodata_noload]
} > default_rodata_seg } > default_rodata_seg
_flash_rodata_align = ALIGNOF(.flash.rodata_noload);
.flash.text : .flash.text :
{ {
_stext = .; _stext = .;

4
components/esp32s2/ld/esp32s2.project.ld.in
View File

@@ -339,14 +339,14 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
} >default_rodata_seg } >default_rodata_seg
_flash_rodata_align = ALIGNOF(.flash.rodata);
.flash.rodata_noload (NOLOAD) : .flash.rodata_noload (NOLOAD) :
{ {
. = ALIGN (4); . = ALIGN (4);
mapping[rodata_noload] mapping[rodata_noload]
} > default_rodata_seg } > default_rodata_seg
_flash_rodata_align = ALIGNOF(.flash.rodata_noload);
.flash.text : .flash.text :
{ {
_stext = .; _stext = .;

4
components/esp32s3/ld/esp32s3.project.ld.in
View File

@@ -401,14 +401,14 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
} > default_rodata_seg } > default_rodata_seg
_flash_rodata_align = ALIGNOF(.flash.rodata);
.flash.rodata_noload (NOLOAD) : .flash.rodata_noload (NOLOAD) :
{ {
. = ALIGN (4); . = ALIGN (4);
mapping[rodata_noload] mapping[rodata_noload]
} > default_rodata_seg } > default_rodata_seg
_flash_rodata_align = ALIGNOF(.flash.rodata_noload);
/* Marks the end of IRAM code segment */ /* Marks the end of IRAM code segment */
.iram0.text_end (NOLOAD) : .iram0.text_end (NOLOAD) :
{ {