FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

mpy_ld.py: Support complex RO sections by jonnor · Pull Request #12123 · micropython/micropython · GitHub

/ micropython Public

mpy_ld.py: Support complex RO sections - #12123

Merged
dpgeorge merged 1 commit into
micropython:masterfrom
jonnor:fix-complex-rodata
Sep 1, 2023
ConversationCommits (1)ChecksFiles changed
Merged

mpy_ld.py: Support complex RO sections#12123
dpgeorge merged 1 commit into
micropython:masterfrom
jonnor:fix-complex-rodata

Conversation

jonnor commented Jul 30, 2023

Copy link
Copy Markdown
Contributor

Sometimes the sections are named .rodata.str1.1 etc, instead of just .rodata. Fix thanks to @phlash in #8783

jonnor added a commit to emlearn/emlearn-micropython that referenced this pull request Jul 30, 2023
CI: Use fixed mpy_ld
bfdaa3d 
Fix submitted for upstream in micropython/micropython#12123
but until merged we need to use our fork

github-actions Bot commented Jul 30, 2023 •
edited
Loading

Copy link
Copy Markdown

Code size report:

   bare-arm:    +0 +0.000% 
minimal x86:    +0 +0.000% 
   unix x64:    +0 +0.000% standard
      stm32:    +0 +0.000% PYBV10
     mimxrt:    +0 +0.000% TEENSY40

codecov Bot commented Jul 30, 2023 •
edited
Loading

Copy link
Copy Markdown

Codecov Report

Merging #12123 (d58824a) into master (d1f288c) will decrease coverage by 0.01%.
The diff coverage is n/a.

❗ Current head d58824a differs from pull request most recent head 4837ec3. Consider uploading reports for the commit 4837ec3 to get more accurate results

@@            Coverage Diff             @@
##           master   #12123      +/-   ##
==========================================
- Coverage   98.38%   98.38%   -0.01%     
==========================================
  Files         158      157       -1     
  Lines       20919    20703     -216     
==========================================
- Hits        20582    20368     -214     
+ Misses        337      335       -2

see 9 files with indirect coverage changes

jonnor force-pushed the fix-complex-rodata branch 2 times, most recently from 40981ea to d58824a Compare July 30, 2023 18:10

jonnor commented Aug 3, 2023

Copy link
Copy Markdown
Contributor Author

Checks failing on code coverage, because 1 line is added, but no tests added.
However I cannot find any tests covering the mpy_ld tool at all?

dpgeorge added the tools Relates to tools/ directory in source, or other tooling label Aug 10, 2023
tools/mpy_ld.py: Support more complex rodata sections.
4837ec3 
Sections sometimes named .rodata.str1.1 etc, instead of just .rodata.
Avoid crashing in that case.  Instead treat it like any other RO section.

Fix thanks to @phlash.

Fixes issue micropython#8783.

Signed-off-by: Jon Nordby <jononor@gmail.com>
dpgeorge merged commit 4837ec3 into micropython:master Sep 1, 2023

dpgeorge commented Sep 1, 2023

Copy link
Copy Markdown
Member

Thanks for the contribution, this looks good.

I made a small code-style change to pass multiple strings to startswith().

jonnor commented Sep 1, 2023

Copy link
Copy Markdown
Contributor Author

Hi @dpgeorge - thank you for the review and merge!

jonnor deleted the fix-complex-rodata branch September 1, 2023 18:03
This file contains hidden or 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
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

tools Relates to tools/ directory in source, or other tooling

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

Back | FazBrowse Home | New Git URL