Commit 4f8e0418 authored by agrieve's avatar agrieve Committed by Commit Bot

Revert "Supersize: Tweak variable name (no behavior change)"

This reverts commit dbd17728.

Reason for revert: Broke supersize

Original change's description:
> Supersize: Tweak variable name (no behavior change)
> 
> Addressing review comments from TBR'ed:
> dd5d5a01
> 
> Change-Id: Ic181c0da49f82031bf842ce69a05d14144dd92f8
> Reviewed-on: https://chromium-review.googlesource.com/1014293
> Reviewed-by: Samuel Huang <huangs@chromium.org>
> Commit-Queue: Samuel Huang <huangs@chromium.org>
> Commit-Queue: agrieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#551073}

TBR=huangs@chromium.org,agrieve@chromium.org

Change-Id: I52a434cad48f795075eaab834e9c039294e988d5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/1014976Reviewed-by: default avataragrieve <agrieve@chromium.org>
Commit-Queue: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551304}
parent 23d0d92f
...@@ -284,12 +284,12 @@ class MapFileParserLld(object): ...@@ -284,12 +284,12 @@ class MapFileParserLld(object):
# TODO(huangs): Add LTO support. # TODO(huangs): Add LTO support.
# Map file writer for LLD linker (for ELF): # Map file writer for LLD linker (for ELF):
# https://github.com/llvm-mirror/lld/blob/HEAD/ELF/MapFile.cpp # https://github.com/llvm-mirror/lld/blob/HEAD/ELF/MapFile.cpp
_LINE_RE_V0 = re.compile(r'([0-9a-f]+)\s+([0-9a-f]+)\s+(\d+) ( *)(.*)') _OLD_LINE_RE = re.compile(r'([0-9a-f]+)\s+([0-9a-f]+)\s+(\d+) ( *)(.*)')
_LINE_RE_V1 = re.compile( _NEW_LINE_RE = re.compile(
r'\s*[0-9a-f]+\s+([0-9a-f]+)\s+([0-9a-f]+)\s+(\d+) ( *)(.*)') r'\s*[0-9a-f]+\s+([0-9a-f]+)\s+([0-9a-f]+)\s+(\d+) ( *)(.*)')
def __init__(self, linker_name): def __init__(self, is_newer_format):
self._linker_name = linker_name self._is_newer_format = is_newer_format
self._common_symbols = [] self._common_symbols = []
self._section_sizes = {} self._section_sizes = {}
...@@ -328,10 +328,7 @@ class MapFileParserLld(object): ...@@ -328,10 +328,7 @@ class MapFileParserLld(object):
sym_maker = _SymbolMaker() sym_maker = _SymbolMaker()
cur_section = None cur_section = None
cur_section_is_useful = None cur_section_is_useful = None
if self._linker_name.endswith('v1'): pattern = self._NEW_LINE_RE if self._is_newer_format else self._OLD_LINE_RE
pattern = self._LINE_RE_v1
else:
pattern = self._LINE_RE_v0
for line in lines: for line in lines:
m = pattern.match(line) m = pattern.match(line)
...@@ -404,7 +401,7 @@ class MapFileParser(object): ...@@ -404,7 +401,7 @@ class MapFileParser(object):
""" """
linker_name = DetectLinkerNameFromMapFileHeader(next(lines)) linker_name = DetectLinkerNameFromMapFileHeader(next(lines))
if linker_name.startswith('lld'): if linker_name.startswith('lld'):
inner_parser = MapFileParserLld(linker_name) inner_parser = MapFileParserLld(linker_name.endswith('v1'))
elif linker_name == 'gold': elif linker_name == 'gold':
inner_parser = MapFileParserGold() inner_parser = MapFileParserGold()
else: 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