Enable libstdc++ v2 #146
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule crosstool-NG
updated
1032 files
Submodule esp_newlib_port
added at
f34f68
Submodule esp_stdcpp_port
added at
77e48e
Submodule esp8266_sgi_stl_tests
added at
f5464c
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| --- esp_iot_sdk_v1.5.2/ld/eagle.app.v6.irom.ld.orig 2016-04-01 09:11:42.171496836 +0300 | ||
| +++ esp_iot_sdk_v1.5.2/ld/eagle.app.v6.irom.ld 2016-04-07 09:52:31.502596929 +0300 | ||
| @@ -102,11 +102,14 @@ | ||
| *(.gnu.linkonce.e.*) | ||
| *(.gnu.version_r) | ||
| *(.eh_frame) | ||
| + . = (. + 3) & ~ 3; | ||
| /* C++ constructor and destructor tables, properly ordered: */ | ||
| + __init_array_start = ABSOLUTE(.); | ||
| KEEP (*crtbegin.o(.ctors)) | ||
| KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors)) | ||
| KEEP (*(SORT(.ctors.*))) | ||
| KEEP (*(.ctors)) | ||
| + __init_array_end = ABSOLUTE(.); | ||
| KEEP (*crtbegin.o(.dtors)) | ||
| KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors)) | ||
| KEEP (*(SORT(.dtors.*))) | ||
| @@ -151,6 +154,15 @@ | ||
| } >dram0_0_seg :dram0_0_bss_phdr | ||
| /* __stack = 0x3ffc8000; */ | ||
|
|
||
| + .irom0.text : ALIGN(4) | ||
| + { | ||
| + _irom0_text_start = ABSOLUTE(.); | ||
| + *(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom.text) | ||
| + *libm.a:(.literal .text .literal.* .text.*) | ||
| + *irom.a:(.literal .text .literal.* .text.*) | ||
| + _irom0_text_end = ABSOLUTE(.); | ||
| + } >irom0_0_seg :irom0_0_phdr | ||
| + | ||
| .text : ALIGN(4) | ||
| { | ||
| _stext = .; | ||
| @@ -182,7 +194,7 @@ | ||
| *(.entry.text) | ||
| *(.init.literal) | ||
| *(.init) | ||
| - *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*) | ||
| + *(.literal .text .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*) | ||
| *(.fini.literal) | ||
| *(.fini) | ||
| *(.gnu.version) | ||
| @@ -198,14 +210,8 @@ | ||
| *(.gnu.linkonce.lit4.*) | ||
| _lit4_end = ABSOLUTE(.); | ||
| } >iram1_0_seg :iram1_0_phdr | ||
| - | ||
| - .irom0.text : ALIGN(4) | ||
| - { | ||
| - _irom0_text_start = ABSOLUTE(.); | ||
| - *(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom.text) | ||
| - _irom0_text_end = ABSOLUTE(.); | ||
| - } >irom0_0_seg :irom0_0_phdr | ||
| } | ||
|
|
||
| /* get ROM code address */ | ||
| INCLUDE "../ld/eagle.rom.addr.v6.ld" | ||
| + | ||
| --- esp_iot_sdk_v1.5.2/ld/eagle.app.v6.new.2048.irom.ld.orig 2016-04-01 09:11:42.175496836 +0300 | ||
| +++ esp_iot_sdk_v1.5.2/ld/eagle.app.v6.new.2048.irom.ld 2016-04-07 09:53:01.086596929 +0300 | ||
| @@ -102,11 +102,14 @@ | ||
| *(.gnu.linkonce.e.*) | ||
| *(.gnu.version_r) | ||
| *(.eh_frame) | ||
| + . = (. + 3) & ~ 3; | ||
| /* C++ constructor and destructor tables, properly ordered: */ | ||
| + __init_array_start = ABSOLUTE(.); | ||
| KEEP (*crtbegin.o(.ctors)) | ||
| KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors)) | ||
| KEEP (*(SORT(.ctors.*))) | ||
| KEEP (*(.ctors)) | ||
| + __init_array_end = ABSOLUTE(.); | ||
| KEEP (*crtbegin.o(.dtors)) | ||
| KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors)) | ||
| KEEP (*(SORT(.dtors.*))) | ||
| @@ -151,6 +154,15 @@ | ||
| } >dram0_0_seg :dram0_0_bss_phdr | ||
| /* __stack = 0x3ffc8000; */ | ||
|
|
||
| + .irom0.text : ALIGN(4) | ||
| + { | ||
| + _irom0_text_start = ABSOLUTE(.); | ||
| + *(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom.text) | ||
| + *libm.a:(.literal .text .literal.* .text.*) | ||
|
There was a problem hiding this comment. What do you think about taking the There was a problem hiding this comment. Agreed. But i'd build libmirom the same way as other *irom libs are done now (see my previous comment). |
||
| + *irom.a:(.literal .text .literal.* .text.*) | ||
| + _irom0_text_end = ABSOLUTE(.); | ||
| + } >irom0_0_seg :irom0_0_phdr | ||
| + | ||
| .text : ALIGN(4) | ||
| { | ||
| _stext = .; | ||
| @@ -182,7 +194,7 @@ | ||
| *(.entry.text) | ||
| *(.init.literal) | ||
| *(.init) | ||
| - *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*) | ||
| + *(.literal .text .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*) | ||
|
There was a problem hiding this comment. Where did There was a problem hiding this comment. Thanks for pointing me to this. This is definitely my fault. There was a problem hiding this comment. Funny enough. I tested micropython with this. Since these sections are not in .text they end up in .lit. So actually their location in RAM is changed, but because they are still in RAM the linker script creates working binaries. |
||
| *(.fini.literal) | ||
| *(.fini) | ||
| *(.gnu.version) | ||
| @@ -198,14 +210,8 @@ | ||
| *(.gnu.linkonce.lit4.*) | ||
| _lit4_end = ABSOLUTE(.); | ||
| } >iram1_0_seg :iram1_0_phdr | ||
| - | ||
| - .irom0.text : ALIGN(4) | ||
| - { | ||
| - _irom0_text_start = ABSOLUTE(.); | ||
| - *(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom.text) | ||
| - _irom0_text_end = ABSOLUTE(.); | ||
| - } >irom0_0_seg :irom0_0_phdr | ||
| } | ||
|
|
||
| /* get ROM code address */ | ||
| INCLUDE "../ld/eagle.rom.addr.v6.ld" | ||
| + | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since it has pretty much been established that this
objcopydoesn't do anything useful, might it not be more efficient to just usecpinstead?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tend to agree, but there is one argument against this approach. I tried to keep backward compatibility meaning the patch mustn't break solutions which worked before. If we change libstdc++irom just to a copy we either keep inconsistency between the way how libcirom is built and the way how libstdc++irom is built or we may break those solutions which used libcirom assuming that the functions inside are packed into .irom0.text.
So i'd rather keep it the way it's done now to keep backward compatibility and unified way of building *irom libs.