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

esp_system: Fix esp32c2/esp32c3/esp32h2 TLS size

Browse Source 
The change fixes thread-local-storage size by removing .srodata section
from it. It initially was included in TLS section by mistake.
The issue was found when stack size increased after building applications
with GCC-11.1 compiler. Stack size became bigger because some new data
appeared in .srodata. See more details here:
adce62f53d
This commit is contained in:
Alexey Lapshin
2022-06-17 13:54:09 +04:00
parent c9140caf8c
commit 09289fe451
11 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/bootloader/subproject/main/ld/esp32/bootloader.ld
View File

@@ -111,8 +111,6 @@ SECTIONS
*(.sdata) *(.sdata)
*(.sdata.*) *(.sdata.*)
*(.gnu.linkonce.s.*) *(.gnu.linkonce.s.*)
*(.sdata2)
*(.sdata2.*)
*(.gnu.linkonce.s2.*) *(.gnu.linkonce.s2.*)
*(.jcr) *(.jcr)
_data_end = ABSOLUTE(.); _data_end = ABSOLUTE(.);
@@ -125,6 +123,7 @@ SECTIONS
*(.rodata.*) *(.rodata.*)
*(.gnu.linkonce.r.*) *(.gnu.linkonce.r.*)
*(.rodata1) *(.rodata1)
*(.sdata2 .sdata2.*)
__XT_EXCEPTION_TABLE_ = ABSOLUTE(.); __XT_EXCEPTION_TABLE_ = ABSOLUTE(.);
*(.xt_except_table) *(.xt_except_table)
*(.gcc_except_table) *(.gcc_except_table)

3
components/bootloader/subproject/main/ld/esp32c3/bootloader.ld
View File

@@ -99,8 +99,6 @@ SECTIONS
*(.sdata) *(.sdata)
*(.sdata.*) *(.sdata.*)
*(.gnu.linkonce.s.*) *(.gnu.linkonce.s.*)
*(.sdata2)
*(.sdata2.*)
*(.gnu.linkonce.s2.*) *(.gnu.linkonce.s2.*)
*(.jcr) *(.jcr)
_data_end = ABSOLUTE(.); _data_end = ABSOLUTE(.);
@@ -113,6 +111,7 @@ SECTIONS
*(.rodata.*) *(.rodata.*)
*(.gnu.linkonce.r.*) *(.gnu.linkonce.r.*)
*(.rodata1) *(.rodata1)
*(.sdata2 .sdata2.* .srodata .srodata.*)
__XT_EXCEPTION_TABLE_ = ABSOLUTE(.); __XT_EXCEPTION_TABLE_ = ABSOLUTE(.);
*(.xt_except_table) *(.xt_except_table)
*(.gcc_except_table) *(.gcc_except_table)

3
components/bootloader/subproject/main/ld/esp32h2/bootloader.ld
View File

@@ -97,8 +97,6 @@ SECTIONS
*(.sdata) *(.sdata)
*(.sdata.*) *(.sdata.*)
*(.gnu.linkonce.s.*) *(.gnu.linkonce.s.*)
*(.sdata2)
*(.sdata2.*)
*(.gnu.linkonce.s2.*) *(.gnu.linkonce.s2.*)
*(.jcr) *(.jcr)
_data_end = ABSOLUTE(.); _data_end = ABSOLUTE(.);
@@ -111,6 +109,7 @@ SECTIONS
*(.rodata.*) *(.rodata.*)
*(.gnu.linkonce.r.*) *(.gnu.linkonce.r.*)
*(.rodata1) *(.rodata1)
*(.sdata2 .sdata2.* .srodata .srodata.*)
__XT_EXCEPTION_TABLE_ = ABSOLUTE(.); __XT_EXCEPTION_TABLE_ = ABSOLUTE(.);
*(.xt_except_table) *(.xt_except_table)
*(.gcc_except_table) *(.gcc_except_table)

3
components/bootloader/subproject/main/ld/esp32s2/bootloader.ld
View File

@@ -99,8 +99,6 @@ SECTIONS
*(.sdata) *(.sdata)
*(.sdata.*) *(.sdata.*)
*(.gnu.linkonce.s.*) *(.gnu.linkonce.s.*)
*(.sdata2)
*(.sdata2.*)
*(.gnu.linkonce.s2.*) *(.gnu.linkonce.s2.*)
*(.jcr) *(.jcr)
_data_end = ABSOLUTE(.); _data_end = ABSOLUTE(.);
@@ -113,6 +111,7 @@ SECTIONS
*(.rodata.*) *(.rodata.*)
*(.gnu.linkonce.r.*) *(.gnu.linkonce.r.*)
*(.rodata1) *(.rodata1)
*(.sdata2 .sdata2.*)
__XT_EXCEPTION_TABLE_ = ABSOLUTE(.); __XT_EXCEPTION_TABLE_ = ABSOLUTE(.);
*(.xt_except_table) *(.xt_except_table)
*(.gcc_except_table) *(.gcc_except_table)

