From nobody Fri Dec 19 07:17:11 2025 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+48202+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+48202+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1569570441; cv=none; d=zoho.com; s=zohoarc; b=DhtgBrQMHlMiG/HXLICKLjdbmT8SN5XkglNPdZa1NlgheMC12E0eWv7xiuZ3R03Rk6PgvYnRwYBeJsgU0QXq1cqOKT36ZWCpFh1VS4D25O8ANW6lsxhcwiBvdm5oTn3qf6RiL5Hn9bpU8TuAnnTiOOEg84NtgSDxqGNx5naE1m8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569570441; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=UbATbKrtEM1cuYCdMqRhGOmVe52hCIG7IDBA1O8YLxk=; b=SLXJ1fdlJb16wMyp0Ga9PE/ZGXLjBZ55cBAAClbjgPKXvRpXIvRT/Qx+VP70g8FHVW9OWYvfdaDpr9cfXesPRLvfAnbwYrQG1rJqL6wsFWtEQUTMlGqFb3eVDDS0i5v5JL1LowMAkKMEx72+gVIUbVTKbXQ6oRlSoHsJKqnkIKI= 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+48202+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 1569570441428878.928013118074; Fri, 27 Sep 2019 00:47:21 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id wUdMYY1788612xNEy4axJTy5; Fri, 27 Sep 2019 00:47:20 -0700 X-Received: from mga03.intel.com (mga03.intel.com []) by groups.io with SMTP; Fri, 27 Sep 2019 00:47:20 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Sep 2019 00:47:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,554,1559545200"; d="scan'208";a="389884751" X-Received: from shwde7172.ccr.corp.intel.com ([10.239.158.22]) by fmsmga005.fm.intel.com with ESMTP; 27 Sep 2019 00:47:19 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch 10/12] EmulatorPkg: Enable CLANG9 tool chain Date: Fri, 27 Sep 2019 15:46:33 +0800 Message-Id: <1569570395-11240-11-git-send-email-liming.gao@intel.com> In-Reply-To: <1569570395-11240-1-git-send-email-liming.gao@intel.com> References: <1569570395-11240-1-git-send-email-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 X-Gm-Message-State: A2yLWZDNDO6dA2DoABFXB7Zyx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1569570440; bh=jypEdr0dUyNfywUUnYaZIlDkq7TCQ1zpqnJF4dZZZN4=; h=Date:From:Reply-To:Subject:To; b=J5w6pt7+DdfR4MIMThR5Sh20beckCNecAuR+3bgJ5nWoxKQoA2m7dttLC3yTb/vU+XQ B0p4sFhdwuPEmx+fKG2nn/t9zwXHPe/kGC5Ko0Blk1OX9lu3vg3oAixs7ZZO/y2nXOVdX 5zDiv5MYqGT3nuahhgLhASxECCTRwWCad3w= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 1. Append CLANG CC and LINK flags to generate windows HOST. 2. Modify WinHost to move PCD getting in the late position Signed-off-by: Liming Gao --- EmulatorPkg/Win/Host/WinHost.c | 11 +++++++---- EmulatorPkg/EmulatorPkg.dsc | 8 ++++++-- EmulatorPkg/EmulatorPkg.fdf | 2 +- EmulatorPkg/Win/Host/WinHost.inf | 6 ++++++ 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/EmulatorPkg/Win/Host/WinHost.c b/EmulatorPkg/Win/Host/WinHost.c index 9aba3c8959..d51a96de7b 100644 --- a/EmulatorPkg/Win/Host/WinHost.c +++ b/EmulatorPkg/Win/Host/WinHost.c @@ -356,7 +356,7 @@ Returns: INTN EFIAPI main ( - IN INTN Argc, + IN INT Argc, IN CHAR8 **Argv, IN CHAR8 **Envp ) @@ -405,9 +405,6 @@ Returns: AdjustTokenPrivileges(Token, FALSE, &TokenPrivileges, 0, (PTOKEN_PRIVI= LEGES) NULL, 0); } =20 - MemorySizeStr =3D (CHAR16 *) PcdGetPtr (PcdEmuMemorySize); - FirmwareVolumesStr =3D (CHAR16 *) PcdGetPtr (PcdEmuFirmwareVolume); - SecPrint ("\n\rEDK II WIN Host Emulation Environment from http://www.tia= nocore.org/edk2/\n\r"); =20 // @@ -423,6 +420,12 @@ Returns: SetProcessAffinityMask (GetCurrentProcess (), (INTN)(BIT0 << LowBit)= ); } } + =20 + // + // Move PCD getting late + // + MemorySizeStr =3D (CHAR16 *) PcdGetPtr (PcdEmuMemorySize); + FirmwareVolumesStr =3D (CHAR16 *) PcdGetPtr (PcdEmuFirmwareVolume); =20 // // Make some Windows calls to Set the process to the highest priority in= the diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc index 20f1187713..21620d4e94 100644 --- a/EmulatorPkg/EmulatorPkg.dsc +++ b/EmulatorPkg/EmulatorPkg.dsc @@ -237,7 +237,7 @@ =20 [Components] !if "IA32" in $(ARCH) || "X64" in $(ARCH) - !if "MSFT" in $(FAMILY) + !if "MSFT" in $(FAMILY) || "CLANG9" in $(TOOL_CHAIN_TAG) ## # Emulator, OS WIN application ## @@ -377,7 +377,7 @@ =20 FatPkg/EnhancedFatDxe/Fat.inf =20 -!if "XCODE5" not in $(TOOL_CHAIN_TAG) +!if "XCODE5" not in $(TOOL_CHAIN_TAG) and "CLANG9" not in $(TOOL_CHAIN_TAG) ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE @@ -419,7 +419,11 @@ =20 MSFT:DEBUG_*_*_CC_FLAGS =3D /Od /Oy- MSFT:NOOPT_*_*_CC_FLAGS =3D /Od /Oy- + GCC:DEBUG_CLANG9_*_CC_FLAGS =3D-O0 -D UNICODE -Wno-unused-command-line-a= rgument -Wno-incompatible-pointer-types -Wno-enum-conversion -Wno-incompati= ble-pointer-types -Wno-sometimes-uninitialized -Wno-constant-conversion -Wn= o-main-return-type =20 MSFT:*_*_*_DLINK_FLAGS =3D /ALIGN:4096 /FILEALIGN:4096 /SUBSYSTEM:CO= NSOLE MSFT:DEBUG_*_*_DLINK_FLAGS =3D /EXPORT:InitializeDriver=3D$(IMAGE_ENTRY_= POINT) /BASE:0x10000 MSFT:NOOPT_*_*_DLINK_FLAGS =3D /EXPORT:InitializeDriver=3D$(IMAGE_ENTRY_= POINT) /BASE:0x10000 + GCC:*_CLANG9_*_DLINK_FLAGS =3D /ALIGN:4096 /FILEALIGN:4096 /SUBSYSTE= M:CONSOLE + GCC:DEBUG_CLANG9_*_DLINK_FLAGS =3D /EXPORT:InitializeDriver=3D$(IMAGE_EN= TRY_POINT) /BASE:0x10000 + GCC:NOOPT_CLANG9_*_DLINK_FLAGS =3D /EXPORT:InitializeDriver=3D$(IMAGE_EN= TRY_POINT) /BASE:0x10000 diff --git a/EmulatorPkg/EmulatorPkg.fdf b/EmulatorPkg/EmulatorPkg.fdf index 295f6f1db8..59d9927d29 100644 --- a/EmulatorPkg/EmulatorPkg.fdf +++ b/EmulatorPkg/EmulatorPkg.fdf @@ -196,7 +196,7 @@ INF EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf =20 INF FatPkg/EnhancedFatDxe/Fat.inf =20 -!if "XCODE5" not in $(TOOL_CHAIN_TAG) +!if "XCODE5" not in $(TOOL_CHAIN_TAG) and "CLANG9" not in $(TOOL_CHAIN_TAG) INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf !endif INF ShellPkg/Application/Shell/Shell.inf diff --git a/EmulatorPkg/Win/Host/WinHost.inf b/EmulatorPkg/Win/Host/WinHos= t.inf index 631d5a6470..1adca10d79 100644 --- a/EmulatorPkg/Win/Host/WinHost.inf +++ b/EmulatorPkg/Win/Host/WinHost.inf @@ -95,3 +95,9 @@ MSFT:*_VS2017_X64_DLINK_FLAGS =3D /LIBPATH:"%VCToolsInstallDir%lib\= x64" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x64" /LIBPATH:"%W= indowsSdkDir%lib\%WindowsSDKLibVersion%\um\x64" /NOLOGO /SUBSYSTEM:CONSOLE = /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:AMD64 /LTCG Kernel= 32.lib MSVCRTD.lib vcruntimed.lib ucrtd.lib Gdi32.lib User32.lib Winmm.lib = Advapi32.lib MSFT:*_*_X64_ASM_FLAGS =3D=3D /nologo /W3 /WX /c /Cx /Zd /W0 = /Zi MSFT:*_*_X64_ASMLINK_FLAGS =3D=3D /link /nologo + + GCC:*_CLANG9_X64_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\$(BASE_NAME).exe" /= base:0x10000000 /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" /LIBPATH:"%UniversalCRT= SdkDir%lib\%UCRTVersion%\ucrt\x64" /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDK= LibVersion%\um\x64" /LIBPATH:"%VCToolsInstallDir%lib\x64" /NOLOGO /SUBSYS= TEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /OPT:REF /DEBUG /MACHINE:AMD64 Kern= el32.lib MSVCRTD.lib vcruntimed.lib ucrtd.lib Gdi32.lib User32.lib Winmm.li= b Advapi32.lib /lldmap /EXPORT:InitializeDriver=3D_ModuleEntryPoint + GCC:*_CLANG9_X64_CC_FLAGS =3D=3D -m64 -g -fshort-wchar -fno-strict-alias= ing -Wall -c -include AutoGen.h -D _CRT_SECURE_NO_WARNINGS -Wnonportable-in= clude-path -D UNICODE -D _CRT_SECURE_NO_DEPRECATE + + GCC:*_CLANG9_IA32_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\$(BASE_NAME).exe" = /base:0x10000000 /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" /LIBPATH:"%UniversalCRT= SdkDir%lib\%UCRTVersion%\ucrt\x86" /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDK= LibVersion%\um\x86" /LIBPATH:"%VCToolsInstallDir%ib\x86" /NOLOGO /SUBSYST= EM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /OPT:REF /DEBUG /MACHINE:I386 Kernel= 32.lib MSVCRTD.lib vcruntimed.lib ucrtd.lib Gdi32.lib User32.lib Winmm.lib = Advapi32.lib /lldmap /EXPORT:InitializeDriver=3D_ModuleEntryPoint + GCC:*_CLANG9_IA32_CC_FLAGS =3D=3D -m32 -g -fshort-wchar -fno-strict-alia= sing -Wall -c -include AutoGen.h -D _CRT_SECURE_NO_WARNINGS -Wnonportable-i= nclude-path -D UNICODE -D _CRT_SECURE_NO_DEPRECATE --=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 (#48202): https://edk2.groups.io/g/devel/message/48202 Mute This Topic: https://groups.io/mt/34309063/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-