From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.40]) by mx.groups.io with SMTP id smtpd.web12.5362.1588856832136708903 for ; Thu, 07 May 2020 06:07:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=pK9mFV38; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.93.40, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kKDE+pI03MLTKXrZFTDtD573zuF+KBeXFfWp8dC4VIHl+gr8k0HPcvEyjboyv6u5J5HMVWhmdvz4YKHrqRFHtBCNrMQVA8iKNxTiNxuhTtNkDGY9M39HCFU155r4UQ13rneLIYYO72VRmt4MjX2/LW9ORbsChLtMFI6eFYbcv//b2NDYMXMJIdB8gkq4ReacWWA7VHO5ThyWF9SvHxSC+YOwGpYneTiWll/TcPJhBKyVO+rICRS4HAJ1dz20WNhzNdO8f5nACD3d1lxnQRtKYoqu/0APWZ9+uPDZ3XHhoQ1gORWbju2K2nUFYoOUPPWfFAE88hNOv9h3T0RxI1F3ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XmYJUGVsEBGMWuXWROwKuec836lYid4j3UYw26zFCrI=; b=ZyFXVCtG1pYIfx4gabfMVaVw+3VC4ficxHy0ohW1lif9DwH3q8a5HnNPE8+Wtb79h/93liSMmAh02jDCo8lV0VpNVJXuHUQaK4aAhvC39ba3eA+iURCkTQeaaf0xt4jGNx/XM1FUTO+jER5KwKFvyp6z5IE3GIfdbsjaZ2gzLidfpptNWZrhXU+XyyArBHmqJvHTj+Io2I3Y++xsfUEahU0dKRFCmZsARpIFKkA9modMwXYAV6DzbLPpah+xONwHb2sQ2i/azy1raozI0yuJj7IgJQj50b9Z4buY8miKCXf9M9uvLV+NKFyDmCbrk8Co2ShnDO2qznsOvzQS1qaWSw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XmYJUGVsEBGMWuXWROwKuec836lYid4j3UYw26zFCrI=; b=pK9mFV38Ma1b7nBA26tFuHb5czeNW0BF3ENZzfcZhGEjb6JyXPEV+gU9sPJ7H6aqhjqltyFeY4Mxs+vB+9bDAFmIQD8D9AQHAkAVSOP2bhgoSxokVYfChc+ramN5RCBPfv+yA+EJIe1tspoPgd9enrexFICzZNjeLtR3uQiLXnE= Authentication-Results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=amd.com; Received: from DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM5PR12MB1819.namprd12.prod.outlook.com (2603:10b6:3:113::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20; Thu, 7 May 2020 13:07:10 +0000 Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::4ce1:9947:9681:c8b1]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::4ce1:9947:9681:c8b1%10]) with mapi id 15.20.2958.034; Thu, 7 May 2020 13:07:10 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io Cc: Jordan Justen , Laszlo Ersek , Ard Biesheuvel , Liming Gao , Eric Dong , Ray Ni , Anthony Perard , Julien Grall , Brijesh Singh , Andrew Fish , Ard Biesheuvel Subject: [PATCH v3 2/3] OvmfPkg: Use toolchain appropriate CpuExceptionHandlerLib Date: Thu, 7 May 2020 08:06:49 -0500 Message-Id: <0cfdd51deb6d39e08380645f2022b9b76e29f66f.1588856809.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: SN1PR12CA0109.namprd12.prod.outlook.com (2603:10b6:802:21::44) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) Return-Path: thomas.lendacky@amd.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from tlendack-t1.amd.com (165.204.77.1) by SN1PR12CA0109.namprd12.prod.outlook.com (2603:10b6:802:21::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.28 via Frontend Transport; Thu, 7 May 2020 13:07:09 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [165.204.77.1] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 0f1c1b4c-7a84-4a51-8ccf-08d7f2878d68 X-MS-TrafficTypeDiagnostic: DM5PR12MB1819:|DM5PR12MB1819: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-Forefront-PRVS: 03965EFC76 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1d8T/tkQYx7ulHF8xaSkLMKScSOQjdf7PInMkMx6rWm91hKx+71WMP/F1HuaPdZsrxQSNrZ6L7M/+P5by+iKOxcqmJoG3I7AX5rQCY74CeIS4bT91q97z71lp2dDGtb21kEJYB6TMzBM/T4jljWVimU09RVc1bv/gQM99MlFx2ajGHDGCXkCn0nrTFklIKUIiWDeSRPen5BTkDtkRU5mm/lyldyr2Plm7zyMO8x+4T3xVO+KkpYFA0UFnvWS0JbA7rGm6/3mDHPSsnpLNTbVjF2tUQClPZXtJiKh8wiVVX/56tnRJnDEb0ufsSGyIXL+aRIEA4O2idnQS7EUWGH/h3Cz8mvO+MWEHy5f0O4oys3anI5RJL+j9PWehUsuTXbDqhNyW3DpwjYc9ODa3vTjhA5e0M+1pnCjVHXqK5UDr9idR9UNK1SaDymT8cn0/5Yrwu1kK+1kGnZPRJnaPV92o+xQV7Y4VjnNL6JNvInZDFjx6jV10+xZLfP4jE7mMC8gcUwdMG+Hsgn4jx6cevdBexFSWyTibuqr8kOSGi2JxYPbpcDTe9hs2DETuNWUB39vOG23dzqyA0xJI9Zs+e9Z17XutCImoc8cY9l/oj1G5Clkdsmtu9mjNdBBep30gDgJVofM+va9xKgtilyfw/CoFg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR12MB1355.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(366004)(136003)(39860400002)(396003)(376002)(346002)(33430700001)(33440700001)(86362001)(83320400001)(478600001)(4326008)(6666004)(66946007)(83300400001)(316002)(83310400001)(83280400001)(83290400001)(54906003)(36756003)(966005)(2616005)(956004)(7416002)(7696005)(26005)(6916009)(2906002)(5660300002)(52116002)(16526019)(6486002)(8936002)(8676002)(19627235002)(66556008)(66476007)(186003)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: Ajc3kjiKoEXjZsRjw3GgQB/wjOPkmSa7/ssXE/hlRIdtGtLUKNGezLTtuEX5dXGi4daPXRdzRj1N2y/1sb8176ug51qbm+XHSWYGc7hRKglX7Lnr8qhW+cyAZ98Nrv8JSyUukW1DiBkKMO0wD1WNdHgoF0fAygIQ3htWWjH0+/Xc/c43r/G5Uel/Y+gL4buLdV55tSKQ/bWNNKT1pjU2abpkU6vGrJ2DhSKNqrgB0GitpbYKRa0dDL2Bq0nvOzx7ifrYabQX1y0KEqizb6LKL1rIRv+/6dAjublc1SQ2kVexo2rz3dLHvw+2qe0sEr6EcMQHbBd9cLDCxFgMjVt7h6z0C3Ek3yBhmttvPXceh/N9llN6PXjm8it0h1p2PerzpTqwxB0WQUXM1d2bJTnTOfMRTGNOdqDsa04vRM8EuCq+mjClGfmTqY/CReS1lu1vB+MvHOe6Mj29+/Cf2fli5wA1EwSmUrRUwSrF5Yh6vPVKnTnUUWcZ5i3oSZzl4q3PhAZnkQSTG3O+gCofE7zxsQu4CfdZbx6DtEQFZ83+cs+Naij/TJpJwkeFOeVB6B6sKTadXHnuw+nD9LQl9fquAFjUkzVjXkWUuhkYN3fcy27BIjuxqMBJp01shGpbwVRl+xXU6RRKpKKAWFKPxeZRraY3C3SU9lgiPk6zFqwmhYTpdO1FU91IBbcZOfZxavOUrgDntcyn4PKnDj7Mc9UMpuSGclGOEFTllTJzKkfaFSFo49zt/wixbsa08dfAqH4aIOLC53OvWH6kgXPIz+9tRMZ91zWzi2llIoZv7NeK864= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f1c1b4c-7a84-4a51-8ccf-08d7f2878d68 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2020 13:07:10.5859 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4HSCfpQHsRexNml1ucs2BxnvzH5fnhU7m33tEjdtcoTGSV2XdEAGiBRnkfZDXAEfqCW8TU2VBaRX2bbItBe+qw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1819 Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2340 During the SEC phase, use the XCODE5 CpuExceptionHandlerLib library in place of the standard library when building with the XCODE5 toolchain. The SEC XCODE5 version of the library performs binary patching and should only be used when building with the XCODE5 toolchain. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Anthony Perard Cc: Julien Grall Cc: Liming Gao Reviewed-by: Laszlo Ersek Signed-off-by: Tom Lendacky --- OvmfPkg/OvmfPkgIa32.dsc | 4 ++++ OvmfPkg/OvmfPkgIa32X64.dsc | 4 ++++ OvmfPkg/OvmfPkgX64.dsc | 4 ++++ OvmfPkg/OvmfXen.dsc | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 7c8b51f43b66..41ac3202961b 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -246,7 +246,11 @@ [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 [LibraryClasses.common.PEI_CORE] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index a0596c44168c..c2f11aee2cec 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -250,7 +250,11 @@ [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 [LibraryClasses.common.PEI_CORE] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 2e764b6b7233..643e6041ad53 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -250,7 +250,11 @@ [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 [LibraryClasses.common.PEI_CORE] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc index 8b3615e0b07e..143dc6d5a766 100644 --- a/OvmfPkg/OvmfXen.dsc +++ b/OvmfPkg/OvmfXen.dsc @@ -228,7 +228,11 @@ [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 [LibraryClasses.common.PEI_CORE] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf -- 2.17.1