From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web11.3278.1571297235922198676 for ; Thu, 17 Oct 2019 00:27:16 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: ray.ni@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Oct 2019 00:27:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,306,1566889200"; d="scan'208";a="396166264" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by fmsmga005.fm.intel.com with ESMTP; 17 Oct 2019 00:27:14 -0700 Received: from fmsmsx121.amr.corp.intel.com (10.18.125.36) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 17 Oct 2019 00:27:14 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx121.amr.corp.intel.com (10.18.125.36) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 17 Oct 2019 00:27:13 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.166]) by SHSMSX152.ccr.corp.intel.com ([10.239.6.52]) with mapi id 14.03.0439.000; Thu, 17 Oct 2019 15:27:11 +0800 From: "Ni, Ray" To: "Gao, Liming" , "devel@edk2.groups.io" CC: "Justen, Jordan L" , Andrew Fish Subject: Re: [Patch v3 10/11] EmulatorPkg: Enable CLANG9 tool chain Thread-Topic: [Patch v3 10/11] EmulatorPkg: Enable CLANG9 tool chain Thread-Index: AQHVhLgBxwyRGl2zS0uGy+G7za0y3adeboSw Date: Thu, 17 Oct 2019 07:27:11 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D5C325BB0@SHSMSX104.ccr.corp.intel.com> References: <1571295356-11608-1-git-send-email-liming.gao@intel.com> <1571295356-11608-11-git-send-email-liming.gao@intel.com> In-Reply-To: <1571295356-11608-11-git-send-email-liming.gao@intel.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: ray.ni@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Liming, Emulator is using a generic SEC module. The host specific module is called = "Host". So I prefer to change the macro to "WIN_HOST_BUILD", with this change, Revi= ewed-by: Ray Ni > -----Original Message----- > From: Gao, Liming > Sent: Thursday, October 17, 2019 2:56 PM > To: devel@edk2.groups.io > Cc: Justen, Jordan L ; Andrew Fish > ; Ni, Ray > Subject: [Patch v3 10/11] EmulatorPkg: Enable CLANG9 tool chain >=20 > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1603 > 1. Add WIN_SEC_BUILD macro check for CLANG9 tool chain build -p > EmulatorPkg\EmulatorPkg.dsc -a IA32 -DWIN_SEC_BUILD=3DTRUE -t CLANG9 > build -p EmulatorPkg\EmulatorPkg.dsc -a X64 -DWIN_SEC_BUILD=3DTRUE -t > CLANG9 2. Append CLANG CC and LINK flags to generate windows HOST. > 3. Fix WinHost issue to call GetProcessAffinityMask() API. > The input parameter should be UINTN pointer instead of UINT32 pointer. >=20 > Cc: Jordan Justen > Cc: Andrew Fish > Cc: Ray Ni > Signed-off-by: Liming Gao > --- > EmulatorPkg/Win/Host/WinHost.c | 6 +++--- > EmulatorPkg/EmulatorPkg.dsc | 7 ++++++- > EmulatorPkg/Win/Host/WinHost.inf | 6 ++++++ > 3 files changed, 15 insertions(+), 4 deletions(-) >=20 > diff --git a/EmulatorPkg/Win/Host/WinHost.c > b/EmulatorPkg/Win/Host/WinHost.c index 9aba3c8959..e40ce32548 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 > ) > @@ -391,8 +391,8 @@ Returns: > VOID *SecFile; > CHAR16 *MemorySizeStr; > CHAR16 *FirmwareVolumesStr; > - UINT32 ProcessAffinityMask; > - UINT32 SystemAffinityMask; > + UINTN ProcessAffinityMask; > + UINTN SystemAffinityMask; > INT32 LowBit; >=20 > // > diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc > index 20f1187713..72532f5daf 100644 > --- a/EmulatorPkg/EmulatorPkg.dsc > +++ b/EmulatorPkg/EmulatorPkg.dsc > @@ -237,9 +237,10 @@ >=20 > [Components] > !if "IA32" in $(ARCH) || "X64" in $(ARCH) > - !if "MSFT" in $(FAMILY) > + !if "MSFT" in $(FAMILY) || $(WIN_SEC_BUILD) =3D=3D TRUE > ## > # Emulator, OS WIN application > + # CLANG9 is cross OS tool chain. It depends on WIN_SEC_BUILD macro. > ## > EmulatorPkg/Win/Host/WinHost.inf > !else > @@ -419,7 +420,11 @@ >=20 > MSFT:DEBUG_*_*_CC_FLAGS =3D /Od /Oy- > MSFT:NOOPT_*_*_CC_FLAGS =3D /Od /Oy- > + GCC:DEBUG_CLANG9_*_CC_FLAGS =3D-O0 -Wno-unused-command-line- > argument > + -Wno-incompatible-pointer-types -Wno-enum-conversion > + -Wno-incompatible-pointer-types -Wno-sometimes-uninitialized > + -Wno-constant-conversion -Wno-main-return-type >=20 > MSFT:*_*_*_DLINK_FLAGS =3D /ALIGN:4096 /FILEALIGN:4096 > /SUBSYSTEM:CONSOLE > 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 > /SUBSYSTEM:CONSOLE > + GCC:DEBUG_CLANG9_*_DLINK_FLAGS =3D > + /EXPORT:InitializeDriver=3D$(IMAGE_ENTRY_POINT) /BASE:0x10000 > + GCC:NOOPT_CLANG9_*_DLINK_FLAGS =3D > + /EXPORT:InitializeDriver=3D$(IMAGE_ENTRY_POINT) /BASE:0x10000 > diff --git a/EmulatorPkg/Win/Host/WinHost.inf > b/EmulatorPkg/Win/Host/WinHost.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:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x64" > /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP > /OPT:REF /DEBUG /MACHINE:AMD64 /LTCG Kernel32.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 /W= 0 /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:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x64" > /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x64" > /LIBPATH:"%VCToolsInstallDir%lib\x64" /NOLOGO /SUBSYSTEM:CONSOLE > /NODEFAULTLIB /IGNORE:4086 /OPT:REF /DEBUG /MACHINE:AMD64 > Kernel32.lib MSVCRTD.lib vcruntimed.lib ucrtd.lib Gdi32.lib User32.lib > Winmm.lib Advapi32.lib /lldmap > /EXPORT:InitializeDriver=3D_ModuleEntryPoint > + GCC:*_CLANG9_X64_CC_FLAGS =3D=3D -m64 -g -fshort-wchar > + -fno-strict-aliasing -Wall -c -include AutoGen.h -D > + _CRT_SECURE_NO_WARNINGS -Wnonportable-include-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:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x86" > /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x86" > /LIBPATH:"%VCToolsInstallDir%ib\x86" /NOLOGO /SUBSYSTEM:CONSOLE > /NODEFAULTLIB /IGNORE:4086 /OPT:REF /DEBUG /MACHINE:I386 > Kernel32.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-aliasing -Wall -c -include AutoGen.h -D > + _CRT_SECURE_NO_WARNINGS -Wnonportable-include-path -D UNICODE > -D > + _CRT_SECURE_NO_DEPRECATE > -- > 2.13.0.windows.1