From nobody Sun May 12 12:02:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39646+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39646+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556289780; cv=none; d=zoho.com; s=zohoarc; b=oB7jQUOAJwZoP+zUFSys8y7QrIXetF+TYKqBKVyZon081glsNJamo2QSlhWQNB7wqCthd4hZHPVeMWvRB3GqBPkWujnPrQ8c+SOq4693izIdjS2jWXs1UyZf8SxPubbN+DNLZs0DWBvubRQTKFj72YRbbpaGdbYWniXOAzm3u4s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556289780; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=UjZpLm34UsYhymGToCwejoaUBu1nnVMvrC/if/ebQhM=; b=ZC/v/syjaszHPAYzFSOyoJJaZycCWfkxmqwssFFOxeSV0powjQYuesi1+5VSz+dFt8isWoBUDyfwC3zCJzjatNG98DVkNOVY3IQUaYb7nDey4wO7gMPhmMq079m6w6Fh/YEsmiTFeyhmPnKowoBMzWUtPoEGbO6TvK27amTooDg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39646+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 155628978063576.85139635728933; Fri, 26 Apr 2019 07:43:00 -0700 (PDT) Return-Path: X-Received: from mga11.intel.com (mga11.intel.com []) by groups.io with SMTP; Fri, 26 Apr 2019 07:42:59 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Apr 2019 07:42:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,397,1549958400"; d="scan'208";a="145975673" X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.29.102]) by orsmga003.jf.intel.com with ESMTP; 26 Apr 2019 07:42:58 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch 1/7] BaseTools: Add ClangBase.lds for CLANG8 tool chain with max-page-size Date: Fri, 26 Apr 2019 22:42:36 +0800 Message-Id: <20190426144242.19024-2-liming.gao@intel.com> In-Reply-To: <20190426144242.19024-1-liming.gao@intel.com> References: <20190426144242.19024-1-liming.gao@intel.com> Precedence: Bulk List-Unsubscribe: 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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556289780; bh=adMSXPBj0SnOJaZMWI6Q+PVVbyBRAsPKz41bxC36inI=; h=Date:From:Reply-To:Subject:To; b=CHAdSK626y9MU7a+SV+tbYowqrGSawZsGy9AmdxTS2pdGByPUjwRVVC3MQ8R2IakJQ3 PNi7BFPEjUdAIF0B6NDrWbodJJcGlZIcH/THd9aOCJcI9zXyUPnL+bvQSH4o/phEyLn9U 6fCdvREwC2WWpVm7Qt7q1b6BPPsPDRRuSQA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" LLVM LLD linker doesn't support common-page-size option. So, max-page-size is used. To not impact GCC tool chain, new ClangBase.lds is added. Signed-off-by: Liming Gao --- BaseTools/Scripts/ClangBase.lds | 79 +++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 79 insertions(+) create mode 100644 BaseTools/Scripts/ClangBase.lds diff --git a/BaseTools/Scripts/ClangBase.lds b/BaseTools/Scripts/ClangBase.= lds new file mode 100644 index 0000000000..8abd54aee6 --- /dev/null +++ b/BaseTools/Scripts/ClangBase.lds @@ -0,0 +1,79 @@ +/** @file + + Unified linker script for GCC based builds + + Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.
+ Copyright (c) 2015, Linaro Ltd. All rights reserved.
+ (C) Copyright 2016 Hewlett Packard Enterprise Development LP
+ + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +SECTIONS { + + /* + * The PE/COFF binary consists of DOS and PE/COFF headers, and a sequenc= e of + * section headers adding up to PECOFF_HEADER_SIZE bytes (which differs + * between 32-bit and 64-bit builds). The actual start of the .text sect= ion + * will be rounded up based on its actual alignment. + */ + . =3D PECOFF_HEADER_SIZE; + + .text : ALIGN(CONSTANT(MAXPAGESIZE)) { + *(.text .text.* .stub .gnu.linkonce.t.*) + *(.rodata .rodata.* .gnu.linkonce.r.*) + *(.got .got.*) + + /* + * The contents of AutoGen.c files are mostly constant from the POV of= the + * program, but most of it ends up in .data or .bss by default since f= ew of + * the variable definitions that get emitted are declared as CONST. + * Unfortunately, we cannot pull it into the .text section entirely, s= ince + * patchable PCDs are also emitted here, but we can at least move all = of the + * emitted GUIDs here. + */ + *:AutoGen.obj(.data.g*Guid) + } + + /* + * The alignment of the .data section should be less than or equal to the + * alignment of the .text section. This ensures that the relative offset + * between these sections is the same in the ELF and the PE/COFF version= s of + * this binary. + */ + .data ALIGN(ALIGNOF(.text)) : ALIGN(CONSTANT(MAXPAGESIZE)) { + *(.data .data.* .gnu.linkonce.d.*) + *(.bss .bss.*) + } + + .eh_frame ALIGN(CONSTANT(MAXPAGESIZE)) : { + KEEP (*(.eh_frame)) + } + + .rela (INFO) : { + *(.rela .rela.*) + } + + .hii : ALIGN(CONSTANT(MAXPAGESIZE)) { + KEEP (*(.hii)) + } + + /* + * Retain the GNU build id but in a non-allocatable section so GenFw + * does not copy it into the PE/COFF image. + */ + .build-id (INFO) : { *(.note.gnu.build-id) } + + /DISCARD/ : { + *(.note.GNU-stack) + *(.gnu_debuglink) + *(.interp) + *(.dynsym) + *(.dynstr) + *(.dynamic) + *(.hash .gnu.hash) + *(.comment) + *(COMMON) + } +} --=20 2.13.0.windows.1 -=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 (#39646): https://edk2.groups.io/g/devel/message/39646 Mute This Topic: https://groups.io/mt/31354045/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- From nobody Sun May 12 12:02:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39647+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39647+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556289780; cv=none; d=zoho.com; s=zohoarc; b=HDekKSpbc/YhKNE9+y8QBgMK8wXhFsUJmd3YY0G9/c9G9tEVgzmZyIgw7JIg9XUsofl5tjgR55hUcNG45jlcTvpNEOUBNNhCj6BOhaLp7yqnkZ8VLqFhELdhmNgh+UfRCNhKqOKdrM4S7a6rh2qlu5BEqZxLpiM4FSjCME3opho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556289780; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=52nvFeLN7IerjHmYcoKggNHWpZO3hAQPDbDZTgjFGxw=; b=Py9DsE9Z4+xrznkdOSh0kmNvUQtN3oa2fpzb9X3V70DyXVER/wTWd2zAWc9FMuDEalgh1MMwJ/8vvcNET0+8RMt5YnB9O7FLO7w3svojyCbEWJvMatVlZNKyNORFUN8UIEc9qoOvYRF14HqdgsQYZhQ18mjBVuSi5wvx/QrVZfw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39647+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556289780924866.1791359976403; Fri, 26 Apr 2019 07:43:00 -0700 (PDT) Return-Path: X-Received: from mga11.intel.com (mga11.intel.com []) by groups.io with SMTP; Fri, 26 Apr 2019 07:43:00 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Apr 2019 07:43:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,397,1549958400"; d="scan'208";a="145975674" X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.29.102]) by orsmga003.jf.intel.com with ESMTP; 26 Apr 2019 07:42:59 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch 2/7] BaseTools GenFw: Support CLANG8ELF with conversion ELF to PE/COFF image Date: Fri, 26 Apr 2019 22:42:37 +0800 Message-Id: <20190426144242.19024-3-liming.gao@intel.com> In-Reply-To: <20190426144242.19024-1-liming.gao@intel.com> References: <20190426144242.19024-1-liming.gao@intel.com> Precedence: Bulk List-Unsubscribe: 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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556289780; bh=OfBSgWscP4ad5ndst9AXVwe9mQAAMtuabC0amjJBRgw=; h=Date:From:Reply-To:Subject:To; b=iSQZ58VpVGbYHYgDr0yYZBkGiWgiMyViEPx5K037cKjFbmC1A498xCq6B+yxtSvZv1s +IYUywnRoDKJ0zQUK0BBNU+CG96bZ2kOikzgaeZEFDgFk7rVaj92m4A6EShNDd50HLz+T n0XYvueuhd3ZJFTaHONNhny4lOoEr7Zccwc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" CLANG8ELF tool chain generated ELF image with the different attributes in section. Update GenFw to handle them. 1. .text section with writable attribute (support) 2. .reloc section has the symbol for *ABS* (skip) Signed-off-by: Liming Gao --- BaseTools/Source/C/GenFw/Elf32Convert.c | 12 +++--------- BaseTools/Source/C/GenFw/Elf64Convert.c | 11 +++-------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/BaseTools/Source/C/GenFw/Elf32Convert.c b/BaseTools/Source/C/G= enFw/Elf32Convert.c index 46089ff370..fd13278e3d 100644 --- a/BaseTools/Source/C/GenFw/Elf32Convert.c +++ b/BaseTools/Source/C/GenFw/Elf32Convert.c @@ -238,7 +238,7 @@ IsTextShdr ( Elf_Shdr *Shdr ) { - return (BOOLEAN) ((Shdr->sh_flags & (SHF_WRITE | SHF_ALLOC)) =3D=3D SHF_= ALLOC); + return (BOOLEAN) ((Shdr->sh_flags & (SHF_EXECINSTR | SHF_ALLOC)) =3D=3D = (SHF_EXECINSTR | SHF_ALLOC)); } =20 STATIC @@ -261,7 +261,7 @@ IsDataShdr ( if (IsHiiRsrcShdr(Shdr)) { return FALSE; } - return (BOOLEAN) (Shdr->sh_flags & (SHF_WRITE | SHF_ALLOC)) =3D=3D (SHF_= ALLOC | SHF_WRITE); + return (BOOLEAN) (Shdr->sh_flags & (SHF_EXECINSTR | SHF_WRITE | SHF_ALLO= C)) =3D=3D (SHF_ALLOC | SHF_WRITE); } =20 STATIC @@ -749,13 +749,7 @@ WriteSections32 ( if (SymName =3D=3D NULL) { SymName =3D (const UINT8 *)""; } - - Error (NULL, 0, 3000, "Invalid", - "%s: Bad definition for symbol '%s'@%#x or unsupported sy= mbol type. " - "For example, absolute and undefined symbols are not supp= orted.", - mInImageName, SymName, Sym->st_value); - - exit(EXIT_FAILURE); + continue; } SymShdr =3D GetShdrByIndex(Sym->st_shndx); =20 diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/G= enFw/Elf64Convert.c index 3d6319c821..35cebad27d 100644 --- a/BaseTools/Source/C/GenFw/Elf64Convert.c +++ b/BaseTools/Source/C/GenFw/Elf64Convert.c @@ -239,7 +239,7 @@ IsTextShdr ( Elf_Shdr *Shdr ) { - return (BOOLEAN) ((Shdr->sh_flags & (SHF_WRITE | SHF_ALLOC)) =3D=3D SHF_= ALLOC); + return (BOOLEAN) ((Shdr->sh_flags & (SHF_EXECINSTR | SHF_ALLOC)) =3D=3D = (SHF_EXECINSTR | SHF_ALLOC)); } =20 STATIC @@ -262,7 +262,7 @@ IsDataShdr ( if (IsHiiRsrcShdr(Shdr)) { return FALSE; } - return (BOOLEAN) (Shdr->sh_flags & (SHF_WRITE | SHF_ALLOC)) =3D=3D (SHF_= ALLOC | SHF_WRITE); + return (BOOLEAN) (Shdr->sh_flags & (SHF_EXECINSTR | SHF_WRITE | SHF_ALLO= C)) =3D=3D (SHF_ALLOC | SHF_WRITE); } =20 STATIC @@ -894,12 +894,7 @@ WriteSections64 ( SymName =3D (const UINT8 *)""; } =20 - Error (NULL, 0, 3000, "Invalid", - "%s: Bad definition for symbol '%s'@%#llx or unsupported = symbol type. " - "For example, absolute and undefined symbols are not supp= orted.", - mInImageName, SymName, Sym->st_value); - - exit(EXIT_FAILURE); + continue; } SymShdr =3D GetShdrByIndex(Sym->st_shndx); =20 --=20 2.13.0.windows.1 -=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 (#39647): https://edk2.groups.io/g/devel/message/39647 Mute This Topic: https://groups.io/mt/31354046/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- From nobody Sun May 12 12:02:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39648+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39648+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556289782; cv=none; d=zoho.com; s=zohoarc; b=ZvnHDbvqL3BlDmQSxwkY8CLfTUm58LSf6jHQqNcPlWHfZck7DE0zyUxt0AU3V5t2FY36Y0jvJXzfiD8IGF+zNHERTiDTBPFVOrQ5qXQeZNr8PMgCgFhB9FLNFFTSvSxVjtPD5G4Z5ELu6sXqTG4AEKhCrzY1eWLdSfjTpN0zAZU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556289782; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=Hf0XKoH5e8k/1PC1ebQFAET/6zmPpY6mnxHxSi9DpnE=; b=dk/OEAy3oiX/k0bhIwkK2KUVaps2+irjgVLFzFPe1h2YlzhngYNDMeu6Fs6QNjSIeeG+LnJOzIeE1j7TyhJNMfW2VVzf4AtYFZithWgUogpG91fW3LRGocADbYNCprFnpEQ37T+OyO5TZG/zVSSi/dUFXuMmY199yT2BwjsAhYk= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39648+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556289782006477.4933795583572; Fri, 26 Apr 2019 07:43:02 -0700 (PDT) Return-Path: X-Received: from mga11.intel.com (mga11.intel.com []) by groups.io with SMTP; Fri, 26 Apr 2019 07:43:01 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Apr 2019 07:43:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,397,1549958400"; d="scan'208";a="145975677" X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.29.102]) by orsmga003.jf.intel.com with ESMTP; 26 Apr 2019 07:43:00 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch 3/7] BaseTools: Update build_rule.template for ASLC rule with full C flags Date: Fri, 26 Apr 2019 22:42:38 +0800 Message-Id: <20190426144242.19024-4-liming.gao@intel.com> In-Reply-To: <20190426144242.19024-1-liming.gao@intel.com> References: <20190426144242.19024-1-liming.gao@intel.com> Precedence: Bulk List-Unsubscribe: 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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556289781; bh=DjgMUBoUEYTQb+0LCCrMLnyBfeJGMizKiLYMFKQyUXI=; h=Date:From:Reply-To:Subject:To; b=O46Uobv8etufximNB2HMlOd+xD6aKQOLGBjrOTlo7kOSxYs0Wtg2b//0FhUTeb6X2SZ syeKM2Hrf5fyRz3cNEI6T2ujy9Ds4LNfExcJQGjUna/bQtWzqHUwPo47liYeNJTZFww+s p2ovAZtjcODR/COLQ4YxKczS60DvuRZN5/o= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Update ASLC GCC link step with the full C compiler flags. It can make sure lto option works correctly. Signed-off-by: Liming Gao --- BaseTools/Conf/build_rule.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule= .template index 030e74c35a..43c1b6dd3b 100755 --- a/BaseTools/Conf/build_rule.template +++ b/BaseTools/Conf/build_rule.template @@ -460,7 +460,7 @@ =20 "$(ASLCC)" -c -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLA= GS) $(ASLCC_FLAGS) $(INC) ${src} - "$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLI= NK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj + "$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLI= NK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(ASLCC_FLAG= S) "$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $= (GENFW_FLAGS) =20 =20 --=20 2.13.0.windows.1 -=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 (#39648): https://edk2.groups.io/g/devel/message/39648 Mute This Topic: https://groups.io/mt/31354047/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- From nobody Sun May 12 12:02:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39649+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39649+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556289782; cv=none; d=zoho.com; s=zohoarc; b=eDtKMpwjflw2ZUpCkrS0qXAM4KFEGAv8ZnvI9tMzsybNVb7JV/yrZcL8884OhluIPRKgsbKx7RHRCYeIcxDiliW7UsRv65mp9J+MF8+JWMybeRRwz1Q2Xdj1KqzlbAlBjBaErgSfU4x4hNQGocGQ3+NiZG2aiTzYpJQpYbMqMaE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556289782; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=yKSAyvHvv7UIxQwxp6iM+ISHazExyWdz0SAmVMrmlOY=; b=GHJIDMlS8Yhu7f6UsMBZ23rwZQAmF/kGjnff1ygizGwK2jxTgMzv4dnqUWeVoBP6jgFYVdBxadBmhXO5ARbPNGxoBOhADSTX3x7iauZ0f7PPN5yDsfguH8xFhIyHJTA6JmAfVpWkekHV4DRpAXTGDTBYDDgLse24ZnYbvRQC8xw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39649+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556289782953643.6952438826335; Fri, 26 Apr 2019 07:43:02 -0700 (PDT) Return-Path: X-Received: from mga11.intel.com (mga11.intel.com []) by groups.io with SMTP; Fri, 26 Apr 2019 07:43:02 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Apr 2019 07:43:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,397,1549958400"; d="scan'208";a="145975687" X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.29.102]) by orsmga003.jf.intel.com with ESMTP; 26 Apr 2019 07:43:01 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch 4/7] BaseTools: Update build_rule to skip CLANG resource section generation Date: Fri, 26 Apr 2019 22:42:39 +0800 Message-Id: <20190426144242.19024-5-liming.gao@intel.com> In-Reply-To: <20190426144242.19024-1-liming.gao@intel.com> References: <20190426144242.19024-1-liming.gao@intel.com> Precedence: Bulk List-Unsubscribe: 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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556289782; bh=ddWs+aqUTvoP0hmJRG1WL8QSArRknyMkSxx5v4ZsVW4=; h=Date:From:Reply-To:Subject:To; b=SUbdddxpDZOElJb+F3KTohMEO/GkxagbqVgcohSs7CuF+zJQ7lUBUL4G3wD2UYe6Pmm YVorkSB25on7iCu7r2azTnPv0jk+zocYAkDT8rHDLGfVsAuXwJ9w+aGAzvTlQAazL5YEY mUREfoN4SrfvXiIV+0BA5jbcMbdAJF0yWHA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" LLVM/CLANG doesn't support resource section generation when ELF image gener= ated. Signed-off-by: Liming Gao --- BaseTools/Conf/build_rule.template | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule= .template index 43c1b6dd3b..dec27109a1 100755 --- a/BaseTools/Conf/build_rule.template +++ b/BaseTools/Conf/build_rule.template @@ -636,7 +636,5 @@ "$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUI= D) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS) "$(RC)" $(RC_FLAGS) $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc ${dst} =20 - - GenFw -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --= hiibinpackage $(HII_BINARY_PACKAGES) - =20 - =20 + + "$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUI= D) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS) --=20 2.13.0.windows.1 -=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 (#39649): https://edk2.groups.io/g/devel/message/39649 Mute This Topic: https://groups.io/mt/31354048/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- From nobody Sun May 12 12:02:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39650+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39650+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556289783; cv=none; d=zoho.com; s=zohoarc; b=AS2uOWumKGzxBM7DUTnplRn6KujyQz0S3QR+OxES6zQVlW2zsxn1fKcky3qNpOumliX9Dj1sdlbXPCRljYY6lniGJcVz/mxgWyUy4msY/3Lfc7PTFCElmckdRz0vyCQVhDQMX2nmnKQThUH7DzS5m4Efe9Ufv25Ilk2Qw63GPFw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556289783; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=v24UhzL8kSfXuDCjaSbFv+1JdxEWBj54AJj2jctHLQQ=; b=ZbCzRKLt+JYNpWKg67xXFE51Cf9I9IxF9wyEKc7FhrOtqYXfas2mjUGKphBGPlpxOZk5H26JjA3VWto+FXL00P2ZmaFBrIl7D6sKahIbmAL+/r4pXBeTRHaeUbANL/oj80eCDMCscnoesZukOAUnm9CMop9JU+qMyfEVHjQm0fU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39650+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556289783417769.6684263960669; Fri, 26 Apr 2019 07:43:03 -0700 (PDT) Return-Path: X-Received: from mga11.intel.com (mga11.intel.com []) by groups.io with SMTP; Fri, 26 Apr 2019 07:43:02 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Apr 2019 07:43:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,397,1549958400"; d="scan'208";a="145975694" X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.29.102]) by orsmga003.jf.intel.com with ESMTP; 26 Apr 2019 07:43:02 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch 5/7] BaseTools: Update tools_def.template to directly refer to AutoGen.h Date: Fri, 26 Apr 2019 22:42:40 +0800 Message-Id: <20190426144242.19024-6-liming.gao@intel.com> In-Reply-To: <20190426144242.19024-1-liming.gao@intel.com> References: <20190426144242.19024-1-liming.gao@intel.com> Precedence: Bulk List-Unsubscribe: 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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556289783; bh=TAhmj+SpMjYG7hEE8gxsugWdsZKMEZ5hltR7uLIf+7Q=; h=Date:From:Reply-To:Subject:To; b=S6PAXUd0fPPLnP538CMafFvI/pka0XWhsHDjZXazooVLLxWOrgGD3S0kTWciR1yAnSw yiOvv+PTcXocwHry3/GZ4KYWG1v7zdhi/n4BMv1j1FPFKZ1ks8RlLs+xFy/TZyYc13dtF nOtEU+pirljylc5v0ILq2oD/G2LJZG0HC3A= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Full path $(DEST_DIR_DEBUG)\AutoGen.h is not necessary, because $(DEST_DIR_DEBUG) has been listed in $(INC) include paths. Change-Id: Iadf2c7223708468b504298f0b43034c4f117ac66 Signed-off-by: Liming Gao --- BaseTools/Conf/tools_def.template | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.t= emplate index b9e66002d0..29dc24774a 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -426,8 +426,8 @@ DEFINE DTC_BIN =3D ENV(DTC_PREFIX)dtc # *_*_EBC_SLINK_PATH =3D C:\Program Files\Intel\EBC\Bin\li= nk.exe # # *_*_EBC_SLINK_FLAGS =3D /lib /NOLOGO /MACHINE:EBC -# *_*_EBC_PP_FLAGS =3D /nologo /E /TC /FI$(DEST_DIR_DEBU= G)/AutoGen.h -# *_*_EBC_CC_FLAGS =3D /nologo /FAcs /c /W3 /WX /FI$(DES= T_DIR_DEBUG)/AutoGen.h +# *_*_EBC_PP_FLAGS =3D /nologo /E /TC /FIAutoGen.h +# *_*_EBC_CC_FLAGS =3D /nologo /FAcs /c /W3 /WX /FIAutoG= en.h # *_*_EBC_DLINK_FLAGS =3D "C:\Program Files\Intel\EBC\Lib\E= bcLib.lib" /NOLOGO /MACHINE:EBC /OPT:REF /NODEFAULTLIB /ENTRY:$(IMAGE_ENTRY= _POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /ALIGN:32 /DRIVER # ##########################################################################= ########## @@ -2984,13 +2984,13 @@ DEFINE GCC_IA32_X64_ASLDLINK_FLAGS =3D DEF(GCC_IA32= _X64_DLINK_COMMON) --entry _Ref DEFINE GCC_ARM_ASLDLINK_FLAGS =3D DEF(GCC_ARM_DLINK_FLAGS) -Wl,--entr= y,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) DEF(GCC_ARM_AARCH64_ASLDLINK_F= LAGS) DEFINE GCC_AARCH64_ASLDLINK_FLAGS =3D DEF(GCC_AARCH64_DLINK_FLAGS) -Wl,--= entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) DEF(GCC_ARM_AARCH64_ASLDLI= NK_FLAGS) DEFINE GCC_IA32_X64_DLINK_FLAGS =3D DEF(GCC_IA32_X64_DLINK_COMMON) --en= try _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20 -M= ap $(DEST_DIR_DEBUG)/$(BASE_NAME).map -DEFINE GCC_ASM_FLAGS =3D -c -x assembler -imacros $(DEST_DIR= _DEBUG)/AutoGen.h -DEFINE GCC_PP_FLAGS =3D -E -x assembler-with-cpp -include $= (DEST_DIR_DEBUG)/AutoGen.h -DEFINE GCC_VFRPP_FLAGS =3D -x c -E -P -DVFRCOMPILE --include $= (DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h +DEFINE GCC_ASM_FLAGS =3D -c -x assembler -imacros AutoGen.h +DEFINE GCC_PP_FLAGS =3D -E -x assembler-with-cpp -include A= utoGen.h +DEFINE GCC_VFRPP_FLAGS =3D -x c -E -P -DVFRCOMPILE --include $= (MODULE_NAME)StrDefs.h DEFINE GCC_ASLPP_FLAGS =3D -x c -E -include AutoGen.h DEFINE GCC_ASLCC_FLAGS =3D -x c DEFINE GCC_WINDRES_FLAGS =3D -J rc -O coff -DEFINE GCC_DTCPP_FLAGS =3D -E -x assembler-with-cpp -imacros $= (DEST_DIR_DEBUG)/AutoGen.h -nostdinc -undef +DEFINE GCC_DTCPP_FLAGS =3D -E -x assembler-with-cpp -imacros A= utoGen.h -nostdinc -undef DEFINE GCC_IA32_RC_FLAGS =3D -I binary -O elf32-i386 -B= i386 --rename-section .data=3D.hii DEFINE GCC_X64_RC_FLAGS =3D -I binary -O elf64-x86-64 -B= i386 --rename-section .data=3D.hii DEFINE GCC_ARM_RC_FLAGS =3D -I binary -O elf32-littlearm -B= arm --rename-section .data=3D.hii @@ -3850,8 +3850,8 @@ RELEASE_XCODE5_X64_DLINK_FLAGS =3D -arch x86_64 = -u _$(IMAGE_ENTRY_POINT) -e _ NOOPT_XCODE5_X64_ASM_FLAGS =3D -arch x86_64 -g RELEASE_XCODE5_X64_ASM_FLAGS =3D -arch x86_64 *_XCODE5_X64_NASM_FLAGS =3D -f macho64 -*_XCODE5_*_PP_FLAGS =3D -E -x assembler-with-cpp -include $(DEST_D= IR_DEBUG)/AutoGen.h -*_XCODE5_*_VFRPP_FLAGS =3D -x c -E -P -DVFRCOMPILE -include $(DEST_DI= R_DEBUG)/$(MODULE_NAME)StrDefs.h +*_XCODE5_*_PP_FLAGS =3D -E -x assembler-with-cpp -include AutoGen.h +*_XCODE5_*_VFRPP_FLAGS =3D -x c -E -P -DVFRCOMPILE -include $(MODULE_= NAME)StrDefs.h =20 DEBUG_XCODE5_X64_CC_FLAGS =3D -target x86_64-pc-win32-macho -c -g -Os = -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-exte= nsions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float = -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field= -initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftr= ap-function=3Dundefined_behavior_has_been_optimized_away_by_clang -D NO_MSA= BI_VA_FUNCS $(PLATFORM_FLAGS) NOOPT_XCODE5_X64_CC_FLAGS =3D -target x86_64-pc-win32-macho -c -g -O0 = -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-exte= nsions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float = -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field= -initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftr= ap-function=3Dundefined_behavior_has_been_optimized_away_by_clang -D NO_MSA= BI_VA_FUNCS $(PLATFORM_FLAGS) --=20 2.13.0.windows.1 -=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 (#39650): https://edk2.groups.io/g/devel/message/39650 Mute This Topic: https://groups.io/mt/31354049/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- From nobody Sun May 12 12:02:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39651+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39651+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556289784; cv=none; d=zoho.com; s=zohoarc; b=mI0SNW/XYA0bhorgTYNcapVp1Gwm2hByYH5brM5p4aqYpEucRWDnuCKhhW9IIdUVoynQcxoDUQ/FKU4xatkspGyWKWLfbp6mibzCjWTg4cktTzErF9+MHyAw5eyssucdtzlz3X+6blmJbsiiI6bfCiwy5tf2y0LFccuBHenIsGw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556289784; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=eH261C9gabKEFalmFeeMgFGywCwHigY9UL2BeaT402Y=; b=MohWGe2YBGqPqdJjMJGHkzBCOcTqaf4xH0QxcA3debpunh0pVvaHAPtFkWT53y/sVREvQWLhLwkOP5AdkltRtEXgIvCZNQ8EiQu8JhBLLGQL1SMJQ7n3ajdFY64ndZ37enNPH5cC057V3xJKieIfUie0vqRSdia8dHh2fpDHTW0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39651+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556289784277409.94490530760595; Fri, 26 Apr 2019 07:43:04 -0700 (PDT) Return-Path: X-Received: from mga11.intel.com (mga11.intel.com []) by groups.io with SMTP; Fri, 26 Apr 2019 07:43:03 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Apr 2019 07:43:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,397,1549958400"; d="scan'208";a="145975702" X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.29.102]) by orsmga003.jf.intel.com with ESMTP; 26 Apr 2019 07:43:02 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch 6/7] BaseTools: Add new CLANG8ELF tool chain for new LLVM/CLANG8 Date: Fri, 26 Apr 2019 22:42:41 +0800 Message-Id: <20190426144242.19024-7-liming.gao@intel.com> In-Reply-To: <20190426144242.19024-1-liming.gao@intel.com> References: <20190426144242.19024-1-liming.gao@intel.com> Precedence: Bulk List-Unsubscribe: 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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556289783; bh=+tZ/XqPgqFBvGeVMHJTLvhP/xCNTt4HBqoEe3AtU7v4=; h=Date:From:Reply-To:Subject:To; b=hSlBiVPAcRc83eFsfYDMckoZFJtivd85SAnVnlJ/+IaOEfDQcf8zXhQq5fdzZd5SAwD eBZmBTaqIce9gj3zb+JxVCa68stqxsvlc44A/CIndKSlZdM619ubHHsLtwWPr4djAbBLW 0qngdE7XxQW5uwuEG6LJ4pNQWIZlttRAE14= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=3D1603 LLVM/CLANG8 formal release http://releases.llvm.org/download.html#8.0.0 It can be downloaded and installed in Windows/Linux/Mac OS. CLANG8ELF tool chain is added to generate ELF image, and convert to PE/COFF. On Windows OS, set CLANG_HOST_BIN=3Dn, set CLANG8_BIN=3DLLVM installed dire= ctory For example: set CLANG_HOST_BIN=3Dn # use windows nmake set CLANG8_BIN=3DC:\Program Files\LLVM\bin\ On Linux/Mac, set CLANG8_BIN=3DLLVM installed directory This tool chain can be used to compile the firmware code. On windows OS, Visual Studio is still required to compile BaseTools C tools and nmake.exe. On Linux/Mac OS, gcc is used to compile BaseTools C tools. make is used for makefile. This tool chain is verified on OVMF Ia32, X64 and Ia32X64 to boot Shell. This tool chain is verified in Windows/Linux and Mac OS. Signed-off-by: Liming Gao Reviewed-by: Bob Feng --- BaseTools/Conf/tools_def.template | 105 ++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 105 insertions(+) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.t= emplate index 29dc24774a..3d95a3a6a2 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -255,6 +255,13 @@ DEFINE DTC_BIN =3D ENV(DTC_PREFIX)dtc # Required to build platforms or ACPI tables: # Intel(r) ACPI Compiler from # https://acpica.org/downloads +# CLANG8ELF -Linux,Windows,Mac- Requires: +# LLVM 8.0.0 or above, https://llvm.org/ +# On Windows OS, Visual Studio is required to = be installed for nmake and compile BaseTools C tools. +# Optional: +# Required to build platforms or ACPI tables: +# Intel(r) ACPI Compiler from +# https://acpica.org/downloads # VS2008xASL -win32- Requires: # Microsoft Visual Studio 2008 Team Suite # Microsoft Windows Server 2003 Driver Develop= ment Kit (Microsoft WINDDK) version 3790.1830 @@ -3776,7 +3783,105 @@ DEFINE CLANG38_AARCH64_DLINK_FLAGS =3D DEF(CLANG38= _AARCH64_TARGET) DEF(GCC_AARCH6 RELEASE_CLANG38_AARCH64_CC_FLAGS =3D DEF(CLANG38_AARCH64_CC_FLAGS) $(AR= CHCC_FLAGS) $(PLATFORM_FLAGS) -flto -O3 RELEASE_CLANG38_AARCH64_DLINK_FLAGS =3D DEF(CLANG38_AARCH64_DLINK_FLAGS) -= flto -Wl,-O3 -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-aarch64 -Wl,-plugin= -opt=3D-pass-through=3D-llto-aarch64 =20 +##########################################################################= ########## +# +# Clang 8.0.0 - This configuration is used to compile under Windows, Linux= , Mac to +# produce ELF image, and convert to PE/COFF image using LLVM/CLANG 8.0 wit= h LTO +# +##########################################################################= ########## +*_CLANG8ELF_*_*_FAMILY =3D GCC +*_CLANG8ELF_*_*_BUILDRULEFAMILY =3D CLANGGCC +*_CLANG8ELF_*_MAKE_PATH =3D ENV(CLANG_HOST_BIN)make +*_CLANG8ELF_*_*_DLL =3D ENV(CLANG8_DLL) +*_CLANG8ELF_*_ASL_PATH =3D DEF(UNIX_IASL_BIN) + +*_CLANG8ELF_*_APP_FLAGS =3D +*_CLANG8ELF_*_ASL_FLAGS =3D DEF(IASL_FLAGS) +*_CLANG8ELF_*_ASL_OUTFLAGS =3D DEF(IASL_OUTFLAGS) + +DEFINE CLANG8ELF_IA32_PREFIX =3D ENV(CLANG8_BIN) +DEFINE CLANG8ELF_X64_PREFIX =3D ENV(CLANG8_BIN) + +# LLVM/CLANG doesn't support -n link option. So, it can't share the same I= A32_X64_DLINK_COMMON flag. +# LLVM/CLANG doesn't support common page size. So, it can't share the same= GccBase.lds script. +DEFINE CLANG8ELF_IA32_X64_DLINK_COMMON =3D -nostdlib -Wl,-q,--gc-section= s -z max-page-size=3D0x40 +DEFINE CLANG8ELF_DLINK2_FLAGS_COMMON =3D -Wl,--script=3D$(EDK_TOOLS_PA= TH)/Scripts/ClangBase.lds +DEFINE CLANG8ELF_IA32_X64_ASLDLINK_FLAGS =3D DEF(CLANG8ELF_IA32_X64_DLINK_= COMMON) -Wl,--defsym=3DPECOFF_HEADER_SIZE=3D0 DEF(CLANG8ELF_DLINK2_FLAGS_CO= MMON) -Wl,--entry,ReferenceAcpiTable -u ReferenceAcpiTable +DEFINE CLANG8ELF_IA32_X64_DLINK_FLAGS =3D DEF(CLANG8ELF_IA32_X64_DLINK_= COMMON) -Wl,--entry,$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Wl,-Map,$= (DEST_DIR_DEBUG)/$(BASE_NAME).map,--whole-archive +DEFINE CLANG8ELF_IA32_DLINK2_FLAGS =3D -Wl,--defsym=3DPECOFF_HEADER_= SIZE=3D0x220 DEF(CLANG8ELF_DLINK2_FLAGS_COMMON) +DEFINE CLANG8ELF_X64_DLINK2_FLAGS =3D -Wl,--defsym=3DPECOFF_HEADER_= SIZE=3D0x228 DEF(CLANG8ELF_DLINK2_FLAGS_COMMON) + +########################### +# CLANG8ELF IA32 definitions +########################### +*_CLANG8ELF_IA32_CC_PATH =3D DEF(CLANG8ELF_IA32_PREFIX)clang +*_CLANG8ELF_IA32_SLINK_PATH =3D DEF(CLANG8ELF_IA32_PREFIX)llvm-ar +*_CLANG8ELF_IA32_DLINK_PATH =3D DEF(CLANG8ELF_IA32_PREFIX)clang +*_CLANG8ELF_IA32_ASLDLINK_PATH =3D DEF(CLANG8ELF_IA32_PREFIX)clang +*_CLANG8ELF_IA32_ASM_PATH =3D DEF(CLANG8ELF_IA32_PREFIX)clang +*_CLANG8ELF_IA32_PP_PATH =3D DEF(CLANG8ELF_IA32_PREFIX)clang +*_CLANG8ELF_IA32_VFRPP_PATH =3D DEF(CLANG8ELF_IA32_PREFIX)clang +*_CLANG8ELF_IA32_ASLCC_PATH =3D DEF(CLANG8ELF_IA32_PREFIX)clang +*_CLANG8ELF_IA32_ASLPP_PATH =3D DEF(CLANG8ELF_IA32_PREFIX)clang +*_CLANG8ELF_IA32_RC_PATH =3D DEF(CLANG8ELF_IA32_PREFIX)llvm-rc + +*_CLANG8ELF_IA32_ASLCC_FLAGS =3D DEF(GCC_ASLCC_FLAGS) -m32 -fno-l= to DEF(CLANG38_IA32_TARGET) +*_CLANG8ELF_IA32_ASLDLINK_FLAGS =3D DEF(CLANG8ELF_IA32_X64_ASLDLINK_= FLAGS) -Wl,-m,elf_i386 -fuse-ld=3Dlld +*_CLANG8ELF_IA32_ASM_FLAGS =3D DEF(GCC5_ASM_FLAGS) -m32 -march= =3Di386 DEF(CLANG38_IA32_TARGET) +*_CLANG8ELF_IA32_RC_FLAGS =3D DEF(GCC_IA32_RC_FLAGS) +*_CLANG8ELF_IA32_OBJCOPY_FLAGS =3D +*_CLANG8ELF_IA32_NASM_FLAGS =3D -f elf32 +*_CLANG8ELF_IA32_PP_FLAGS =3D DEF(GCC_PP_FLAGS) DEF(CLANG38_IA= 32_TARGET) +*_CLANG8ELF_IA32_ASLPP_FLAGS =3D DEF(GCC_ASLPP_FLAGS) DEF(CLANG38= _IA32_TARGET) +*_CLANG8ELF_IA32_VFRPP_FLAGS =3D DEF(GCC_VFRPP_FLAGS) DEF(CLANG38= _IA32_TARGET) + +DEBUG_CLANG8ELF_IA32_CC_FLAGS =3D DEF(CLANG38_ALL_CC_FLAGS) -m32 -= Oz -flto -march=3Di586 DEF(CLANG38_IA32_TARGET) -g +DEBUG_CLANG8ELF_IA32_DLINK_FLAGS =3D DEF(CLANG8ELF_IA32_X64_DLINK_FLA= GS) -flto -Wl,-O3 -Wl,-melf_i386 -Wl,--oformat,elf32-i386 +DEBUG_CLANG8ELF_IA32_DLINK2_FLAGS =3D DEF(CLANG8ELF_IA32_DLINK2_FLAGS)= -O3 -fuse-ld=3Dlld + +RELEASE_CLANG8ELF_IA32_CC_FLAGS =3D DEF(CLANG38_ALL_CC_FLAGS) -m32 -= Oz -flto -march=3Di586 DEF(CLANG38_IA32_TARGET) +RELEASE_CLANG8ELF_IA32_DLINK_FLAGS =3D DEF(CLANG8ELF_IA32_X64_DLINK_FLA= GS) -flto -Wl,-O3 -Wl,-melf_i386 -Wl,--oformat,elf32-i386 +RELEASE_CLANG8ELF_IA32_DLINK2_FLAGS =3D DEF(CLANG8ELF_IA32_DLINK2_FLAGS)= -O3 -fuse-ld=3Dlld + +NOOPT_CLANG8ELF_IA32_CC_FLAGS =3D DEF(CLANG38_ALL_CC_FLAGS) -m32 -= O0 -march=3Di586 DEF(CLANG38_IA32_TARGET) -g +NOOPT_CLANG8ELF_IA32_DLINK_FLAGS =3D DEF(CLANG8ELF_IA32_X64_DLINK_FLA= GS) -Wl,-O0 -Wl,-melf_i386 -Wl,--oformat,elf32-i386 +NOOPT_CLANG8ELF_IA32_DLINK2_FLAGS =3D DEF(CLANG8ELF_IA32_DLINK2_FLAGS)= -O0 -fuse-ld=3Dlld =20 +########################## +# CLANG8ELF X64 definitions +########################## +*_CLANG8ELF_X64_CC_PATH =3D DEF(CLANG8ELF_X64_PREFIX)clang +*_CLANG8ELF_X64_SLINK_PATH =3D DEF(CLANG8ELF_X64_PREFIX)llvm-ar +*_CLANG8ELF_X64_DLINK_PATH =3D DEF(CLANG8ELF_X64_PREFIX)clang +*_CLANG8ELF_X64_ASLDLINK_PATH =3D DEF(CLANG8ELF_X64_PREFIX)clang +*_CLANG8ELF_X64_ASM_PATH =3D DEF(CLANG8ELF_X64_PREFIX)clang +*_CLANG8ELF_X64_PP_PATH =3D DEF(CLANG8ELF_X64_PREFIX)clang +*_CLANG8ELF_X64_VFRPP_PATH =3D DEF(CLANG8ELF_X64_PREFIX)clang +*_CLANG8ELF_X64_ASLCC_PATH =3D DEF(CLANG8ELF_X64_PREFIX)clang +*_CLANG8ELF_X64_ASLPP_PATH =3D DEF(CLANG8ELF_X64_PREFIX)clang +*_CLANG8ELF_X64_RC_PATH =3D DEF(CLANG8ELF_X64_PREFIX)llvm-rc + +*_CLANG8ELF_X64_ASLCC_FLAGS =3D DEF(GCC_ASLCC_FLAGS) -m64 -fno-lt= o DEF(CLANG38_X64_TARGET) +*_CLANG8ELF_X64_ASLDLINK_FLAGS =3D DEF(CLANG8ELF_IA32_X64_ASLDLINK_F= LAGS) -Wl,-m,elf_x86_64 -fuse-ld=3Dlld +*_CLANG8ELF_X64_ASM_FLAGS =3D DEF(GCC5_ASM_FLAGS) -m64 DEF(CLAN= G38_X64_TARGET) +*_CLANG8ELF_X64_RC_FLAGS =3D DEF(GCC_X64_RC_FLAGS) +*_CLANG8ELF_X64_OBJCOPY_FLAGS =3D +*_CLANG8ELF_X64_NASM_FLAGS =3D -f elf64 +*_CLANG8ELF_X64_PP_FLAGS =3D DEF(GCC_PP_FLAGS) DEF(CLANG38_X64= _TARGET) +*_CLANG8ELF_X64_ASLPP_FLAGS =3D DEF(GCC_ASLPP_FLAGS) DEF(CLANG38_= X64_TARGET) +*_CLANG8ELF_X64_VFRPP_FLAGS =3D DEF(GCC_VFRPP_FLAGS) DEF(CLANG38_= X64_TARGET) + +DEBUG_CLANG8ELF_X64_CC_FLAGS =3D DEF(CLANG38_ALL_CC_FLAGS) -m64 "-= DEFIAPI=3D__attribute__((ms_abi))" -mno-red-zone -mcmodel=3Dsmall -fpie -Oz= -flto DEF(CLANG38_X64_TARGET) -g +DEBUG_CLANG8ELF_X64_DLINK_FLAGS =3D DEF(CLANG8ELF_IA32_X64_DLINK_FLAG= S) -flto -Wl,-O3 -Wl,-melf_x86_64 -Wl,--oformat,elf64-x86-64 -Wl,-pie -mcmo= del=3Dsmall -Wl,--apply-dynamic-relocs +DEBUG_CLANG8ELF_X64_DLINK2_FLAGS =3D DEF(CLANG8ELF_X64_DLINK2_FLAGS) -= O3 -fuse-ld=3Dlld + +RELEASE_CLANG8ELF_X64_CC_FLAGS =3D DEF(CLANG38_ALL_CC_FLAGS) -m64 "-= DEFIAPI=3D__attribute__((ms_abi))" -mno-red-zone -mcmodel=3Dsmall -fpie -Oz= -flto DEF(CLANG38_X64_TARGET) +RELEASE_CLANG8ELF_X64_DLINK_FLAGS =3D DEF(CLANG8ELF_IA32_X64_DLINK_FLAG= S) -flto -Wl,-O3 -Wl,-melf_x86_64 -Wl,--oformat,elf64-x86-64 -Wl,-pie -mcmo= del=3Dsmall -Wl,--apply-dynamic-relocs +RELEASE_CLANG8ELF_X64_DLINK2_FLAGS =3D DEF(CLANG8ELF_X64_DLINK2_FLAGS) -= O3 -fuse-ld=3Dlld + +NOOPT_CLANG8ELF_X64_CC_FLAGS =3D DEF(CLANG38_ALL_CC_FLAGS) -m64 "-= DEFIAPI=3D__attribute__((ms_abi))" -mno-red-zone -mcmodel=3Dsmall -fpie -O0= DEF(CLANG38_X64_TARGET) -g +NOOPT_CLANG8ELF_X64_DLINK_FLAGS =3D DEF(CLANG8ELF_IA32_X64_DLINK_FLAG= S) -Wl,-O0 -Wl,-melf_x86_64 -Wl,--oformat,elf64-x86-64 -Wl,-pie -mcmodel=3D= small -Wl,--apply-dynamic-relocs +NOOPT_CLANG8ELF_X64_DLINK2_FLAGS =3D DEF(CLANG8ELF_X64_DLINK2_FLAGS) -= O0 -fuse-ld=3Dlld =20 # # --=20 2.13.0.windows.1 -=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 (#39651): https://edk2.groups.io/g/devel/message/39651 Mute This Topic: https://groups.io/mt/31354050/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- From nobody Sun May 12 12:02:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39652+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39652+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556289784; cv=none; d=zoho.com; s=zohoarc; b=JmoJLwXPVIxBtnai1g9QNcW79Lep3P3uZtE3E137QwH9Cmrsn2WffHQVZNoON7lu7Vj/0ZelQ2wlgDWOKucCxoJiOSl74YgNv6ng2QBNv1P+P44VLhiJtqq0j/uCTd3g1yFLotz+/mJKcJBcoc8WaxtMk/U5EV6FpTAhY93lG/E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556289784; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=Q+vCM5q42GgfPcg2FQA35Bm8gd5jTErhVy+5GaMgXLE=; b=jMhfqC2Sl9n0Ap46xz+u3/EJVeTa0bd9L9uX17dlHyRdwcq01PHUvi76JVt8mdYyEKdnBoLyksts+ZnrR6K3CHCOV/XG2eP2m7bIufgauOCWy7S7+T4Q0TryIi2TueYHEOyQBdhkKZDBzxeKqmHV/G53EaOYZgyz63MpAq2VUc8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39652+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556289784951721.7495131691749; Fri, 26 Apr 2019 07:43:04 -0700 (PDT) Return-Path: X-Received: from mga11.intel.com (mga11.intel.com []) by groups.io with SMTP; Fri, 26 Apr 2019 07:43:04 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Apr 2019 07:43:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,397,1549958400"; d="scan'208";a="145975707" X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.29.102]) by orsmga003.jf.intel.com with ESMTP; 26 Apr 2019 07:43:03 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch 7/7] OvmfPkg: Update DSC/FDF to support CLANG8ELF tool chain Date: Fri, 26 Apr 2019 22:42:42 +0800 Message-Id: <20190426144242.19024-8-liming.gao@intel.com> In-Reply-To: <20190426144242.19024-1-liming.gao@intel.com> References: <20190426144242.19024-1-liming.gao@intel.com> Precedence: Bulk List-Unsubscribe: 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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556289784; bh=TyhtvTn5J40ouLurFa6nmq2tUAJ+8IzBmTNvwjCcAQY=; h=Date:From:Reply-To:Subject:To; b=Fl08Hkr4nBrMmJ/mbUD1Zyvz49TKVu6Mav9DUSLHlqjvad9ydpxbQl57cquqb7NKJcn 5/YhASfHC2fxiYDWs6EWam8E88OHwG0tTc+PEcraRw1QQBlVbOJTh97Mk5quo3hrNGt/X jv05Y0UinQodurY8IpVLJcUuagDOzL4LnEg= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Liming Gao Acked-by: Laszlo Ersek --- OvmfPkg/OvmfPkgIa32.dsc | 4 +++- OvmfPkg/OvmfPkgIa32.fdf | 2 +- OvmfPkg/OvmfPkgIa32X64.dsc | 4 +++- OvmfPkg/OvmfPkgIa32X64.fdf | 2 +- OvmfPkg/OvmfPkgX64.dsc | 4 +++- OvmfPkg/OvmfPkgX64.fdf | 2 +- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 98a8467e86..7972b25112 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -73,12 +73,14 @@ =20 [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 + CLANGGCC:*_*_*_DLINK_FLAGS =3D -z max-page-size=3D0x1000 XCODE:*_*_*_DLINK_FLAGS =3D =20 # Force PE/COFF sections to be aligned at 4KB boundaries to support page l= evel # protection of DXE_SMM_DRIVER/SMM_CORE modules [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_C= ORE] GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 + CLANGGCC:*_*_*_DLINK_FLAGS =3D -z max-page-size=3D0x1000 XCODE:*_*_*_DLINK_FLAGS =3D =20 ##########################################################################= ###### @@ -832,7 +834,7 @@ OvmfPkg/Csm/Csm16/Csm16.inf !endif =20 -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" +!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" AND $(TOOL_CHAIN_TAG) !=3D "CLANG8ELF" ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index bc08bf2243..2894cfe8d6 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -287,7 +287,7 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTa= bleDxe/BootGraphicsResour INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf =20 -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" +!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" AND $(TOOL_CHAIN_TAG) !=3D "CLANG8ELF" INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf !endif INF ShellPkg/Application/Shell/Shell.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index 1f722fc987..c9feeafaae 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -78,12 +78,14 @@ =20 [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 + CLANGGCC:*_*_*_DLINK_FLAGS =3D -z max-page-size=3D0x1000 XCODE:*_*_*_DLINK_FLAGS =3D =20 # Force PE/COFF sections to be aligned at 4KB boundaries to support page l= evel # protection of DXE_SMM_DRIVER/SMM_CORE modules [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_C= ORE] GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 + CLANGGCC:*_*_*_DLINK_FLAGS =3D -z max-page-size=3D0x1000 XCODE:*_*_*_DLINK_FLAGS =3D =20 ##########################################################################= ###### @@ -841,7 +843,7 @@ OvmfPkg/Csm/Csm16/Csm16.inf !endif =20 -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" +!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" AND $(TOOL_CHAIN_TAG) !=3D "CLANG8ELF" ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index ccf36c5dd9..affce983f9 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -288,7 +288,7 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTa= bleDxe/BootGraphicsResour INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf =20 -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" +!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" AND $(TOOL_CHAIN_TAG) !=3D "CLANG8ELF" INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf !endif INF ShellPkg/Application/Shell/Shell.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 2927ee07b8..f28ec13c0c 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -78,12 +78,14 @@ =20 [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 + CLANGGCC:*_*_*_DLINK_FLAGS =3D -z max-page-size=3D0x1000 XCODE:*_*_*_DLINK_FLAGS =3D =20 # Force PE/COFF sections to be aligned at 4KB boundaries to support page l= evel # protection of DXE_SMM_DRIVER/SMM_CORE modules [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_C= ORE] GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 + CLANGGCC:*_*_*_DLINK_FLAGS =3D -z max-page-size=3D0x1000 XCODE:*_*_*_DLINK_FLAGS =3D =20 ##########################################################################= ###### @@ -839,7 +841,7 @@ OvmfPkg/Csm/Csm16/Csm16.inf !endif =20 -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" +!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" AND $(TOOL_CHAIN_TAG) !=3D "CLANG8ELF" ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index ccf36c5dd9..affce983f9 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -288,7 +288,7 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTa= bleDxe/BootGraphicsResour INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf =20 -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" +!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" AND $(TOOL_CHAIN_TAG) !=3D "CLANG8ELF" INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf !endif INF ShellPkg/Application/Shell/Shell.inf --=20 2.13.0.windows.1 -=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 (#39652): https://edk2.groups.io/g/devel/message/39652 Mute This Topic: https://groups.io/mt/31354051/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-