From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by mx.groups.io with SMTP id smtpd.web10.2605.1680024706146216405 for ; Tue, 28 Mar 2023 10:31:46 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm3 header.b=Rl3IPrZV; spf=pass (domain: bsdio.com, ip: 66.111.4.26, mailfrom: rebecca@bsdio.com) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 68AC75C0167; Tue, 28 Mar 2023 13:31:45 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Tue, 28 Mar 2023 13:31:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdio.com; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1680024705; x= 1680111105; bh=KlSS7zh1iTJ20VrknFyJLuMkc1d+Z3sxtywh9mLBNzA=; b=R l3IPrZVuOLMUxl6NMWg8vdcKSGNDc2TqwN9gNGx2pP7X3AP3ERi/YJGQds2WZcMu hTHZHvM5QHmwawF3Kc2dEtrbOnucxTWMb+iJGy6O+CirpcUkv+PeBQ7E3b5nGGih FkEDwH+DmK217F6pUOnvG+mAlN1MddQ0+rChW3nayC6GVDU4czb45Zp597e/vGuq X9Sh78Zwp5SK/FjJPoBHy1CYrqUGczb7cpGgPIyHpOtnTz8Z+alKsVwUcj6w1mjw jYp6f59iLgvkFK2/huI9Q6X0LbEBQSMx/C+vW1A3phQyFtmRAJT7tqH0BAe/G8WF QtnrjVWj1byePj9CGurAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1680024705; x= 1680111105; bh=KlSS7zh1iTJ20VrknFyJLuMkc1d+Z3sxtywh9mLBNzA=; b=r xn6NiFwsLyCvFLD3OZcTeLV+wsc4LvaN+AOp9HbxifGZsLHvxS3gcB5vShpil6aQ QvPMmYMniD3j/ESduVa8S17xm93jWVALLrCNGO4e1XMDZ16WVdZjKZcWLdOJQw+Y EhyzkOAihrg3j1WQLzjHkxxwrZQbVhxSbVhBcSwEVvuqVeaLf4E2jFCc0uUNu6cV 1XdJWtP4440mLOjEqpRqUCSmBCEChmHsg+BhMEbt/Ac68rd1eg+PWJopvIcm503p LBckQ2LUDyftYWgTK3lYXuPlmTjQqLOMK4E+FuzFrfjk4tBZpy7+RkpXejBjcKvw +b5v2Uny5+M3EjdeDd8ZQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdehgedguddufecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeftvggs vggttggrucevrhgrnhcuoehrvggsvggttggrsegsshguihhordgtohhmqeenucggtffrrg htthgvrhhnpeegffeuueelvdeggfdvvdfgtedvudfhfeekudekieektddukeefteetieef vdelfeenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpe hrvggsvggttggrsegsshguihhordgtohhm X-ME-Proxy: Feedback-ID: i5b994698:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 28 Mar 2023 13:31:43 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Oliver Smith-Denny , Guomin Jiang , Xiaoyu Lu , Jian J Wang , Jiewen Yao , Ard Biesheuvel , Jordan Justen , Gerd Hoffmann , Bob Feng , Liming Gao , Andrew Fish , Leif Lindholm , Michael D Kinney Cc: Rebecca Cran Subject: [PATCH v2 10/13] OvmfPkg: Use Xcode5 version of CpuExceptionHandlerLib for CLANGDWARF Date: Tue, 28 Mar 2023 11:31:08 -0600 Message-Id: <20230328173111.759017-11-rebecca@bsdio.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230328173111.759017-1-rebecca@bsdio.com> References: <20230328173111.759017-1-rebecca@bsdio.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The CLANGDWARF toolchain has the same problem as XCODE5 linking CpuExceptionHandlerLib. So, use the Xcode5SecPeiCpuExceptionHandlerLib.inf when building with the CLANGDWARF toolchain. Since the difference is that the non-Xcode5 version uses `mov` while the Xcode5 version uses `lea`, they can be merged in future with the single version using `lea`. Signed-off-by: Rebecca Cran --- OvmfPkg/OvmfPkgX64.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 00f7005fca40..c30f4f6db832 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -297,7 +297,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" +!if $(TOOL_CHAIN_TAG) == "XCODE5" || $(TOOL_CHAIN_TAG) == "CLANGDWARF" CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandlerLib.inf !else CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf -- 2.34.1