Merge branch 'bugfix/ldgen_unicode_path_v3.3' into 'release/v3.3'

tools/ldgen: Parse paths with Unicode characters in archives (v3.3)

See merge request espressif/esp-idf!10967
This commit is contained in:
Angus Gratton 2020-10-26 12:08:28 +08:00
commit c1b49c419d
2 changed files with 5 additions and 5 deletions

View File

@ -21,7 +21,7 @@ import fnmatch
from fragments import Sections, Scheme, Mapping, Fragment
from pyparsing import Suppress, White, ParseException, Literal, Group, ZeroOrMore
from pyparsing import Word, OneOrMore, nums, alphanums, alphas, Optional, LineEnd, printables
from pyparsing import Word, OneOrMore, nums, alphanums, alphas, Optional, restOfLine
from ldgen_common import LdGenFailure
@ -608,9 +608,9 @@ class SectionsInfo(dict):
first_line = sections_info_file.readline()
archive_path = (Literal("In archive").suppress() +
# trim the last character from archive_path, :
Word(printables + " ").setResultsName("archive_path").setParseAction(lambda t: t[0][:-1]) +
LineEnd())
White().suppress() +
# trim the last character (:) from archive_path
restOfLine.setResultsName("archive_path").setParseAction(lambda t: t[0][:-1]))
parser = archive_path
results = None

View File

@ -1,4 +1,4 @@
In archive libfreertos.a:
In archive /home/user/ãóç+ěščřžýáíé/build/esp-idf/freertos/libfreertos.a:
FreeRTOS-openocd.c.obj: file format elf32-xtensa-le