SF.net SVN: edk2-buildtools:[2659] trunk/BaseTools/Source/Python/ GenPatchPcdTable/GenPatchPcdTable.py

[<jlj...@us...>]

Revision: 2659
          http://sourceforge.net/p/edk2-buildtools/code/2659
Author:   jljusten
Date:     2014-03-14 18:24:36 +0000 (Fri, 14 Mar 2014)
Log Message:
-----------
BaseTools LMFA: Fix issue detecting map file with newer binutils

Previously the linker would produce this line as the first
line in the map file:
  "Archive member included because of file (symbol)"

With a newer linker, this is seen:
  "Archive member included to satisfy reference by file (symbol)"

This change appears to have happened in binutils commit
16e4ecc0dbe114cfc97fe2cd32a035ae4c37f22b
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=16e4ecc0

To account for both situation, look for a line that starts
with "Archive member included " and ends with " file (symbol)"

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jor...@in...>
Reviewed-by: Liming Gao <lim...@in...>

Modified Paths:
--------------
    trunk/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py

Modified: trunk/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py
===================================================================
--- trunk/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py	2014-03-14 05:21:43 UTC (rev 2658)
+++ trunk/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py	2014-03-14 18:24:36 UTC (rev 2659)
@@ -53,7 +53,9 @@
         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)
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.