Commit dbd17728 authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Supersize: Tweak variable name (no behavior change)

Addressing review comments from TBR'ed:
dd5d5a01

Change-Id: Ic181c0da49f82031bf842ce69a05d14144dd92f8
Reviewed-on: https://chromium-review.googlesource.com/1014293Reviewed-by: default avatarSamuel Huang <huangs@chromium.org>
Commit-Queue: Samuel Huang <huangs@chromium.org>
Commit-Queue: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551073}
parent 2089a8e6
......@@ -284,12 +284,12 @@ class MapFileParserLld(object):
# TODO(huangs): Add LTO support.
# Map file writer for LLD linker (for ELF):
# https://github.com/llvm-mirror/lld/blob/HEAD/ELF/MapFile.cpp
_OLD_LINE_RE = re.compile(r'([0-9a-f]+)\s+([0-9a-f]+)\s+(\d+) ( *)(.*)')
_NEW_LINE_RE = re.compile(
_LINE_RE_V0 = re.compile(r'([0-9a-f]+)\s+([0-9a-f]+)\s+(\d+) ( *)(.*)')
_LINE_RE_V1 = re.compile(
r'\s*[0-9a-f]+\s+([0-9a-f]+)\s+([0-9a-f]+)\s+(\d+) ( *)(.*)')
def __init__(self, is_newer_format):
self._is_newer_format = is_newer_format
def __init__(self, linker_name):
self._linker_name = linker_name
self._common_symbols = []
self._section_sizes = {}
......@@ -328,7 +328,10 @@ class MapFileParserLld(object):
sym_maker = _SymbolMaker()
cur_section = None
cur_section_is_useful = None
pattern = self._NEW_LINE_RE if self._is_newer_format else self._OLD_LINE_RE
if self._linker_name.endswith('v1'):
pattern = self._LINE_RE_v1
else:
pattern = self._LINE_RE_v0
for line in lines:
m = pattern.match(line)
......@@ -401,7 +404,7 @@ class MapFileParser(object):
"""
linker_name = DetectLinkerNameFromMapFileHeader(next(lines))
if linker_name.startswith('lld'):
inner_parser = MapFileParserLld(linker_name.endswith('v1'))
inner_parser = MapFileParserLld(linker_name)
elif linker_name == 'gold':
inner_parser = MapFileParserGold()
else:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment