Enable libstdc++ #144
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,25 @@ | ||
| [submodule "crosstool-NG"] | ||
| path = crosstool-NG | ||
| url = https://github.com/jcmvbkbc/crosstool-NG | ||
| branch = xtensa-1.22.x | ||
| [submodule "lx106-hal"] | ||
| path = lx106-hal | ||
| url = https://github.com/tommie/lx106-hal | ||
| [submodule "esptool"] | ||
| path = esptool | ||
| url = https://github.com/themadinventor/esptool.git | ||
| [submodule "esp-open-lwip"] | ||
| path = esp-open-lwip | ||
| url = https://github.com/pfalcon/esp-open-lwip | ||
| branch = sdk-1.5.0 | ||
| [submodule "esp_newlib_port"] | ||
| path = esp_newlib_port | ||
|
There was a problem hiding this comment. This patch should probably be split into three, each doing one thing:
|
||
| url = https://github.com/Sermus/esp_newlib_port.git | ||
| branch = lx106 | ||
| [submodule "examples/esp8266_sgi_stl_tests"] | ||
| path = examples/esp8266_sgi_stl_tests | ||
| url = https://github.com/Sermus/esp8266_sgi_stl_tests.git | ||
| [submodule "esp_stdcpp_port"] | ||
| path = esp_stdcpp_port | ||
| url = https://github.com/Sermus/esp_stdcpp_port.git | ||
| branch = lx106 | ||
|
There was a problem hiding this comment. This should probably be folded into the patch adding esp_stdcpp_port |
||
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
ba654a
Submodule esp_stdcpp_port
added at
c03814
Submodule esptool
updated
from aafef9 to 2ea873
Submodule esp8266_sgi_stl_tests
added at
98101d
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,119 @@ | ||
| --- esp_iot_sdk_v1.5.2/ld/eagle.app.v6.irom.ld.orig 2016-03-28 16:48:11.422256241 +0300 | ||
| +++ esp_iot_sdk_v1.5.2/ld/eagle.app.v6.irom.ld 2016-03-29 07:47:48.860099060 +0300 | ||
| PHDRS | ||
| @@ -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) | ||
| + *(.literal.* .text.*) | ||
| + *libm.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-03-28 16:48:11.422256241 +0300 | ||
| +++ esp_iot_sdk_v1.5.2/ld/eagle.app.v6.new.2048.irom.ld 2016-03-29 07:47:48.860099060 +0300 | ||
| PHDRS | ||
| @@ -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) | ||
| + *(.literal.* .text.*) | ||
| + *libm.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" | ||
| + |
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.
I don't plan to switch to upstream repo. See espressif/esptool#89 (comment) why.
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.
Ok, i see the reason. Does this mean that your esptool fork stays where it is not pulling changes from the origin? What about quite useful ones like cooking OTA images?
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.
Of course no, I pull changes in (from time to time, especially after prodding), maintain my own changes on top from time to time, and hope to never need to revert anything (but still reserve a room for). I just pulled bunch of changes, would like to test them first before pulling the rest.
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.
Got it. Looking forward to other comments.
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.
The "--version=2" changes are needed. Without them there is no way to create a >512KB image (like the one sgi tests produce). Of course we could create a linker script which would create canonical 0x00000/0x40000 image of 1MB+ size but using OTA images and 1/2/4MB linker scripts already provided by Espressif seems to be a better solution, doesn't it?