From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web10.3511.1650592330748129708 for ; Thu, 21 Apr 2022 18:52:11 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=UkPBEAgR; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: guo.dong@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1650592330; x=1682128330; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=csGQgw3w26Nr+OYbUTeM3pLY/0cGaoFRJH0QEZTXOBM=; b=UkPBEAgRztcs48ou+xGB7gZ6/ajOMjowoICCvnwgz2lb/NXGYYdzEqVX 2LeUsDxAeQfup5CPUFu/PjmSRSpzXq7dKOgw0ODdI82yypNd8A+IdNJa6 dXlv5xlUn0nkA3e2g91PFA1XPXPu/MH6NvXiVGXXFklTm1TeHVqeafb83 Bi9XbiB6cY0Xj8Kn6BFXahPLh+1pBDnk8RP4ge/niDEhauRjnEsM+8Gl0 6RrabPL9NGV9+dDMtyDoSIeqkPzrmdBR3hJ3xajCBKjZNv5SO9+uB++J2 okrE/TMH//y+V8BM8kxqobWTgH7tedPB2NUiZ4jy6F/Jzb5WsembWbYmZ g==; X-IronPort-AV: E=McAfee;i="6400,9594,10324"; a="251863547" X-IronPort-AV: E=Sophos;i="5.90,280,1643702400"; d="scan'208";a="251863547" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Apr 2022 18:52:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,280,1643702400"; d="scan'208";a="556101314" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by orsmga007.jf.intel.com with ESMTP; 21 Apr 2022 18:52:10 -0700 Received: from orsmsx608.amr.corp.intel.com (10.22.229.21) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 21 Apr 2022 18:52:09 -0700 Received: from orsmsx609.amr.corp.intel.com (10.22.229.22) by ORSMSX608.amr.corp.intel.com (10.22.229.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 21 Apr 2022 18:52:09 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx609.amr.corp.intel.com (10.22.229.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 21 Apr 2022 18:52:09 -0700 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.169) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 21 Apr 2022 18:52:09 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gJyblFupIz4giTWHUEjJ/g8HTbKKhLOrZW9Sa2Y1OSL659mez7S/r4gwxh7GwFRSA6y/KcqC8vVEELA3kR+oWIoq575MMJCyPMJJ4p/WnQr0nLD0ZLZFARawSfkn8eClhPtIhR+dEQ/GlSiXbSz19OwDNueGxAPzLerVKXJHrZjqpADjDuMmYYPGaxyKlbWUBO7AqCpdC6n+L4hYOazw4WU3SuEIHBswMieV3XUZaJBmZGrPPFRcac+LdtqR/O1nhLyYre5YB83NIsl7ufylSjrzatuU9Ki4NAuhtGZJztzIupEKS0Ef2NrfviovW+P+1derv7D25kNrHBy9ctJhzQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jG8nfvd3aZssXiDUIrTuxiA2C5mgU0w92tFPbE22lgY=; b=Y/WIyEetPwdRRC/0gLy30E2/HfmKDLVOMKdqE7n+PbjJDC8v/yLQVclL4kzaE6Y4mqZfeNOVQ1GcIyplZLFiEbyG0qAUFL5jTWXOpSBr8NkJbd0z+1FklSDrldKSy/4dK9NEv+tHYHSVxX0a3wzxWloJyjlN2tdW+tDgZDX417fYenLsMmBpVujDwWfuIr90FiFWbBzrd9CYtjr4zxSTKPkClVn7PmxLmZN4EwFCIlkSW5i74R25ysNRqiB3p9YLcHcpU5SdVv2vwrltYJoBqqzm/0KsI8c4xOkkO4p6T0dt0h4gvrCTY2T/LIM7riRMXC9Wee2OlS55tHWgzrGL+w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from BYAPR11MB3622.namprd11.prod.outlook.com (2603:10b6:a03:fe::30) by SA2PR11MB4940.namprd11.prod.outlook.com (2603:10b6:806:fa::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.14; Fri, 22 Apr 2022 01:52:07 +0000 Received: from BYAPR11MB3622.namprd11.prod.outlook.com ([fe80::dc75:c873:f2ac:3dee]) by BYAPR11MB3622.namprd11.prod.outlook.com ([fe80::dc75:c873:f2ac:3dee%6]) with mapi id 15.20.5164.027; Fri, 22 Apr 2022 01:52:07 +0000 From: "Guo Dong" To: "Tan, Dun" , "devel@edk2.groups.io" CC: "Ni, Ray" , "You, Benjamin" , "Liu, Zhiguang" Subject: Re: [PATCH] UefiPayloadPkg: Fix IA32 entry build failure Thread-Topic: [PATCH] UefiPayloadPkg: Fix IA32 entry build failure Thread-Index: AQHYU4eklaniyOG320eq607GPOuRr6z7MA1A Date: Fri, 22 Apr 2022 01:52:07 +0000 Message-ID: References: <20220419005110.369-1-dun.tan@intel.com> In-Reply-To: <20220419005110.369-1-dun.tan@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.6.401.20 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 26c9699b-006d-4015-5a7b-08da2402b523 x-ms-traffictypediagnostic: SA2PR11MB4940:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: XipMOCsGOMs05uJWxBssz5ihYjILKdabea+4cUsQvLFsV8ZwozvZwP4LuY/pTG0JLGXvD2esni3zH1oyaeoV/BNE+hdxXvhseNozrYZgp1WopdW8NPbuMNiSenuvkysdlR8G1wMZ4SyQOF3BWLxr07qkR6PiPHmOr/LOaoFYI+UbDWNUx1wtUkS16AzW6JIrC7Wd1KHNnmWUlyt6xG5T3tlvxBfRcSbPpQJp4zDFCb488boFC0ekm+07jVQfxM+wLF0gg6JqJumzeDUean8XYwRWb1kbyCy//x4ZtalLqqh8e6cqKTG9OAOKvqpr8wK22OXEdt9qcqtAiPyokQ0IVhNR8pp93UShV2jikRcNflKjFT5ONgLy7a9u0bq7+dmSEO4cmT86D3iGNqStH+97UOy95Oix74RN0TMwzfNJchHKxis/Lm8T8m3PnZDJdFmOicmeraCwbQSzsVoj3sJNpIBg3c8zynYhSSQpKQQyCWoz54SP7TDzFZItZ/+N/LI4EAydMnJYm1Hxud7KoTIZpcKDuMzWa4oiYznAYl6Uq1VwwejnGWTVbw8e/Chv34nJ07DRaCY0LF9foFiUmXV4eqaHy+GH37z2Z2XcaWEa3AOQXXDPQMY9/irvO7hmhduL6nRSeWLi/HmW3QcEgFHwYl488uucY6YnneB+84ZGIPlDEFOglo6UXikGtMPlpi2bt3dUsBH40PLzHeRidlgTRw== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR11MB3622.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(2906002)(64756008)(508600001)(54906003)(66446008)(66476007)(53546011)(8676002)(86362001)(8936002)(4326008)(9686003)(66946007)(107886003)(186003)(26005)(52536014)(5660300002)(6506007)(33656002)(7696005)(83380400001)(76116006)(66556008)(38070700005)(110136005)(55016003)(38100700002)(316002)(122000001)(71200400001)(82960400001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?HKxlpc6TQEKbam3j63g3AqYcM2/q8wafW/G1BL/VFUjLd1XY8JHPnV0FWHaj?= =?us-ascii?Q?K1vSNkABEjFZlghItF0pLj9X99FckJIhOJvYmonX6tENs+trEkVg+6uuBCDC?= =?us-ascii?Q?JWVblMmw2fXeesAq6U80iznNkuC6Z9b5KsiGyADGw3i23s0BiFLTK65e1QEC?= =?us-ascii?Q?ubBz1ztfCQRPxT/GbCW3e9qdWRmj6i2dUVCNPn4BYR9TV71gjfvePXBYpGKP?= =?us-ascii?Q?/3y3SkXHfmLqelLAHfSdpVTvNUoxkyT7NXQDVbhAybe2IkZgqHnC1vN2VgWV?= =?us-ascii?Q?7j2TcxQVwQnM4zW16W/7WC6c8PMVmz0Nim7qpcQbbwRKUQGM3YrU5Bzpc2a7?= =?us-ascii?Q?X3Pdvhu7NpBqVuhju+U19yLn53CYaKsM+Bm4KciXOmhPpcU0ufbUovcVuTkK?= =?us-ascii?Q?2ON+t3vG16K+2vFHtsjLMPV6TTe4tURPEZkb/stWJEH7y+5JrC21mdfnfH64?= =?us-ascii?Q?rHq//7BEMGBUWRwXxsoQepVy/eOUZ/k32gUEo2P+u+0lQAw8GD7gQEuSQz+9?= =?us-ascii?Q?P5pjXFy0CMZeAnJizLuh3ZHeanWEAoGQtFAt1otQ2RCnWIH9aCebENMvI/LB?= =?us-ascii?Q?4dPbL0mMvhT5sUvTfsPXAFp1mQQnNm7Ahy3Y70EkWDteUh3LG+aHKEA/HOOH?= =?us-ascii?Q?6cxmvBXmAOtlPM4h99p8FSJF+VQmpgZdZ2GzDfnNAx9x4AOBM34xslNzv9MB?= =?us-ascii?Q?YZYusxPaKKbVtH8oCHU1BUattoUEjX/jroqVPshZ42gzNB8j37jGuiuREttC?= =?us-ascii?Q?baAJfeYomlfKtpmVHQEDlnorHdpEjRwei+EFrWxRM13t0gzdVFI9DvF468Py?= =?us-ascii?Q?MLf++7jHTDKZhCPVGd+Ur+cost/FoPo23FxKjpKs4OdGsecWUxAVBCMsPrVd?= =?us-ascii?Q?GCoRWvpMvR8MPC4QtjOe9NwNGqG2KyjAIk2QTY+FzagPnzqM4AZPbpPWkJ2w?= =?us-ascii?Q?CJ+/yEeSKO6yLbDoTM3pDCGhIwpvRIZug9HucMKnecolmyGoOwG9vd8kFUFl?= =?us-ascii?Q?EQ+P58PQ315n2RSpCmqWhr6moO34roqgQIYGiMh1ZkIDV7rB5fFrVWSV022v?= =?us-ascii?Q?vGWA1WPc/plgMgKejKr7nE2ShobgHfB0jdt8gAyUmv4YWeE1OMoUKKtV08YK?= =?us-ascii?Q?4ZPATxLFBskjWfBhMkMzT3BfTq3SkR7H0yPeZsS88NGlXarH6I3Pgreo0Dod?= =?us-ascii?Q?xJNhrYQIHX83v6zRvyXe59x1CwxrZJHagfZLU2w0P/vc6VMcUTbhEE7Fqg0V?= =?us-ascii?Q?4NT4Hvq6GnqS/vJ26Qpx2xy1hznLognUYU3Q4oEg3Lsl3B/PYZkV3o9r6mbl?= =?us-ascii?Q?sDD49mhJKtcWlYM7oWkJb4rEa1vBHA6V20RXMbLQEE2kx6ryuRzT9TlLYd/t?= =?us-ascii?Q?jtqJ5DaKcej2msIxEyLy5qEsHJzTkO4imFxH92SDTDU69NFIytYXuah6Z/Mg?= =?us-ascii?Q?ETAmOauSr+occEIEO1womy+5YilIrJp8SlMg1ruL2TxVs/4+9hT53HCp6fdj?= =?us-ascii?Q?BYnguEns+ekPh0o0PASOXQzjUB/rU2QHzo5MPtjl0aI34GzSGlAe89AH470x?= =?us-ascii?Q?NaMl947nsbNWO7RoIEA0XxaXWxDcN6UFOIiT6tsfMyNHpKU8/iGLVz5odmT2?= =?us-ascii?Q?HE+Hyjz7ay5bsp9M2HD4uIMjsqiuIkTJIpC+IpgX3xq1vzearfWsQdcFOES+?= =?us-ascii?Q?cipx0QxtCEbmwxkI2qIFkIndCCeOMiER1zOUx468H7qzw2y6D0oNl7zRKE/2?= =?us-ascii?Q?gHtpaqcCjw=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB3622.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 26c9699b-006d-4015-5a7b-08da2402b523 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Apr 2022 01:52:07.2936 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 4diVoGHI+gHM+iJCho1bllLFQl8vZr6qhxzugzPXYkBXYqkIJADD7FwvxYYS5d8fqOUNwxVlWzIYIqyUCNo+TA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR11MB4940 Return-Path: guo.dong@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Guo Dong -----Original Message----- From: Tan, Dun =20 Sent: Monday, April 18, 2022 5:51 PM To: devel@edk2.groups.io Cc: Ni, Ray ; Dong, Guo ; You, Benjam= in ; Liu, Zhiguang Subject: [PATCH] UefiPayloadPkg: Fix IA32 entry build failure The ObjCopyFlag and EntryOutputDir need to be modified when building IA32 U= niversalPayload Entry Signed-off-by: Dun Tan Cc: Ray Ni Cc: Guo Dong Cc: Benjamin You Cc: Zhiguang Liu --- UefiPayloadPkg/UniversalPayloadBuild.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/Unive= rsalPayloadBuild.py index 99410d244d..8af381336d 100644 --- a/UefiPayloadPkg/UniversalPayloadBuild.py +++ b/UefiPayloadPkg/UniversalPayloadBuild.py @@ -54,14 +54,20 @@ def BuildUniversalPayload(Args, MacroList): BuildTarget =3D Args.Target ToolChain =3D Args.ToolChain Quiet =3D "--quiet" if Args.Quiet else "" - BuildArch =3D "X64" if Args.Arch =3D=3D 'X64' else "IA32 -a X64" ElfToolChain =3D 'CLANGDWARF' + BuildDir =3D os.path.join(os.environ['WORKSPACE'], os.path.normpat= h("Build/UefiPayloadPkgX64")) + if Args.Arch =3D=3D 'X64': + BuildArch =3D "X64" + ObjCopyFlag =3D "elf64-x86-64" + EntryOutputDir =3D os.path.join(BuildDir, f"{BuildTarget}_{ElfTool= Chain}", os.path.normpath("X64/UefiPayloadPkg/UefiPayloadEntry/UniversalPay= loadEntry/DEBUG/UniversalPayloadEntry.dll")) + else: + BuildArch =3D "IA32 -a X64" + ObjCopyFlag =3D "elf32-i386" + EntryOutputDir =3D os.path.join(BuildDir,=20 + f"{BuildTarget}_{ElfToolChain}",=20 + os.path.normpath("IA32/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloa + dEntry/DEBUG/UniversalPayloadEntry.dll")) =20 EntryModuleInf =3D os.path.normpath("UefiPayloadPkg/UefiPayloadEntry/U= niversalPayloadEntry.inf") DscPath =3D os.path.normpath("UefiPayloadPkg/UefiPayloadPkg.dsc") - BuildDir =3D os.path.join(os.environ['WORKSPACE'], os.path.normpath("B= uild/UefiPayloadPkgX64")) FvOutputDir =3D os.path.join(BuildDir, f"{BuildTarget}_{ToolChain}", o= s.path.normpath("FV/DXEFV.Fv")) - EntryOutputDir =3D os.path.join(BuildDir, f"{BuildTarget}_{ElfToolChai= n}", os.path.normpath("X64/UefiPayloadPkg/UefiPayloadEntry/UniversalPayload= Entry/DEBUG/UniversalPayloadEntry.dll")) PayloadReportPath =3D os.path.join(BuildDir, "UefiUniversalPayload.txt= ") ModuleReportPath =3D os.path.join(BuildDir, "UefiUniversalPayloadEntry= .txt") UpldInfoFile =3D os.path.join(BuildDir, "UniversalPayloadInfo.bin") @@= -105,9 +111,9 @@ def BuildUniversalPayload(Args, MacroList): # # Copy the DXEFV as a section in elf format Universal Payload entry. # - remove_section =3D '"%s" -I elf64-x86-64 -O elf64-x86-64 --remove-sect= ion .upld_info --remove-section .upld.uefi_fv %s'%(LlvmObjcopyPath, EntryOu= tputDir) - add_section =3D '"%s" -I elf64-x86-64 -O elf64-x86-64 --add-section= .upld_info=3D%s --add-section .upld.uefi_fv=3D%s %s'%(LlvmObjcopyPath, Upl= dInfoFile, FvOutputDir, EntryOutputDir) - set_section =3D '"%s" -I elf64-x86-64 -O elf64-x86-64 --set-section= -alignment .upld.upld_info=3D16 --set-section-alignment .upld.uefi_fv=3D16 = %s'%(LlvmObjcopyPath, EntryOutputDir) + remove_section =3D f"{LlvmObjcopyPath} -I {ObjCopyFlag} -O {ObjCopyFla= g} --remove-section .upld_info --remove-section .upld.uefi_fv {EntryOutputD= ir}" + add_section =3D f"{LlvmObjcopyPath} -I {ObjCopyFlag} -O {ObjCopyFla= g} --add-section .upld_info=3D{UpldInfoFile} --add-section .upld.uefi_fv=3D= {FvOutputDir} {EntryOutputDir}" + set_section =3D f"{LlvmObjcopyPath} -I {ObjCopyFlag} -O {ObjCopyFla= g} --set-section-alignment .upld.upld_info=3D16 --set-section-alignment .up= ld.uefi_fv=3D16 {EntryOutputDir}" RunCommand(remove_section) RunCommand(add_section) RunCommand(set_section) -- 2.31.1.windows.1