]> git.proxmox.com Git - mirror_edk2.git/commit
UefiCpuPkg: Merge StuffRsb.inc files into one in UefiCpuPkg/Include
authorHao Wu <hao.a.wu@intel.com>
Fri, 21 Dec 2018 05:45:55 +0000 (13:45 +0800)
committerHao Wu <hao.a.wu@intel.com>
Wed, 2 Jan 2019 01:45:29 +0000 (09:45 +0800)
commitada4a003f9e42c27ce6c6cdad74157b8ec4c13ec
treeb3e8a02b55891c7af45ffb7f8152ddb87ab8d11d
parente02ba81ac8583ed35901c7f57697a7aefa4f6d17
UefiCpuPkg: Merge StuffRsb.inc files into one in UefiCpuPkg/Include

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: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
13 files changed:
UefiCpuPkg/Include/StuffRsbNasm.inc [new file with mode: 0644]
UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.nasm
UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.nasm
UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/StuffRsb.inc [deleted file]
UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.nasm
UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiException.nasm
UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/StuffRsb.inc [deleted file]
UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm
UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.nasm
UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/StuffRsb.inc [deleted file]
UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm
UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.nasm
UefiCpuPkg/PiSmmCpuDxeSmm/X64/StuffRsb.inc [deleted file]