From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by mx.groups.io with SMTP id smtpd.web10.71865.1680532184978517470 for ; Mon, 03 Apr 2023 07:29:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JqvABcEq; spf=pass (domain: kernel.org, ip: 139.178.84.217, mailfrom: ardb@kernel.org) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8690861DE8; Mon, 3 Apr 2023 14:29:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 146BDC433A0; Mon, 3 Apr 2023 14:29:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680532183; bh=n/kC2BNgL0UGAqYn2iDySpypgPdf8pZ9G1724jqAZgQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JqvABcEqkc88tfiDj8JaZj96GciY9JwC4DSpb8XPVOVNNYmumubdXvXxTR/gMdWgH DMQsrGKZoqneBlXZrQUTRyjJeXgAQTsRVx2yOcW3KHxvZj0JMukx4E2w/HLB9J+Mj6 IAzK/L7OJKJ74BEZiEBSlVsyamohL1AIsH6xnJL+nDKzPyvJAczIQYgV5puP/VYCPO w+mn8PZ56Mr2cRsYSlSokHlHACJBTeG6JnnpM16hWP63a9yZhvIzkz1OSh7jWbpiSm dVbFnKkZEaF7JtomnHJzGMJLIdwj0LhDJjhWMdWB+LewH9uCdzg+eHP8G/xb9orfRb qkZiimwbvS6Sg== From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: Ard Biesheuvel , "Ni, Ray" , Andrew Fish , "Kinney, Michael D" , "Liu, Zhiguang" , Rebecca Cran , Tom Lendacky , =?UTF-8?q?Marvin=20H=C3=A4user?= Subject: [PATCH v4 6/6] UefiCpuPkg/CpuExceptionHandlerLib: Drop special XCODE5 version Date: Mon, 3 Apr 2023 16:29:20 +0200 Message-Id: <20230403142920.1921619-7-ardb@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230403142920.1921619-1-ardb@kernel.org> References: <20230403142920.1921619-1-ardb@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable This library is no longer used or needed, so let's remove it. Signed-off-by: Ard Biesheuvel Reviewed-by: Ray Ni --- UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerL= ib.inf | 67 -------------------- UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerL= ib.uni | 18 ------ UefiCpuPkg/UefiCpuPkg.dsc = | 7 -- 3 files changed, 92 deletions(-) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExcep= tionHandlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPei= CpuExceptionHandlerLib.inf deleted file mode 100644 index accc081a95f53453..0000000000000000 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHan= dlerLib.inf +++ /dev/null @@ -1,67 +0,0 @@ -## @file=0D -# CPU Exception Handler library instance for SEC/PEI modules.=0D -#=0D -# Copyright (C) 2020, Advanced Micro Devices, Inc. All rights reserved.=0D -# Copyright (c) 2012 - 2022, Intel Corporation. All rights reserved.
= =0D -# SPDX-License-Identifier: BSD-2-Clause-Patent=0D -#=0D -# This is the XCODE5 variant of the SEC/PEI CpuExceptionHandlerLib. This= =0D -# variant performs binary patching to fix up addresses that allow the=0D -# XCODE5 toolchain to be used.=0D -#=0D -##=0D -=0D -[Defines]=0D - INF_VERSION =3D 0x00010005=0D - BASE_NAME =3D Xcode5SecPeiCpuExceptionHandlerLib=0D - MODULE_UNI_FILE =3D Xcode5SecPeiCpuExceptionHandlerLib.un= i=0D - FILE_GUID =3D 49C481AF-1621-42F3-8FA1-27C64143E304= =0D - MODULE_TYPE =3D PEIM=0D - VERSION_STRING =3D 1.1=0D - LIBRARY_CLASS =3D CpuExceptionHandlerLib|SEC PEI_CORE P= EIM=0D -=0D -#=0D -# The following information is for reference only and not required by the = build tools.=0D -#=0D -# VALID_ARCHITECTURES =3D IA32 X64=0D -#=0D -=0D -[Sources.Ia32]=0D - Ia32/ExceptionHandlerAsm.nasm=0D - Ia32/ExceptionTssEntryAsm.nasm=0D - Ia32/ArchExceptionHandler.c=0D - Ia32/ArchInterruptDefs.h=0D -=0D -[Sources.X64]=0D - X64/SecPeiExceptionHandlerAsm.nasm=0D - X64/ArchExceptionHandler.c=0D - X64/ArchInterruptDefs.h=0D -=0D -[Sources.common]=0D - CpuExceptionCommon.h=0D - CpuExceptionCommon.c=0D - SecPeiCpuException.c=0D -=0D -[Packages]=0D - MdePkg/MdePkg.dec=0D - MdeModulePkg/MdeModulePkg.dec=0D - UefiCpuPkg/UefiCpuPkg.dec=0D -=0D -[LibraryClasses]=0D - BaseLib=0D - SerialPortLib=0D - PrintLib=0D - LocalApicLib=0D - PeCoffGetEntryPointLib=0D - CcExitLib=0D -=0D -[Pcd]=0D - gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard=0D - gUefiCpuPkgTokenSpaceGuid.PcdCpuStackSwitchExceptionList=0D - gUefiCpuPkgTokenSpaceGuid.PcdCpuKnownGoodStackSize=0D -=0D -[FeaturePcd]=0D - gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackGuard ## CONS= UMES=0D -=0D -[BuildOptions]=0D - XCODE:*_*_X64_NASM_FLAGS =3D -D NO_ABSOLUTE_RELOCS_IN_TEXT=0D diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExcep= tionHandlerLib.uni b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPei= CpuExceptionHandlerLib.uni deleted file mode 100644 index a63b25f39d992775..0000000000000000 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHan= dlerLib.uni +++ /dev/null @@ -1,18 +0,0 @@ -// /** @file=0D -// XCODE5 CPU Exception Handler library instance for SEC/PEI modules.=0D -//=0D -// CPU Exception Handler library instance for SEC/PEI modules when built=0D -// using the XCODE5 toolchain.=0D -//=0D -// Copyright (C) 2020, Advanced Micro Devices, Inc. All rights reserved.=0D -// Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.
= =0D -//=0D -// SPDX-License-Identifier: BSD-2-Clause-Patent=0D -//=0D -// **/=0D -=0D -=0D -#string STR_MODULE_ABSTRACT #language en-US "CPU Exception Han= dler library instance for SEC/PEI modules with the XCODE5 toolchain."=0D -=0D -#string STR_MODULE_DESCRIPTION #language en-US "CPU Exception Han= dler library instance for SEC/PEI modules with the XCODE5 toolchain."=0D -=0D diff --git a/UefiCpuPkg/UefiCpuPkg.dsc b/UefiCpuPkg/UefiCpuPkg.dsc index a7318d3fe9db0ec4..d85d56916f2cdbce 100644 --- a/UefiCpuPkg/UefiCpuPkg.dsc +++ b/UefiCpuPkg/UefiCpuPkg.dsc @@ -69,11 +69,7 @@ [LibraryClasses] =0D [LibraryClasses.common.SEC]=0D PlatformSecLib|UefiCpuPkg/Library/PlatformSecLibNull/PlatformSecLibNull.= inf=0D -!if $(TOOL_CHAIN_TAG) =3D=3D "XCODE5"=0D - CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5S= ecPeiCpuExceptionHandlerLib.inf=0D -!else=0D CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiC= puExceptionHandlerLib.inf=0D -!endif=0D HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf=0D PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/= PeiServicesTablePointerLibIdt.inf=0D MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAlloc= ationLib.inf=0D @@ -145,12 +141,9 @@ [Components.IA32, Components.X64] UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf=0D UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.inf=0D UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf= =0D -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5"=0D UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.i= nf=0D -!endif=0D UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf= =0D UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf= =0D - UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandle= rLib.inf=0D UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf=0D UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf=0D UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.inf=0D --=20 2.39.2