Reviewed-by: Ray Ni <ray...@intel.com> > -----Original Message----- > From: Gao, Liming <liming....@intel.com> > Sent: Thursday, November 14, 2019 4:25 PM > To: devel@edk2.groups.io > Cc: Ni, Ray <ray...@intel.com>; Andrew Fish <af...@apple.com> > Subject: [Patch 5/5] EmulatorPkg DSC and WinHost.inf: Update tool chain > name to CLANGPDB > > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2341 > > Signed-off-by: Liming Gao <liming....@intel.com> > Cc: Ray Ni <ray...@intel.com> > Cc: Andrew Fish <af...@apple.com> > --- > EmulatorPkg/EmulatorPkg.dsc | 12 ++++++------ > EmulatorPkg/Win/Host/WinHost.inf | 8 ++++---- > 2 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc > index 109685b062..1fc924ae5a 100644 > --- a/EmulatorPkg/EmulatorPkg.dsc > +++ b/EmulatorPkg/EmulatorPkg.dsc > @@ -240,7 +240,7 @@ > !if "MSFT" in $(FAMILY) || $(WIN_HOST_BUILD) == TRUE > ## > # Emulator, OS WIN application > - # CLANG9 is cross OS tool chain. It depends on WIN_HOST_BUILD flag > + # CLANGPDB is cross OS tool chain. It depends on WIN_HOST_BUILD > + flag > # to build WinHost application. > ## > EmulatorPkg/Win/Host/WinHost.inf > @@ -421,7 +421,7 @@ > > MSFT:DEBUG_*_*_CC_FLAGS = /Od /Oy- > MSFT:NOOPT_*_*_CC_FLAGS = /Od /Oy- > - GCC:DEBUG_CLANG9_*_CC_FLAGS =-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 > + GCC:DEBUG_CLANGPDB_*_CC_FLAGS =-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 > > MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096 /FILEALIGN:4096 > /SUBSYSTEM:CONSOLE > MSFT:DEBUG_*_*_DLINK_FLAGS = > /EXPORT:InitializeDriver=$(IMAGE_ENTRY_POINT) /BASE:0x10000 @@ -429,9 > +429,9 @@ > > !if $(WIN_HOST_BUILD) == TRUE > # > - # CLANG9 tool chain depends on WIN_HOST_BUILD flag to generate the > windows application. > + # CLANGPDB tool chain depends on WIN_HOST_BUILD flag to generate > the windows application. > # > - GCC:*_CLANG9_*_DLINK_FLAGS = /ALIGN:4096 /FILEALIGN:4096 > /SUBSYSTEM:CONSOLE > - GCC:DEBUG_CLANG9_*_DLINK_FLAGS = > /EXPORT:InitializeDriver=$(IMAGE_ENTRY_POINT) /BASE:0x10000 > - GCC:NOOPT_CLANG9_*_DLINK_FLAGS = > /EXPORT:InitializeDriver=$(IMAGE_ENTRY_POINT) /BASE:0x10000 > + GCC:*_CLANGPDB_*_DLINK_FLAGS = /ALIGN:4096 /FILEALIGN:4096 > /SUBSYSTEM:CONSOLE > + GCC:DEBUG_CLANGPDB_*_DLINK_FLAGS = > + /EXPORT:InitializeDriver=$(IMAGE_ENTRY_POINT) /BASE:0x10000 > + GCC:NOOPT_CLANGPDB_*_DLINK_FLAGS = > + /EXPORT:InitializeDriver=$(IMAGE_ENTRY_POINT) /BASE:0x10000 > !endif > diff --git a/EmulatorPkg/Win/Host/WinHost.inf > b/EmulatorPkg/Win/Host/WinHost.inf > index 1adca10d79..e0b3ecb15b 100644 > --- a/EmulatorPkg/Win/Host/WinHost.inf > +++ b/EmulatorPkg/Win/Host/WinHost.inf > @@ -96,8 +96,8 @@ > MSFT:*_*_X64_ASM_FLAGS == /nologo /W3 /WX /c /Cx /Zd /W0 /Zi > MSFT:*_*_X64_ASMLINK_FLAGS == /link /nologo > > - GCC:*_CLANG9_X64_DLINK_FLAGS == > /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=_ModuleEntryPoint > - GCC:*_CLANG9_X64_CC_FLAGS == -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:*_CLANGPDB_X64_DLINK_FLAGS == > /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=_ModuleEntryPoint > + GCC:*_CLANGPDB_X64_CC_FLAGS == -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 == > /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=_ModuleEntryPoint > - GCC:*_CLANG9_IA32_CC_FLAGS == -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 > + GCC:*_CLANGPDB_IA32_DLINK_FLAGS == > /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=_ModuleEntryPoint > + GCC:*_CLANGPDB_IA32_CC_FLAGS == -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
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#50654): https://edk2.groups.io/g/devel/message/50654 Mute This Topic: https://groups.io/mt/57226597/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
