[PATCH] BaseTools:fix regression issue for platform .map file

[PATCH] BaseTools:fix regression issue for platform .map file

[Fan, ZhijuX]

[-- Attachment #1: Type: text/plain, Size: 2423 bytes --]

BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=2363

The line of IMAGE=*** is missing in platform .map file.For example,
in Ovmf.map, there is no line of (IMAGE= ) under each of modules item.
This is a regression issue.

this patch is going to fix this issue

Cc: Liming Gao <liming.gao@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
---
 BaseTools/Source/Python/build/build.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index bcd832c525..e24f040a93 100755
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -2216,6 +2216,7 @@ class Build():
                     Wa, self.BuildModules = self.PerformAutoGen(BuildTarget,ToolChain)
                 Pa = Wa.AutoGenObjectList[0]
                 GlobalData.gAutoGenPhase = False
+                self.LoadFixAddress = Wa.Platform.LoadFixAddress
 
                 if GlobalData.gBinCacheSource:
                     EdkLogger.quiet("Total cache hit driver num: %s, cache miss driver num: %s" % (len(set(self.HashSkipModules)), len(set(self.BuildModules))))
@@ -2267,6 +2268,10 @@ class Build():
                 self.CreateAsBuiltInf()
                 if GlobalData.gBinCacheDest:
                     self.UpdateBuildCache()
+                #
+                # Get Module List
+                #
+                ModuleList = {ma.Guid.upper(): ma for ma in self.BuildModules}
                 self.BuildModules = []
                 self.MakeTime += int(round((time.time() - MakeContiue)))
                 #
@@ -2285,10 +2290,6 @@ class Build():
                         #
                         if (Arch == 'IA32' or Arch == 'ARM') and self.LoadFixAddress != 0xFFFFFFFFFFFFFFFF and self.LoadFixAddress >= 0x100000000:
                             EdkLogger.error("build", PARAMETER_INVALID, "FIX_LOAD_TOP_MEMORY_ADDRESS can't be set to larger than or equal to 4G for the platorm with IA32 or ARM arch modules")
-                    #
-                    # Get Module List
-                    #
-                    ModuleList = {ma.Guid.upper():ma for ma in self.BuildModules}
 
                     #
                     # Rebase module to the preferred memory address before GenFds
-- 
2.14.1.windows.1


[-- Attachment #2: winmail.dat --]
[-- Type: application/ms-tnef, Size: 6002 bytes --]

Re: [PATCH] BaseTools:fix regression issue for platform .map file

[Liming Gao]

Does this fix only impact Platform.map generation? If so, I prefer to catch it into this stable tag. 

Thanks
Liming
> -----Original Message-----
> From: Fan, ZhijuX <zhijux.fan@intel.com>
> Sent: Wednesday, November 20, 2019 6:07 PM
> To: devel@edk2.groups.io
> Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@intel.com>
> Subject: [PATCH] BaseTools:fix regression issue for platform .map file
> 
> BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=2363
> 
> The line of IMAGE=*** is missing in platform .map file.For example,
> in Ovmf.map, there is no line of (IMAGE= ) under each of modules item.
> This is a regression issue.
> 
> this patch is going to fix this issue
> 
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Bob Feng <bob.c.feng@intel.com>
> Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
> ---
>  BaseTools/Source/Python/build/build.py | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
> index bcd832c525..e24f040a93 100755
> --- a/BaseTools/Source/Python/build/build.py
> +++ b/BaseTools/Source/Python/build/build.py
> @@ -2216,6 +2216,7 @@ class Build():
>                      Wa, self.BuildModules = self.PerformAutoGen(BuildTarget,ToolChain)
>                  Pa = Wa.AutoGenObjectList[0]
>                  GlobalData.gAutoGenPhase = False
> +                self.LoadFixAddress = Wa.Platform.LoadFixAddress
> 
>                  if GlobalData.gBinCacheSource:
>                      EdkLogger.quiet("Total cache hit driver num: %s, cache miss driver num: %s" % (len(set(self.HashSkipModules)),
> len(set(self.BuildModules))))
> @@ -2267,6 +2268,10 @@ class Build():
>                  self.CreateAsBuiltInf()
>                  if GlobalData.gBinCacheDest:
>                      self.UpdateBuildCache()
> +                #
> +                # Get Module List
> +                #
> +                ModuleList = {ma.Guid.upper(): ma for ma in self.BuildModules}
>                  self.BuildModules = []
>                  self.MakeTime += int(round((time.time() - MakeContiue)))
>                  #
> @@ -2285,10 +2290,6 @@ class Build():
>                          #
>                          if (Arch == 'IA32' or Arch == 'ARM') and self.LoadFixAddress != 0xFFFFFFFFFFFFFFFF and
> self.LoadFixAddress >= 0x100000000:
>                              EdkLogger.error("build", PARAMETER_INVALID, "FIX_LOAD_TOP_MEMORY_ADDRESS can't be set to
> larger than or equal to 4G for the platorm with IA32 or ARM arch modules")
> -                    #
> -                    # Get Module List
> -                    #
> -                    ModuleList = {ma.Guid.upper():ma for ma in self.BuildModules}
> 
>                      #
>                      # Rebase module to the preferred memory address before GenFds
> --
> 2.14.1.windows.1