espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 20:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/tls-size-esp32c2_esp32c3_esp32h2_v4.3' into 'release/v4.3'

Browse Source 
esp_system: Fix esp32c2/esp32c3/esp32h2 TLS size (v4.3)

See merge request espressif/esp-idf!18828
This commit is contained in:
Anton Maklakov
2022-07-11 18:44:45 +08:00
parent 1970d887a3 0f98788d59
commit e9514be5f8
12 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,8 +108,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(.);
@@ -122,6 +120,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

@@ -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

@@ -96,8 +96,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(.);
@@ -110,6 +108,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

@@ -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.*)
__XT_EXCEPTION_TABLE_ = ABSOLUTE(.); __XT_EXCEPTION_TABLE_ = ABSOLUTE(.);
*(.xt_except_table) *(.xt_except_table)
*(.gcc_except_table) *(.gcc_except_table)

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

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

1
components/esp32/ld/esp32_fragments.lf
View File

@@ -30,6 +30,7 @@ entries:
[sections:rodata] [sections:rodata]
entries: entries:
.rodata+ .rodata+
.sdata2+
[sections:rtc_text] [sections:rtc_text]
entries: entries:

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

@@ -170,8 +170,6 @@ SECTIONS
*(.sdata) *(.sdata)
*(.sdata.*) *(.sdata.*)
*(.gnu.linkonce.s.*) *(.gnu.linkonce.s.*)
*(.sdata2)
*(.sdata2.*)
*(.gnu.linkonce.s2.*) *(.gnu.linkonce.s2.*)
*(.jcr) *(.jcr)
@@ -370,8 +368,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(4); . = ALIGN(4);

2
components/esp32c3/ld/esp32c3_fragments.lf
View File

@@ -18,6 +18,8 @@ entries:
[sections:rodata] [sections:rodata]
entries: entries:
.rodata+ .rodata+
.sdata2+
.srodata+
[sections:rtc_text] [sections:rtc_text]
entries: entries:

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

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

1
components/esp32s2/ld/esp32s2_fragments.lf
View File

@@ -18,6 +18,7 @@ entries:
[sections:rodata] [sections:rodata]
entries: entries:
.rodata+ .rodata+
.sdata2+
[sections:rtc_text] [sections:rtc_text]
entries: entries:

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

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

1
components/esp32s3/ld/esp32s3_fragments.lf
View File

@@ -18,6 +18,7 @@ entries:
[sections:rodata] [sections:rodata]
entries: entries:
.rodata+ .rodata+
.sdata2+
[sections:rtc_text] [sections:rtc_text]
entries: entries: