Re: [edk2-devel] [RFT PATCH v2 5/6] OvmfPkg: Drop special Xcode5 version of exception handler library
Acked-by: Jiewen Yao > -Original Message- > From: devel@edk2.groups.io On Behalf Of Ard > Biesheuvel > Sent: Friday, March 31, 2023 5:21 AM > To: devel@edk2.groups.io > Cc: Ard Biesheuvel ; Ni; Ni, Ray ; > Andrew Fish ; Kinney, Michael D > ; Liu, Zhiguang ; > Rebecca Cran ; Tom Lendacky > > Subject: [edk2-devel] [RFT PATCH v2 5/6] OvmfPkg: Drop special Xcode5 > version of exception handler library > > The generic and XCODE5 versions of this library are now identical, so > drop the special case. The library will be removed entirely in a > subsequent patch. > > Signed-off-by: Ard Biesheuvel > --- > OvmfPkg/AmdSev/AmdSevX64.dsc | 4 > OvmfPkg/CloudHv/CloudHvX64.dsc | 4 > OvmfPkg/IntelTdx/IntelTdxX64.dsc | 4 > OvmfPkg/Microvm/MicrovmX64.dsc | 4 > OvmfPkg/OvmfPkgIa32.dsc | 4 > OvmfPkg/OvmfPkgIa32X64.dsc | 4 > OvmfPkg/OvmfPkgX64.dsc | 4 > OvmfPkg/OvmfXen.dsc | 4 > 8 files changed, 32 deletions(-) > > diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc > b/OvmfPkg/AmdSev/AmdSevX64.dsc > index c005e474dd826759..943c4eed9831a1c5 100644 > --- a/OvmfPkg/AmdSev/AmdSevX64.dsc > +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc > @@ -224,11 +224,7 @@ [LibraryClasses.common.SEC] >PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf > > > PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/P > eiServicesTablePointerLibIdt.inf > > > MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemory > AllocationLib.inf > > -!if $(TOOL_CHAIN_TAG) == "XCODE5" > > - > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcod > e5SecPeiCpuExceptionHandlerLib.inf > > -!else > > > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPe > iCpuExceptionHandlerLib.inf > > -!endif > >CcExitLib|OvmfPkg/Library/CcExitLib/SecCcExitLib.inf > > > MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncry > ptSevLib.inf > > > > diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc > b/OvmfPkg/CloudHv/CloudHvX64.dsc > index b9820cc14bee0693..cc2dd925bc940ea8 100644 > --- a/OvmfPkg/CloudHv/CloudHvX64.dsc > +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc > @@ -270,11 +270,7 @@ [LibraryClasses.common.SEC] >PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf > > > PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/P > eiServicesTablePointerLibIdt.inf > > > MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemory > AllocationLib.inf > > -!if $(TOOL_CHAIN_TAG) == "XCODE5" > > - > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcod > e5SecPeiCpuExceptionHandlerLib.inf > > -!else > > > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPe > iCpuExceptionHandlerLib.inf > > -!endif > >CcExitLib|OvmfPkg/Library/CcExitLib/SecCcExitLib.inf > > > MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncry > ptSevLib.inf > > > > diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc > b/OvmfPkg/IntelTdx/IntelTdxX64.dsc > index 5c56858d063b96bf..f734409055400859 100644 > --- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc > +++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc > @@ -238,11 +238,7 @@ [LibraryClasses.common.SEC] > > ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/Bas > eExtractGuidedSectionLib.inf > > > PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/P > eiServicesTablePointerLibIdt.inf > > > MemoryAllocationLib|EmbeddedPkg/Library/PrePiMemoryAllocationLib/Pre > PiMemoryAllocationLib.inf > > -!if $(TOOL_CHAIN_TAG) == "XCODE5" > > - > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcod > e5SecPeiCpuExceptionHandlerLib.inf > > -!else > > > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPe > iCpuExceptionHandlerLib.inf > > -!endif > >CcExitLib|OvmfPkg/Library/CcExitLib/SecCcExitLib.inf > > > MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncry > ptSevLib.inf > > > PrePiHobListPointerLib|OvmfPkg/IntelTdx/PrePiHobListPointerLibTdx/PrePiH > obListPointerLibTdx.inf > > diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc > b/OvmfPkg/Microvm/MicrovmX64.dsc > index 384b0b7afc74e90f..e9aab515592ffcec 100644 > --- a/OvmfPkg/Microvm/MicrovmX64.dsc > +++ b/OvmfPkg/Microvm/MicrovmX64.dsc > @@ -272,11 +272,7 @@ [LibraryClasses.common.SEC] >PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf > > > PeiServicesTablePoi
[edk2-devel] [RFT PATCH v2 5/6] OvmfPkg: Drop special Xcode5 version of exception handler library
The generic and XCODE5 versions of this library are now identical, so drop the special case. The library will be removed entirely in a subsequent patch. Signed-off-by: Ard Biesheuvel --- OvmfPkg/AmdSev/AmdSevX64.dsc | 4 OvmfPkg/CloudHv/CloudHvX64.dsc | 4 OvmfPkg/IntelTdx/IntelTdxX64.dsc | 4 OvmfPkg/Microvm/MicrovmX64.dsc | 4 OvmfPkg/OvmfPkgIa32.dsc | 4 OvmfPkg/OvmfPkgIa32X64.dsc | 4 OvmfPkg/OvmfPkgX64.dsc | 4 OvmfPkg/OvmfXen.dsc | 4 8 files changed, 32 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc index c005e474dd826759..943c4eed9831a1c5 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -224,11 +224,7 @@ [LibraryClasses.common.SEC] PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf -!if $(TOOL_CHAIN_TAG) == "XCODE5" - CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf -!else CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf -!endif CcExitLib|OvmfPkg/Library/CcExitLib/SecCcExitLib.inf MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc index b9820cc14bee0693..cc2dd925bc940ea8 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.dsc +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc @@ -270,11 +270,7 @@ [LibraryClasses.common.SEC] PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf -!if $(TOOL_CHAIN_TAG) == "XCODE5" - CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf -!else CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf -!endif CcExitLib|OvmfPkg/Library/CcExitLib/SecCcExitLib.inf MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX64.dsc index 5c56858d063b96bf..f734409055400859 100644 --- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc +++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc @@ -238,11 +238,7 @@ [LibraryClasses.common.SEC] ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf MemoryAllocationLib|EmbeddedPkg/Library/PrePiMemoryAllocationLib/PrePiMemoryAllocationLib.inf -!if $(TOOL_CHAIN_TAG) == "XCODE5" - CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf -!else CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf -!endif CcExitLib|OvmfPkg/Library/CcExitLib/SecCcExitLib.inf MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf PrePiHobListPointerLib|OvmfPkg/IntelTdx/PrePiHobListPointerLibTdx/PrePiHobListPointerLibTdx.inf diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc index 384b0b7afc74e90f..e9aab515592ffcec 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc @@ -272,11 +272,7 @@ [LibraryClasses.common.SEC] PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf -!if $(TOOL_CHAIN_TAG) == "XCODE5" - CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf -!else CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf -!endif CcExitLib|OvmfPkg/Library/CcExitLib/SecCcExitLib.inf MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index a6db902f54ece86f..86177bb948999435 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -275,11 +275,7 @@ [LibraryClasses.common.SEC] PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf -!if $(TOOL_CHAIN_TAG) == "XCODE5" - CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf -!else