3
components/bootloader/subproject/main/ld/esp32s3/bootloader.ld
View File

@@ -134,8 +134,6 @@ SECTIONS
*(.sdata) *(.sdata)
*(.sdata.*) *(.sdata.*)
*(.gnu.linkonce.s.*) *(.gnu.linkonce.s.*)
*(.sdata2)
*(.sdata2.*)
*(.gnu.linkonce.s2.*) *(.gnu.linkonce.s2.*)
*(.jcr) *(.jcr)
_data_end = ABSOLUTE(.); _data_end = ABSOLUTE(.);
@@ -148,6 +146,7 @@ SECTIONS
*(.rodata.*) *(.rodata.*)
*(.gnu.linkonce.r.*) *(.gnu.linkonce.r.*)
*(.rodata1) *(.rodata1)
*(.sdata2 .sdata2.*)
__XT_EXCEPTION_TABLE_ = ABSOLUTE(.); __XT_EXCEPTION_TABLE_ = ABSOLUTE(.);
*(.xt_except_table) *(.xt_except_table)
*(.gcc_except_table) *(.gcc_except_table)

2
components/esp_common/common.lf
View File

@@ -32,3 +32,5 @@ entries:
[sections:rodata] [sections:rodata]
entries: entries:
.rodata+ .rodata+
.sdata2+
.srodata+

2
components/esp_system/ld/esp32/sections.ld.in
View File

@@ -182,8 +182,6 @@ SECTIONS
*(.sdata) *(.sdata)
*(.sdata.*) *(.sdata.*)
*(.gnu.linkonce.s.*) *(.gnu.linkonce.s.*)
*(.sdata2)
*(.sdata2.*)
*(.gnu.linkonce.s2.*) *(.gnu.linkonce.s2.*)
*(.jcr) *(.jcr)

4
components/esp_system/ld/esp32c3/sections.ld.in
View File

@@ -154,8 +154,6 @@ SECTIONS
*(.sdata) *(.sdata)
*(.sdata.*) *(.sdata.*)
*(.gnu.linkonce.s.*) *(.gnu.linkonce.s.*)
*(.sdata2)
*(.sdata2.*)
*(.gnu.linkonce.s2.*) *(.gnu.linkonce.s2.*)
*(.jcr) *(.jcr)
@@ -333,8 +331,6 @@ SECTIONS
*(.tdata.*) *(.tdata.*)
*(.tbss) *(.tbss)
*(.tbss.*) *(.tbss.*)
*(.srodata)
*(.srodata.*)
_thread_local_end = ABSOLUTE(.); _thread_local_end = ABSOLUTE(.);
_rodata_reserved_end = ABSOLUTE(.); _rodata_reserved_end = ABSOLUTE(.);
. = ALIGN(ALIGNOF(.eh_frame)); . = ALIGN(ALIGNOF(.eh_frame));

4
components/esp_system/ld/esp32h2/sections.ld.in
View File

@@ -162,8 +162,6 @@ SECTIONS
*(.sdata) *(.sdata)
*(.sdata.*) *(.sdata.*)
*(.gnu.linkonce.s.*) *(.gnu.linkonce.s.*)
*(.sdata2)
*(.sdata2.*)
*(.gnu.linkonce.s2.*) *(.gnu.linkonce.s2.*)
*(.jcr) *(.jcr)
@@ -341,8 +339,6 @@ SECTIONS
*(.tdata.*) *(.tdata.*)
*(.tbss) *(.tbss)
*(.tbss.*) *(.tbss.*)
*(.srodata)
*(.srodata.*)
_thread_local_end = ABSOLUTE(.); _thread_local_end = ABSOLUTE(.);
_rodata_reserved_end = ABSOLUTE(.); _rodata_reserved_end = ABSOLUTE(.);
. = ALIGN(ALIGNOF(.eh_frame)); . = ALIGN(ALIGNOF(.eh_frame));

2
components/esp_system/ld/esp32s2/sections.ld.in
View File

@@ -204,8 +204,6 @@ SECTIONS
*(.sdata) *(.sdata)
*(.sdata.*) *(.sdata.*)
*(.gnu.linkonce.s.*) *(.gnu.linkonce.s.*)
*(.sdata2)
*(.sdata2.*)
*(.gnu.linkonce.s2.*) *(.gnu.linkonce.s2.*)
*(.jcr) *(.jcr)

2
components/esp_system/ld/esp32s3/sections.ld.in
View File

@@ -196,8 +196,6 @@ SECTIONS
*(.sdata) *(.sdata)
*(.sdata.*) *(.sdata.*)
*(.gnu.linkonce.s.*) *(.gnu.linkonce.s.*)
*(.sdata2)
*(.sdata2.*)
*(.gnu.linkonce.s2.*) *(.gnu.linkonce.s2.*)
*(.jcr) *(.jcr)