Jelajahi Sumber

Merge branch 'bugfix/tls_alignment' into 'master'

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

See merge request espressif/esp-idf!14220
Ivan Grokhotkov 4 tahun lalu
induk
melakukan
82a5f9c4b7

+ 2 - 2
components/esp32/ld/esp32.project.ld.in

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

+ 2 - 2
components/esp32s2/ld/esp32s2.project.ld.in

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

+ 2 - 2
components/esp32s3/ld/esp32s3.project.ld.in

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