feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'contrib/github_pr_13039' into 'master'

Browse Source 
Handle object files with `.*.o` patterns when running Linker Script Generator (GitHub PR)

Closes IDFGH-11962

See merge request espressif/esp-idf!28695
This commit is contained in:
Jakob Hasse
2024-01-26 09:39:22 +08:00
parent 3cc1d7e837 65373e126a
commit b7184ccf73
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/ldgen/ldgen/entity.py
View File

@@ -181,7 +181,8 @@ class EntityDB:
def _match_obj(self, archive, obj): def _match_obj(self, archive, obj):
objs = self.get_objects(archive) objs = self.get_objects(archive)
match_objs = (fnmatch.filter(objs, obj + '.o') match_objs = (fnmatch.filter(objs, obj + '.*.o')
+ fnmatch.filter(objs, obj + '.o')
+ fnmatch.filter(objs, obj + '.*.obj') + fnmatch.filter(objs, obj + '.*.obj')
+ fnmatch.filter(objs, obj + '.obj')) + fnmatch.filter(objs, obj + '.obj'))

7
tools/ldgen/test/data/test_entity/parse_test.txt
View File

@@ -17,3 +17,10 @@ Sections:
Idx Name Size VMA LMA File off Algn Idx Name Size VMA LMA File off Algn
0 .literal.ěščřžýáíé 00000018 00000000 00000000 00000034 2**2 0 .literal.ěščřžýáíé 00000018 00000000 00000000 00000034 2**2
CONTENTS, ALLOC, LOAD, RELOC, READONLY, CODE CONTENTS, ALLOC, LOAD, RELOC, READONLY, CODE
o_suffix.c.o: file format elf32-littleriscv
Sections:
Idx Name Size VMA LMA File off Algn
0 .find_me 00000000 00000000 00000000 00000034 2**0
CONTENTS, ALLOC, LOAD, READONLY, CODE

3
tools/ldgen/test/test_entity.py
View File

@@ -236,6 +236,9 @@ class EntityDBTest(unittest.TestCase):
sections = self.entities.get_sections('ěščřžýáíé.a', 'FreeRTOS-ěščřžýáíé') sections = self.entities.get_sections('ěščřžýáíé.a', 'FreeRTOS-ěščřžýáíé')
self.assertEqual(set(sections), set(['.literal.ěščřžýáíé'])) self.assertEqual(set(sections), set(['.literal.ěščřžýáíé']))
sections = self.entities.get_sections('ěščřžýáíé.a', 'o_suffix')
self.assertEqual(set(sections), set(['.find_me']))
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()