Re: [Patch] BaseTools: Set section alignment as zero if its type is Auto

["Yuwei Chen" <yuwei.chen@intel.com>]

Reviewed-by: Yuwei Chen<yuwei.chen@intel.com>

> -----Original Message-----
> From: Feng, Bob C <bob.c.feng@intel.com>
> Sent: Tuesday, September 22, 2020 7:28 PM
> To: devel@edk2.groups.io
> Cc: Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine
> <yuwei.chen@intel.com>
> Subject: [Patch] BaseTools: Set section alignment as zero if its type is Auto
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2881
> 
> Currently, the build tool try to read the section alignment from efi file if the
> section alignment type is Auto.
> If there is no efi generated, the section alignment will be set to zero. This
> behavior causes the Makefile to be different between the full build and the
> incremental build.
> 
> Since the Genffs can auto get the section alignment from efi file during
> Genffs procedure, the build tool can just set section alignment as zero. This
> change can make the autogen makefile consistent for the full build and the
> incremental build.
> 
> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> ---
>  BaseTools/Source/Python/GenFds/DataSection.py | 9 +--------
> BaseTools/Source/Python/GenFds/EfiSection.py  | 9 +--------
>  2 files changed, 2 insertions(+), 16 deletions(-)
> 
> diff --git a/BaseTools/Source/Python/GenFds/DataSection.py
> b/BaseTools/Source/Python/GenFds/DataSection.py
> index f20fd70225..5af3ee7b7f 100644
> --- a/BaseTools/Source/Python/GenFds/DataSection.py
> +++ b/BaseTools/Source/Python/GenFds/DataSection.py
> @@ -78,18 +78,11 @@ class DataSection (DataSectionClassObject):
>                      if not os.path.exists(CopyMapFile) or (os.path.getmtime(MapFile) >
> os.path.getmtime(CopyMapFile)):
>                          CopyLongFilePath(MapFile, CopyMapFile)
> 
>          #Get PE Section alignment when align is set to AUTO
>          if self.Alignment == 'Auto' and self.SecType in (BINARY_FILE_TYPE_TE,
> BINARY_FILE_TYPE_PE32):
> -            ImageObj = PeImageClass (Filename)
> -            if ImageObj.SectionAlignment < 0x400:
> -                self.Alignment = str (ImageObj.SectionAlignment)
> -            elif ImageObj.SectionAlignment < 0x100000:
> -                self.Alignment = str (ImageObj.SectionAlignment // 0x400) + 'K'
> -            else:
> -                self.Alignment = str (ImageObj.SectionAlignment // 0x100000) + 'M'
> -
> +            self.Alignment = "0"
>          NoStrip = True
>          if self.SecType in (BINARY_FILE_TYPE_TE, BINARY_FILE_TYPE_PE32):
>              if self.KeepReloc is not None:
>                  NoStrip = self.KeepReloc
> 
> diff --git a/BaseTools/Source/Python/GenFds/EfiSection.py
> b/BaseTools/Source/Python/GenFds/EfiSection.py
> index e7d4639041..fd58391dac 100644
> --- a/BaseTools/Source/Python/GenFds/EfiSection.py
> +++ b/BaseTools/Source/Python/GenFds/EfiSection.py
> @@ -258,18 +258,11 @@ class EfiSection (EfiSectionClassObject):
>                      OutputFile = os.path.join( OutputPath, ModuleName +
> SUP_MODULE_SEC + Num + SectionSuffix.get(SectionType))
>                      File = GenFdsGlobalVariable.MacroExtend(File, Dict)
> 
>                      #Get PE Section alignment when align is set to AUTO
>                      if self.Alignment == 'Auto' and (SectionType ==
> BINARY_FILE_TYPE_PE32 or SectionType == BINARY_FILE_TYPE_TE):
> -                        ImageObj = PeImageClass (File)
> -                        if ImageObj.SectionAlignment < 0x400:
> -                            Align = str (ImageObj.SectionAlignment)
> -                        elif ImageObj.SectionAlignment < 0x100000:
> -                            Align = str (ImageObj.SectionAlignment // 0x400) + 'K'
> -                        else:
> -                            Align = str (ImageObj.SectionAlignment // 0x100000) + 'M'
> -
> +                        Align = "0"
>                      if File[(len(File)-4):] == '.efi' and FfsInf.InfModule.BaseName ==
> os.path.basename(File)[:-4]:
>                          MapFile = File.replace('.efi', '.map')
>                          CopyMapFile = os.path.join(OutputPath, ModuleName + '.map')
>                          if IsMakefile:
>                              if GenFdsGlobalVariable.CopyList == []:
> --
> 2.20.1.windows.1