Sync BaseTool trunk (version r2670) into EDKII BaseTools.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Gao, Liming <liming.gao@intel.com>
Reviewed-by: Liu, Yingke D (yingke.d.liu@intel.com)


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15605 6f19259b-4bc3-4df7-8a09-765794883524

BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py

@@ -53,7 +53,9 @@ def parsePcdInfoFromMapFile(mapfilepath, efifilepath):
         return None
     
     if len(lines) == 0: return None
-    if lines[0].strip().find("Archive member included because of file (symbol)") != -1:
+    firstline = lines[0].strip()
+    if (firstline.startswith("Archive member included ") and
+        firstline.endswith(" file (symbol)")):
         return _parseForGCC(lines, efifilepath)
     return _parseGeneral(lines, efifilepath)