kopia lustrzana https://github.com/espressif/esp-idf
Merge branch 'contrib/github_pr_13039' into 'master'
Handle object files with `.*.o` patterns when running Linker Script Generator (GitHub PR) Closes IDFGH-11962 See merge request espressif/esp-idf!28695pull/13114/head
commit
b7184ccf73
|
@ -181,7 +181,8 @@ class EntityDB:
|
|||
|
||||
def _match_obj(self, archive, obj):
|
||||
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'))
|
||||
|
||||
|
|
|
@ -17,3 +17,10 @@ Sections:
|
|||
Idx Name Size VMA LMA File off Algn
|
||||
0 .literal.ěščřžýáíé 00000018 00000000 00000000 00000034 2**2
|
||||
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
|
||||
|
|
|
@ -236,6 +236,9 @@ class EntityDBTest(unittest.TestCase):
|
|||
sections = self.entities.get_sections('ěščřžýáíé.a', 'FreeRTOS-ěščřžýáíé')
|
||||
self.assertEqual(set(sections), set(['.literal.ěščřžýáíé']))
|
||||
|
||||
sections = self.entities.get_sections('ěščřžýáíé.a', 'o_suffix')
|
||||
self.assertEqual(set(sections), set(['.find_me']))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
|
Ładowanie…
Reference in New Issue