diff --git a/scripts/addr2line.py b/scripts/addr2line.py index 659edb56ae..aea7268a1b 100755 --- a/scripts/addr2line.py +++ b/scripts/addr2line.py @@ -54,7 +54,9 @@ class Addr2Line: dummy_pattern = re.compile( r"(.*0x0000000000000000: \?\? \?\?:0\n)" # addr2line pattern r"|" - r"(.*0x0: \?\? at .*\n)" # llvm-addr2line pattern + r"(.*0x0: \?\? at .*\n)" # llvm-addr2line patterns + r"|" + r"(\?\? at \?\?:0\n)" ) def __init__( @@ -131,7 +133,7 @@ def __call__(self, address: str): return " ".join([self._binary, address, '\n']) # We print a dummy 0x0 address after the address we are interested in # which we can look for in _read_address - inputline = address + '\n0x0\n' + inputline = address + '\n\n' self._parent.debug('Add2Line sending input to stdin:', inputline) self._input.write(inputline) self._input.flush()