Re: [PATCH V2] IntelFsp2Pkg: Fix build error with WHOLEARCHIVE option

["Song, BinX" <binx.song@intel.com>]

Hi Jiewen,

Yes, I will update.

Best Regards,
Bell Song


> -----Original Message-----
> From: Yao, Jiewen
> Sent: Monday, August 21, 2017 4:26 PM
> To: Song, BinX <binx.song@intel.com>
> Cc: edk2-devel@lists.01.org
> Subject: RE: [PATCH V2] IntelFsp2Pkg: Fix build error with WHOLEARCHIVE
> option
> 
> Hi
> Can we add "JMP $" before ret for the empty function?
> 
> It is to prevent the empty function is linked by mistake.
> 
> Thank you
> Yao Jiewen
> 
> > -----Original Message-----
> > From: Song, BinX
> > Sent: Monday, August 21, 2017 2:35 PM
> > To: Yao, Jiewen <jiewen.yao@intel.com>
> > Cc: edk2-devel@lists.01.org
> > Subject: [PATCH V2] IntelFsp2Pkg: Fix build error with WHOLEARCHIVE option
> >
> > V2:
> > - Recover TempRamInitApi API and add dummy TempRamInitApi function to
> fix
> >   build error with WHOLEARCHIVE option
> >
> > V1:
> > - Delete useless external TempRamInitApi API to fix /WHOLEARCHIVE build
> >   error with VS2015 tool chain
> >
> > Cc: Jiewen Yao <jiewen.yao@intel.com>
> > Contributed-under: TianoCore Contribution Agreement 1.0
> > Signed-off-by: Bell Song <binx.song@intel.com>
> > ---
> >  IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm | 10 ++++++++++
> >  IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryS.nasm | 10 ++++++++++
> >  2 files changed, 20 insertions(+)
> >
> > diff --git a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
> > b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
> > index 9744e16..81b531e 100644
> > --- a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
> > +++ b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
> > @@ -195,6 +195,16 @@ ASM_PFX(AsmGetPeiCoreOffset):
> >     ret
> >
> >  ;----------------------------------------------------------------------------
> > +; TempRamInit API
> > +;
> > +; Dummy function for VS2015 WHOLEARCHIVE build option
> > +;
> > +;----------------------------------------------------------------------------
> > +global ASM_PFX(TempRamInitApi)
> > +ASM_PFX(TempRamInitApi):
> > +  ret
> > +
> > +;----------------------------------------------------------------------------
> >  ; Module Entrypoint API
> >  ;----------------------------------------------------------------------------
> >  global ASM_PFX(_ModuleEntryPoint)
> > diff --git a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryS.nasm
> > b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryS.nasm
> > index cdc1149..06a791f 100644
> > --- a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryS.nasm
> > +++ b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryS.nasm
> > @@ -54,6 +54,16 @@ ASM_PFX(FspApiCommonContinue):
> >    ret
> >
> >  ;----------------------------------------------------------------------------
> > +; TempRamInit API
> > +;
> > +; Dummy function for VS2015 WHOLEARCHIVE build option
> > +;
> > +;----------------------------------------------------------------------------
> > +global ASM_PFX(TempRamInitApi)
> > +ASM_PFX(TempRamInitApi):
> > +  ret
> > +
> > +;----------------------------------------------------------------------------
> >  ; Module Entrypoint API
> >  ;----------------------------------------------------------------------------
> >  global ASM_PFX(_ModuleEntryPoint)
> > --
> > 2.10.2.windows.1