From nobody Sun Feb 8 12:38:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+102411+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+102411+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1680532186; cv=none; d=zohomail.com; s=zohoarc; b=ctYYguNt6YVTM8fPeVdhnD2l34WcfwRsRRAzziWXSMlNFs/uDSTP6BXMxUcnC6Cwbl13bXpOoSr2hILcd13y2ol/M+xlfVf/R2lH190BMHlgIwkCmFiTXDrPVUMtGScLYm1b52/Scm6i5bYaWoR4+1hyaXF7FcUmYJvKQGgSdCA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680532186; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=rAeX1uV9kUmxs9CN5t/zeI5vHqGzvKB9txKLc03+1gg=; b=nmo/jrRL4cXSauQAeVPXuWx3/sBASAWVSj/FMZ0NPLVSsQ7GRvDCZ5esnEcxDvZgSKDn9X4A7QYUXxJ3PBMV5ptT7FfFrS+AOJ+atsDrLI2JC3QzCbbei5GTPmMzSWa7qJ2KoMbOPwCj6HXDCIBbobQ9qhiJxLvtvt+rE0jirAo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+102411+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1680532186140343.0070676812236; Mon, 3 Apr 2023 07:29:46 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 3MX8YY1788612xnZn6vOqGwz; Mon, 03 Apr 2023 07:29:45 -0700 X-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 X-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) X-Received: by smtp.kernel.org (Postfix) with ESMTPSA id 146BDC433A0; Mon, 3 Apr 2023 14:29:41 +0000 (UTC) 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: [edk2-devel] [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> In-Reply-To: <20230403142920.1921619-1-ardb@kernel.org> References: <20230403142920.1921619-1-ardb@kernel.org> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ardb@kernel.org X-Gm-Message-State: nkPzvKIeazmwyyif3PLLJb0Lx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1680532185; bh=jOeJyumLdxdEmYRpujXF3Dd9vK5yPH9TLVmk1ZOsabM=; h=Cc:Date:From:Reply-To:Subject:To; b=suNVLNGLuDMWgTNNuMuHZ7GaEPvO8+ZDhrt0kkUIPpPip1k7i7zfgPok/7RHmDCjDcZ ZibgqOJ7ed6XIuw+t+4+1u86kGCQHl38wR2s/rGEmF4vtA5F/z7yVbIQiKo2Ka0EOxDZd vE/lj7f3GiGQFk5/BNWv2CAmcuHqOVcmiwE= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1680532186538100006 Content-Type: text/plain; charset="utf-8" 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 -# CPU Exception Handler library instance for SEC/PEI modules. -# -# Copyright (C) 2020, Advanced Micro Devices, Inc. All rights reserved. -# Copyright (c) 2012 - 2022, Intel Corporation. All rights reserved.
-# SPDX-License-Identifier: BSD-2-Clause-Patent -# -# This is the XCODE5 variant of the SEC/PEI CpuExceptionHandlerLib. This -# variant performs binary patching to fix up addresses that allow the -# XCODE5 toolchain to be used. -# -## - -[Defines] - INF_VERSION =3D 0x00010005 - BASE_NAME =3D Xcode5SecPeiCpuExceptionHandlerLib - MODULE_UNI_FILE =3D Xcode5SecPeiCpuExceptionHandlerLib.uni - FILE_GUID =3D 49C481AF-1621-42F3-8FA1-27C64143E304 - MODULE_TYPE =3D PEIM - VERSION_STRING =3D 1.1 - LIBRARY_CLASS =3D CpuExceptionHandlerLib|SEC PEI_CORE P= EIM - -# -# The following information is for reference only and not required by the = build tools. -# -# VALID_ARCHITECTURES =3D IA32 X64 -# - -[Sources.Ia32] - Ia32/ExceptionHandlerAsm.nasm - Ia32/ExceptionTssEntryAsm.nasm - Ia32/ArchExceptionHandler.c - Ia32/ArchInterruptDefs.h - -[Sources.X64] - X64/SecPeiExceptionHandlerAsm.nasm - X64/ArchExceptionHandler.c - X64/ArchInterruptDefs.h - -[Sources.common] - CpuExceptionCommon.h - CpuExceptionCommon.c - SecPeiCpuException.c - -[Packages] - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec - UefiCpuPkg/UefiCpuPkg.dec - -[LibraryClasses] - BaseLib - SerialPortLib - PrintLib - LocalApicLib - PeCoffGetEntryPointLib - CcExitLib - -[Pcd] - gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard - gUefiCpuPkgTokenSpaceGuid.PcdCpuStackSwitchExceptionList - gUefiCpuPkgTokenSpaceGuid.PcdCpuKnownGoodStackSize - -[FeaturePcd] - gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackGuard ## CONS= UMES - -[BuildOptions] - XCODE:*_*_X64_NASM_FLAGS =3D -D NO_ABSOLUTE_RELOCS_IN_TEXT 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 -// XCODE5 CPU Exception Handler library instance for SEC/PEI modules. -// -// CPU Exception Handler library instance for SEC/PEI modules when built -// using the XCODE5 toolchain. -// -// Copyright (C) 2020, Advanced Micro Devices, Inc. All rights reserved. -// Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.
-// -// SPDX-License-Identifier: BSD-2-Clause-Patent -// -// **/ - - -#string STR_MODULE_ABSTRACT #language en-US "CPU Exception Han= dler library instance for SEC/PEI modules with the XCODE5 toolchain." - -#string STR_MODULE_DESCRIPTION #language en-US "CPU Exception Han= dler library instance for SEC/PEI modules with the XCODE5 toolchain." - 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] =20 [LibraryClasses.common.SEC] PlatformSecLib|UefiCpuPkg/Library/PlatformSecLibNull/PlatformSecLibNull.= inf -!if $(TOOL_CHAIN_TAG) =3D=3D "XCODE5" - CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5S= ecPeiCpuExceptionHandlerLib.inf -!else CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiC= puExceptionHandlerLib.inf -!endif HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/= PeiServicesTablePointerLibIdt.inf MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAlloc= ationLib.inf @@ -145,12 +141,9 @@ [Components.IA32, Components.X64] UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.inf UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.i= nf -!endif UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf - UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandle= rLib.inf UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.inf --=20 2.39.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#102411): https://edk2.groups.io/g/devel/message/102411 Mute This Topic: https://groups.io/mt/98036446/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-