On 12/21/18 08:29, Hao Wu wrote: > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1091 > > Previously, when compiling NASM source files, BaseTools did not support > including files outside of the NASM source file directory. As a result, we > duplicated multiple copies of "StuffRsb.inc" files in UefiCpuPkg. Those > INC files contain the common logic to stuff the Return Stack Buffer and > are identical. > > After the fix of BZ 1085: > https://bugzilla.tianocore.org/show_bug.cgi?id=1085 > The above support was introduced. > > Thus, this commit will merge all the StuffRsb.inc files in UefiCpuPkg into > one file. The merged file will be named 'StuffRsbNasm.inc' and be placed > under folder UefiCpuPkg/Include/. > > Cc: Eric Dong <[email protected]> > Cc: Ruiyu Ni <[email protected]> > Cc: Laszlo Ersek <[email protected]> > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Hao Wu <[email protected]> > --- > UefiCpuPkg/{Library/SmmCpuFeaturesLib/Ia32/StuffRsb.inc => > Include/StuffRsbNasm.inc} | 3 +- > UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.nasm > | 2 +- > UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.nasm > | 2 +- > UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.nasm > | 2 +- > UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiException.nasm > | 2 +- > UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/StuffRsb.inc > | 55 -------------------- > UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm > | 2 +- > UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.nasm > | 2 +- > UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/StuffRsb.inc > | 55 -------------------- > UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm > | 2 +- > UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.nasm > | 2 +- > UefiCpuPkg/PiSmmCpuDxeSmm/X64/StuffRsb.inc > | 55 -------------------- > 12 files changed, 10 insertions(+), 174 deletions(-)
Reviewed-by: Laszlo Ersek <[email protected]> Thanks! Laszlo _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
