summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng, Bob C <bob.c.feng@intel.com>2019-08-13 09:56:37 +0800
committerFeng, Bob C <bob.c.feng@intel.com>2019-08-14 10:24:36 +0800
commit2b4c07bc22af6caec94645e1f7e2a23646dc1333 (patch)
tree4cd03e14168f7bd343c1f1a55a2cd79aec80fa7e
parenta000d5d1cac3a3df329e26877ad181a632b4e6ed (diff)
downloadedk2-2b4c07bc22af6caec94645e1f7e2a23646dc1333.tar.gz
edk2-2b4c07bc22af6caec94645e1f7e2a23646dc1333.tar.bz2
edk2-2b4c07bc22af6caec94645e1f7e2a23646dc1333.zip
BaseTools: Add "-" in a re to parse line in .map file
https://bugzilla.tianocore.org/show_bug.cgi?id=2058 If there are multiple module instances with different guid used in .dsc file, the temp path of the module will contain 8-4-4-4-12 format guid string. So "-" need to be added into the regular expression for parsing it correctly. Cc: Liming Gao <liming.gao@intel.com> Signed-off-by: Bob Feng <bob.c.feng@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com>
-rw-r--r--BaseTools/Source/Python/Common/Misc.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 26d149c270..554ec010dd 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -164,7 +164,7 @@ def _parseGeneral(lines, efifilepath, varnames):
status = 0 #0 - beginning of file; 1 - PE section definition; 2 - symbol table
secs = [] # key = section name
varoffset = []
- symRe = re.compile('^([\da-fA-F]+):([\da-fA-F]+) +([\.:\\\\\w\?@\$]+) +([\da-fA-F]+)', re.UNICODE)
+ symRe = re.compile('^([\da-fA-F]+):([\da-fA-F]+) +([\.:\\\\\w\?@\$-]+) +([\da-fA-F]+)', re.UNICODE)
for line in lines:
line = line.strip()