Skip to content

Commit 94f4fdc

Browse files
theotherjimmyadbridge
authored andcommitted
Correct Gcc builtin module naming
1 parent a38aafe commit 94f4fdc

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

tools/memap.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def parse_mapfile(self, mapfile):
7777

7878
class _GccParser(_Parser):
7979
RE_OBJECT_FILE = re.compile(r'^(.+\/.+\.o)$')
80-
RE_LIBRARY_OBJECT = re.compile(r'^.+\/lib(.+\.a)\((.+\.o)\)$')
80+
RE_LIBRARY_OBJECT = re.compile(r'^.+' + os.sep + r'lib((.+\.a)\((.+\.o)\))$')
8181
RE_STD_SECTION = re.compile(r'^\s+.*0x(\w{8,16})\s+0x(\w+)\s(.+)$')
8282
RE_FILL_SECTION = re.compile(r'^\s*\*fill\*\s+0x(\w{8,16})\s+0x(\w+).*$')
8383

@@ -119,7 +119,7 @@ def parse_object_name(self, line):
119119

120120
# corner case: certain objects are provided by the GCC toolchain
121121
if 'arm-none-eabi' in line:
122-
return os.path.join('[lib]', 'misc', object_name)
122+
return os.path.join('[lib]', 'misc', os.path.basename(object_name))
123123
return object_name
124124

125125
else:

0 commit comments

Comments
 (0)