Skip to content

Place IRAM and FLASH data in separate segments#1829

Merged
slaff merged 1 commit into
SmingHub:developfrom
mikee47:fix/section-conflicts
Sep 5, 2019
Merged

Place IRAM and FLASH data in separate segments#1829
slaff merged 1 commit into
SmingHub:developfrom
mikee47:fix/section-conflicts

Conversation

@mikee47

@mikee47 mikee47 commented Sep 5, 2019

Copy link
Copy Markdown
Contributor

Resolves section conflict issues when attempting to inline header methods, generally more of a problem with GCC 4.8.

Thanks to esp8266/Arduino#5116

… section conflicts

Thanks to esp8266/Arduino#5116

Commonly occurs when attempting to inline header methods, generally more of a problem with GCC 4.8.
@slaff slaff added this to the 4.0.0 milestone Sep 5, 2019
@slaff

slaff commented Sep 5, 2019

Copy link
Copy Markdown
Contributor

Did you test this change?

@mikee47

mikee47 commented Sep 5, 2019

Copy link
Copy Markdown
Contributor Author

Yes, been running on real hardware without issue. Also benefits IRAM/flash usage as linker can discard unused bits.

(Note my initial PR failed because I pulled out the original commit for this, which I'd subsequently updated.)

@slaff slaff removed the 3 - Review label Sep 5, 2019
@slaff
slaff merged commit 730e839 into SmingHub:develop Sep 5, 2019
@mikee47
mikee47 deleted the fix/section-conflicts branch September 5, 2019 13:15
mikee47 added a commit to mikee47/Sming that referenced this pull request Oct 20, 2019
slaff pushed a commit that referenced this pull request Oct 21, 2019
* Fix section conflict for flash strings (see #1829)

* Add optional `len` parameter to Flashstring::isEqual(const char*)

* esp-open-lwip fussy about include paths and conflicts with definitions in SDK, so #undef them first to be sure.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants