From nobody Thu Apr 25 21:02:05 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+47064+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+47064+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1568093995; cv=none; d=zoho.com; s=zohoarc; b=dvnGrMX1RW4AOewvAZGAU9ck/Pmn2awqDn3dKTDUcTegJLCTUB7vmRpK3yufJmeyg23ZeVoWE21R1yahzLdz4mPhO0Ryagy9JwQcwwarJReoPV3g7a5QiwdfhcnZ5qG67z+9o76yMPjpJ7bdEZzaqFdIoSeR2vTiD6AYfCK32x4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568093995; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To:ARC-Authentication-Results; bh=WCntUD0jzf70sgNI2/WpRKhUQYcxwrxdKNdwBE2loWM=; b=VqfNWZN8pK1H+ODPIeVZ8SlVXsOAm6A2mMuDUZnNVAPIy2IbFWC4pEu0VmmpOBOj8wxRgsekOcMSDwisWms2G9fpCAb+NEzunNtkmhjJQlnJUo5QXTqbE2OKRVTi2U/wBcyMYbmtnGJv1ogVnoxpsGkZ2+qEiui8tPhxe9MMhUY= 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+47064+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 1568093995585786.3250957304163; Mon, 9 Sep 2019 22:39:55 -0700 (PDT) Return-Path: X-Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by groups.io with SMTP; Mon, 09 Sep 2019 22:39:54 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Sep 2019 22:39:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,487,1559545200"; d="scan'208";a="178568665" X-Received: from unknown (HELO chingjex-MOBL.gar.corp.intel.com) ([10.5.246.26]) by orsmga008.jf.intel.com with ESMTP; 09 Sep 2019 22:39:52 -0700 From: "Cheng, Ching JenX" To: devel@edk2.groups.io Cc: Amy Chan , Bob Feng , Liming Gao Subject: [edk2-devel] [PATCH] Add VS2019 Toolchain def Date: Tue, 10 Sep 2019 13:40:05 +0800 Message-Id: <20190910054005.16264-1-ching.jenx.cheng@intel.com> MIME-Version: 1.0 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,ching.jenx.cheng@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568093995; bh=ow+jTmq/c/qnk1gQa18+bGCx5T9K9yo1clNZiSkwzRQ=; h=Cc:Date:From:Reply-To:Subject:To; b=CfPJ68pNQ29qaekokSG4SiBuW7bGY3VwAx/RxJ6QCbClzUU8nENqD3VBkWNGQpwINCe 3KLDpSoglkaCxxb4QqpnGMBGexqnVQysoCJ6OS9XMpFlIYy+HJeMW4j6uUqQlovLndCIN 8injskguFgQyE3TK0Nc6rruUQAnAWuwz/oA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2182 In order to support VS2019, the first thing need to do is add 2019 toolchain on tools_def.template Change-Id: Id52abdc9762cf06bb9a38bbfd1153608c878d839 Cc: Amy Chan Cc: Bob Feng Cc: Liming Gao Signed-off-by: Ching JenX Cheng --- BaseTools/Conf/tools_def.template | 134 ++++++++++++++++++++++++++++++++++= +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++= +++++++++++++------------ 1 file changed, 122 insertions(+), 12 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.t= emplate index 8f0e6cb6c2..7585a3e5db 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -63,27 +63,35 @@ DEFINE VS2017_BIN_X64 =3D DEF(VS2017_BIN)\HostDEF(V= S2017_HOST)\x64 DEFINE VS2017_BIN_ARM =3D DEF(VS2017_BIN)\HostDEF(VS2017_HOST)\arm DEFINE VS2017_BIN_AARCH64 =3D DEF(VS2017_BIN)\HostDEF(VS2017_HOST)\arm64 =20 -DEFINE WINSDK_BIN =3D ENV(WINSDK_PREFIX) -DEFINE WINSDKx86_BIN =3D ENV(WINSDKx86_PREFIX) +DEFINE VS2019_BIN =3D ENV(VS2019_PREFIX)bin +DEFINE VS2019_HOST =3D x86 +DEFINE VS2019_BIN_HOST =3D DEF(VS2019_BIN)\HostDEF(VS2019_HOST)\DEF(VS2= 019_HOST) +DEFINE VS2019_BIN_IA32 =3D DEF(VS2019_BIN)\HostDEF(VS2019_HOST)\x86 +DEFINE VS2019_BIN_X64 =3D DEF(VS2019_BIN)\HostDEF(VS2019_HOST)\x64 +DEFINE VS2019_BIN_ARM =3D DEF(VS2019_BIN)\HostDEF(VS2019_HOST)\arm +DEFINE VS2019_BIN_AARCH64 =3D DEF(VS2019_BIN)\HostDEF(VS2019_HOST)\arm64 + +DEFINE WINSDK_BIN =3D ENV(WINSDK_PREFIX) +DEFINE WINSDKx86_BIN =3D ENV(WINSDKx86_PREFIX) =20 # Microsoft Visual Studio 2010 -DEFINE WINSDK7_BIN =3D ENV(WINSDK7_PREFIX) -DEFINE WINSDK7x86_BIN =3D ENV(WINSDK7x86_PREFIX) +DEFINE WINSDK7_BIN =3D ENV(WINSDK7_PREFIX) +DEFINE WINSDK7x86_BIN =3D ENV(WINSDK7x86_PREFIX) =20 # Microsoft Visual Studio 2012 Update 1 (required for rc.exe that was not = included in the initial release) -DEFINE WINSDK71_BIN =3D ENV(WINSDK71_PREFIX) -DEFINE WINSDK71x86_BIN =3D ENV(WINSDK71x86_PREFIX) +DEFINE WINSDK71_BIN =3D ENV(WINSDK71_PREFIX) +DEFINE WINSDK71x86_BIN =3D ENV(WINSDK71x86_PREFIX) =20 # Microsoft Visual Studio 2013 Professional Edition -DEFINE WINSDK8_BIN =3D ENV(WINSDK8_PREFIX)x86\ -DEFINE WINSDK8x86_BIN =3D ENV(WINSDK8x86_PREFIX)x64 +DEFINE WINSDK8_BIN =3D ENV(WINSDK8_PREFIX)x86\ +DEFINE WINSDK8x86_BIN =3D ENV(WINSDK8x86_PREFIX)x64 =20 # Microsoft Visual Studio 2015 Professional Edition -DEFINE WINSDK81_BIN =3D ENV(WINSDK81_PREFIX)x86\ -DEFINE WINSDK81x86_BIN =3D ENV(WINSDK81x86_PREFIX)x64 +DEFINE WINSDK81_BIN =3D ENV(WINSDK81_PREFIX)x86\ +DEFINE WINSDK81x86_BIN =3D ENV(WINSDK81x86_PREFIX)x64 =20 -# Microsoft Visual Studio 2017 Professional Edition -DEFINE WINSDK10_BIN =3D ENV(WINSDK10_PREFIX)DEF(VS2017_HOST) +# Microsoft Visual Studio 2017/2019 Professional Edition +DEFINE WINSDK10_BIN =3D ENV(WINSDK10_PREFIX)DEF(VS2017_HOST) =20 # These defines are needed for certain Microsoft Visual Studio tools that # are used by other toolchains. An example is that ICC on Windows normally @@ -218,6 +226,17 @@ DEFINE DTC_BIN =3D ENV(DTC_PREFIX)dtc # Note: # Building of XIP firmware images for ARM/ARM6= 4 is not currently supported (only applications). # /FILEALIGN:4096 and other changes are needed= for ARM firmware builds. +# VS2019 -win32- Requires: +# Microsoft Visual Studio 2019 version 16.2 or= later +# Optional: +# Required to build EBC drivers: +# Intel(r) Compiler for Efi Byte Code (Intel= (r) EBC Compiler) +# Required to build platforms or ACPI tables: +# Intel(r) ACPI Compiler (iasl.exe) from +# https://acpica.org/downloads +# Note: +# Building of XIP firmware images for ARM/ARM6= 4 is not currently supported (only applications). +# /FILEALIGN:4096 and other changes are needed= for ARM firmware builds. # GCC48 -Linux,Windows- Requires: # GCC 4.8 targeting x86_64-linux-gnu, aarch64-= linux-gnu, or arm-linux-gnueabi # Optional: @@ -1691,6 +1710,97 @@ NOOPT_VS2017_AARCH64_DLINK_FLAGS =3D /NOLOGO /NODE= FAULTLIB /IGNORE:4001 /OPT:REF *_VS2017_EBC_SLINK_FLAGS =3D /lib /NOLOGO /MACHINE:EBC *_VS2017_EBC_DLINK_FLAGS =3D "C:\Program Files (x86)\Intel\EBC\Lib= \EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENT= RY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER =20 +##########################################################################= ########## +# VS2019 - Microsoft Visual Studio 2017 with Intel ASL +# ASL - Intel ACPI Source Language Compiler (iasl.exe) +##########################################################################= ########## +# VS2019 - Microsoft Visual Studio 2017 professional Edition w= ith Intel ASL +*_VS2019_*_*_FAMILY =3D MSFT +*_VS2019_*_*_DLL =3D DEF(VS2019_BIN_HOST) + +*_VS2019_*_MAKE_PATH =3D DEF(VS2019_BIN_HOST)\nmake.exe +*_VS2019_*_MAKE_FLAG =3D /nologo +*_VS2019_*_RC_PATH =3D DEF(WINSDK10_BIN)\rc.exe + +*_VS2019_*_MAKE_FLAGS =3D /nologo +*_VS2019_*_SLINK_FLAGS =3D /NOLOGO /LTCG +*_VS2019_*_APP_FLAGS =3D /nologo /E /TC +*_VS2019_*_PP_FLAGS =3D /nologo /E /TC /FIAutoGen.h +*_VS2019_*_VFRPP_FLAGS =3D /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAM= E)StrDefs.h +*_VS2019_*_DLINK2_FLAGS =3D /WHOLEARCHIVE +*_VS2019_*_ASM16_PATH =3D DEF(VS2019_BIN_IA32)\ml.exe + +################## +# ASL definitions +################## +*_VS2019_*_ASL_PATH =3D DEF(WIN_IASL_BIN) +*_VS2019_*_ASL_FLAGS =3D DEF(DEFAULT_WIN_ASL_FLAGS) +*_VS2019_*_ASL_OUTFLAGS =3D DEF(DEFAULT_WIN_ASL_OUTFLAGS) +*_VS2019_*_ASLCC_FLAGS =3D DEF(MSFT_ASLCC_FLAGS) +*_VS2019_*_ASLPP_FLAGS =3D DEF(MSFT_ASLPP_FLAGS) +*_VS2019_*_ASLDLINK_FLAGS =3D DEF(MSFT_ASLDLINK_FLAGS) + +################## +# IA32 definitions +################## +*_VS2019_IA32_CC_PATH =3D DEF(VS2019_BIN_IA32)\cl.exe +*_VS2019_IA32_VFRPP_PATH =3D DEF(VS2019_BIN_IA32)\cl.exe +*_VS2019_IA32_ASLCC_PATH =3D DEF(VS2019_BIN_IA32)\cl.exe +*_VS2019_IA32_ASLPP_PATH =3D DEF(VS2019_BIN_IA32)\cl.exe +*_VS2019_IA32_SLINK_PATH =3D DEF(VS2019_BIN_IA32)\lib.exe +*_VS2019_IA32_DLINK_PATH =3D DEF(VS2019_BIN_IA32)\link.exe +*_VS2019_IA32_ASLDLINK_PATH=3D DEF(VS2019_BIN_IA32)\link.exe +*_VS2019_IA32_APP_PATH =3D DEF(VS2019_BIN_IA32)\cl.exe +*_VS2019_IA32_PP_PATH =3D DEF(VS2019_BIN_IA32)\cl.exe +*_VS2019_IA32_ASM_PATH =3D DEF(VS2019_BIN_IA32)\ml.exe + + *_VS2019_IA32_MAKE_FLAGS =3D /nologo + DEBUG_VS2019_IA32_CC_FLAGS =3D /nologo /arch:IA32 /c /WX /GS- /W4 /Gs= 32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Gw /MP +RELEASE_VS2019_IA32_CC_FLAGS =3D /nologo /arch:IA32 /c /WX /GS- /W4 /Gs= 32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw /MP +NOOPT_VS2019_IA32_CC_FLAGS =3D /nologo /arch:IA32 /c /WX /GS- /W4 /Gs= 32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Od /MP + + DEBUG_VS2019_IA32_ASM_FLAGS =3D /nologo /c /WX /W3 /Cx /coff /Zd /Zi +RELEASE_VS2019_IA32_ASM_FLAGS =3D /nologo /c /WX /W3 /Cx /coff /Zd +NOOPT_VS2019_IA32_ASM_FLAGS =3D /nologo /c /WX /W3 /Cx /coff /Zd /Zi + + DEBUG_VS2019_IA32_NASM_FLAGS =3D -Ox -f win32 -g +RELEASE_VS2019_IA32_NASM_FLAGS =3D -Ox -f win32 +NOOPT_VS2019_IA32_NASM_FLAGS =3D -O0 -f win32 -g + + DEBUG_VS2019_IA32_DLINK_FLAGS =3D /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OP= T:REF /OPT:ICF=3D10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MAC= HINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE= _DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG +RELEASE_VS2019_IA32_DLINK_FLAGS =3D /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IG= NORE:4254 /OPT:REF /OPT:ICF=3D10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:= .pdata,D /MACHINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI= _BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=3D.data +NOOPT_VS2019_IA32_DLINK_FLAGS =3D /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OP= T:REF /OPT:ICF=3D10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MAC= HINE:X86 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE= _DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG + +################## +# X64 definitions +################## +*_VS2019_X64_CC_PATH =3D DEF(VS2019_BIN_X64)\cl.exe +*_VS2019_X64_PP_PATH =3D DEF(VS2019_BIN_X64)\cl.exe +*_VS2019_X64_APP_PATH =3D DEF(VS2019_BIN_X64)\cl.exe +*_VS2019_X64_VFRPP_PATH =3D DEF(VS2019_BIN_X64)\cl.exe +*_VS2019_X64_ASLCC_PATH =3D DEF(VS2019_BIN_X64)\cl.exe +*_VS2019_X64_ASLPP_PATH =3D DEF(VS2019_BIN_X64)\cl.exe +*_VS2019_X64_ASM_PATH =3D DEF(VS2019_BIN_X64)\ml64.exe +*_VS2019_X64_SLINK_PATH =3D DEF(VS2019_BIN_X64)\lib.exe +*_VS2019_X64_DLINK_PATH =3D DEF(VS2019_BIN_X64)\link.exe +*_VS2019_X64_ASLDLINK_PATH =3D DEF(VS2019_BIN_X64)\link.exe + + DEBUG_VS2019_X64_CC_FLAGS =3D /nologo /c /WX /GS- /W4 /Gs32768 /D UN= ICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Gw /MP +RELEASE_VS2019_X64_CC_FLAGS =3D /nologo /c /WX /GS- /W4 /Gs32768 /D UN= ICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Gw /MP +NOOPT_VS2019_X64_CC_FLAGS =3D /nologo /c /WX /GS- /W4 /Gs32768 /D UN= ICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od /MP + + DEBUG_VS2019_X64_ASM_FLAGS =3D /nologo /c /WX /W3 /Cx /Zd /Zi +RELEASE_VS2019_X64_ASM_FLAGS =3D /nologo /c /WX /W3 /Cx /Zd +NOOPT_VS2019_X64_ASM_FLAGS =3D /nologo /c /WX /W3 /Cx /Zd /Zi + + DEBUG_VS2019_X64_NASM_FLAGS =3D -Ox -f win64 -g +RELEASE_VS2019_X64_NASM_FLAGS =3D -Ox -f win64 +NOOPT_VS2019_X64_NASM_FLAGS =3D -O0 -f win64 -g + + DEBUG_VS2019_X64_DLINK_FLAGS =3D /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IG= NORE:4281 /OPT:REF /OPT:ICF=3D10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:= .pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI= _BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG +RELEASE_VS2019_X64_DLINK_FLAGS =3D /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IG= NORE:4281 /IGNORE:4254 /OPT:REF /OPT:ICF=3D10 /MAP /ALIGN:32 /SECTION:.xdat= a,D /SECTION:.pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /= SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata= =3D.data +NOOPT_VS2019_X64_DLINK_FLAGS =3D /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IG= NORE:4281 /OPT:REF /OPT:ICF=3D10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:= .pdata,D /Machine:X64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI= _BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG + ##########################################################################= ########## # GCC Common ##########################################################################= ########## --=20 2.21.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 (#47064): https://edk2.groups.io/g/devel/message/47064 Mute This Topic: https://groups.io/mt/34089030/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-