From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (NAM10-MW2-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web11.3201.1588364277426705512 for ; Fri, 01 May 2020 13:17:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=VxW9bCO/; spf=none, err=SPF record not found (domain: amd.com, ip: , mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kuIKoKSPFgyU8xW19TBTC0tPwrB8g6bKP8bBHpSxKxlX4uFZJcvHf97ex5PDR4owpWlKdOC5rB95UHEznpqvC0euGF0dMvBf6EqSKQkYyXxZoMGAqN2tS2GNggO32b/jqtMGvH8MZ2Q6VtsMbmVLgZgQ51fWEu474vtYXfxE8RchKubxVmWlqPDRDpcgK5rjuTpRlXgw0C4TsYa/aF13V0iIg3NBfsDxtT4bYXPWZIY4U1MPYDufDdOTmAL47XlGBUlkUcgfPyMXH9h0yDTF0jLbBHmISnoFRfyzZN9rc1NMZrUaaqYNpQ1EGNdjWpP2RTPbpsZh0zdF8FM3EzZlTA== 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=gIOUr7CmUVmdI3y29x7feEdU35RPAjN6XgWd7XEU8AQ=; b=jcN5yeuRx9yO2mvPqIwo3YXeZPiAwTtPziSmNYmbeXuCHEzT5xUBo06jR7d+HYW8LH7//JPcKjxQWMU+/jY1Ie5idl9lBYeZ2fagqn20a2feAii+aUNkC04FYITu+F4b7t09/gY+4PHPT/xLC+9OBzSmHusoi4FDjShT++g4nxrUeWmeaOYdcP60GuWr67T02itWUBQx0FZNLBWBD7EEFHlErrSlFVCuUfSiC0iYHIw1V2LFkBDzQoPLY36ylyiI6dkykUxd5E8rEunDf8/MdBLKjrPmTDubuUqHC5h/WegC42lnBg3X84mNBl0GbJaBiytCSwNqgD3b5TeQwl9q1w== 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=gIOUr7CmUVmdI3y29x7feEdU35RPAjN6XgWd7XEU8AQ=; b=VxW9bCO/bcm0Cuom2GTydCY7XOi3nBo7zQnM/BBHfLs8sq4xkAN2DfX/EHnHe7VyWleEjP6JxsBY/kwAArdnzmzNFaOLOYxlOX8Wu5EohYr7wULBY+93lpWJ/aTcX9lw0sntOQ/Rj7xStocRagV4JHKOvE9c5OR/cuwMzorgMtw= 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 DM5PR12MB1676.namprd12.prod.outlook.com (2603:10b6:4:8::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.27; Fri, 1 May 2020 20:17:57 +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.2937.028; Fri, 1 May 2020 20:17:57 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io Cc: Jordan Justen , Laszlo Ersek , Ard Biesheuvel , Liming Gao , Eric Dong , Ray Ni , Brijesh Singh , Anthony Perard , Benjamin You , Guo Dong , Julien Grall , Maurice Ma , Andrew Fish Subject: [PATCH 2/4] UefiPayloadPkg: Use toolchain appropriate CpuExceptionHandlerLib Date: Fri, 1 May 2020 15:17:39 -0500 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: SN1PR12CA0068.namprd12.prod.outlook.com (2603:10b6:802:20::39) 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 SN1PR12CA0068.namprd12.prod.outlook.com (2603:10b6:802:20::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.19 via Frontend Transport; Fri, 1 May 2020 20:17:56 +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: 9000cd10-34c5-4f2d-5909-08d7ee0cbcac X-MS-TrafficTypeDiagnostic: DM5PR12MB1676:|DM5PR12MB1676: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1468; X-Forefront-PRVS: 0390DB4BDA X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jKcBuqieF14Z3HWx4YkTtAgU5etaMh+fEPeXDgedVk6wY6LAUYDRrjXbwbMB8DGE/r09GJmbjV8Viz9vFXUpXqiPG6Y//Dt1+E7+jntWctYY0vZFXNwrnpUoapaR36lu8GkqdLx/XG4qPnMNtNXe1FgVqhyd5ME62a11Pev7zFEbEcc5jr9/q6djutfnYQCjZ1lIxvK7nWaeHKdF4DXuox9TdIPiJLKZoKnUXMpgvBM8DXQ5QD7yGyoDjlZqDMULzURLuJvq309Og9Hg7FqsxLyrKx3V+x4MTlZ1e4t+Hiftu5T1Y1BZ6BbLYKqrclXxCkeKvTNeUy8ud6b9/HZDAO/+4ZQ3SDZmtlDJZpIsNSmEvJ9QAHlDJAn7Z1GVFjKz6nAhK/tPEMT5rX1k3T0iVusZ2EuPa/pQ5rAnbaiPf8esYCMiRpIVoWSJbOd5J3lEsiIwIgeGudrAZdojm2aKkquvkDfjeUhsVWT4rmg0Uj/fsQEZiA/qd0wfXFKN7saqkzckqhgnN+rqmVhbNZ+aO0fqg+mLta5X+jikpNE2KfUttfbnk1j7U7KyYaRh6II4x9kL9QIlXRcpHjlJ4EPb2g== 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)(376002)(396003)(136003)(346002)(366004)(39860400002)(66946007)(52116002)(26005)(7696005)(8676002)(66556008)(66476007)(16526019)(6666004)(186003)(6486002)(316002)(2906002)(966005)(86362001)(6916009)(8936002)(54906003)(4326008)(7416002)(19627235002)(478600001)(5660300002)(956004)(36756003)(2616005)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: isVW6qqCupVrTOxot5e6/h9l/FYOqES0shj/RaSkRsEKu6nEJskRLrnrnOZu/BpOxldBRXaG5f6KjyWSz6Ws918BjUTWbBIozX9fQqbp2H5BFBaVCpbhuenbGyD029DCKPu+iu6z/hJqnBhAaVsEMlUkb00RHsJPdBJ1nmRrc8go96byJvmoHPvmQ0pxslQoCaQg7tkV4vKh95o5QawtyYrh/o0K1GRwrTXkfhtKBs7ssHYNhPjRIhh0ltriAUu9n+Qlnz5px6CGG70SNEX6Iygd3pSdknOj2D1l9uS6RUbyCzfJItUG8e2MP/gkBZICbX9XOZjCUCryIAZIwb2oDqvMwvCw/rlyAMmfHe72bO/PaCe69gPPPkY3Rw/NjquOlk7Q7jbh7JYMXu8zmwcOGbolrcUOvbq1dPuKpmunLLM/rJC39JC8Rua9xp/aPUJG1JVwZsF7HHFA3SLnGjpdplIzs9wd8k3BEQ5PitcuYTmaGmh9qUIDOTIgnnMx8AYhlZ+BLofzCYlZnJ5FpYz+yC1IubEdiYEwTHs1chhPzKsC+woOxQra6R+lccSdtaHx5mJFCU7Tgu/eThbRPlkW8Z8bvou8z4d6P7BCuq5FtjXd+MhoMJ0A6G9Hb7exe0RAHEkEgB7Id5vKKMxEoucJpYKbKn2OYIax5Pd5nZhrS6npwgyW0vxLw3St65EPDYpiZS11/wskL7KUBK+LQfXyPWFxhbLqAX27IERDiba5hg4Y1qzOxq1sTyYEqAGgC2Vue98XCI5vXuLeMXIn9cVNp6+TlpDFHeOf5zxZhFPOk04= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9000cd10-34c5-4f2d-5909-08d7ee0cbcac X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 May 2020 20:17:57.1223 (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: PBzyQeRhYjAQFQ5v33p6SOSWgwp+Fh2jb//tKE9XsULvYvS+9abOXBbWWY/qiA8B9AtXbG3LEkoMmiZ7Ks3dxg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1676 Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2340 Use the XCODE5 CpuExceptionHandlerLib library in place of the standard library when building with the XCODE5 toolchain. The XCODE5 version of the library performs binary patching and should only be used when building with the XCODE5 toolchain. Cc: Maurice Ma Cc: Guo Dong Cc: Benjamin You Cc: Liming Gao Signed-off-by: Tom Lendacky --- UefiPayloadPkg/UefiPayloadPkgIa32.dsc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc index d52945442e0e..2bf7aafd8c77 100644 --- a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc +++ b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc @@ -232,7 +232,11 @@ [LibraryClasses.common.DXE_CORE] !if $(SOURCE_DEBUG_ENABLE) DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf !endif +!if $(TOOL_CHAIN_TAG) != "XCODE5" CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf +!else + CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5DxeCpuExceptionHandlerLib.inf +!endif [LibraryClasses.common.DXE_DRIVER] PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf @@ -243,7 +247,11 @@ [LibraryClasses.common.DXE_DRIVER] !if $(SOURCE_DEBUG_ENABLE) DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf !endif +!if $(TOOL_CHAIN_TAG) != "XCODE5" CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf +!else + CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5DxeCpuExceptionHandlerLib.inf +!endif MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf [LibraryClasses.common.DXE_RUNTIME_DRIVER] -- 2.17.1