VirtualBox

Ignore:
Timestamp:
Nov 17, 2024 2:21:36 AM (3 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
165962
Message:

EFI/Firmware: Made it build with VCC143 (ak a VS2022). Updated the vbox-tools_def.txt a little (upstream has VS2022, but using VS2019 in the mean time). jiraref:VBP-1439

Location:
trunk/src/VBox/Devices/EFI/Firmware
Files:
7 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/EFI/Firmware/BaseTools/Source/Python/Trim/Trim.py

    r105670 r107020  
    5858
    5959## Regular expression for finding header file inclusions
    60 gIncludePattern = re.compile(r"^[ \t]*[%]?[ \t]*include(?:[ \t]*(?:\\(?:\r\n|\r|\n))*[ \t]*)*(?:\(?[\"<]?[ \t]*)([-\w.\\/() \t]+)(?:[ \t]*[\">]?\)?)", re.MULTILINE | re.UNICODE | re.IGNORECASE)
     60gIncludePattern = re.compile(r"^[ \t]*[%]?[ \t]*include(?:[ \t]*(?:\\(?:\r\n|\r|\n))*[ \t]*)*(?:\(?[\"<]?[ \t]*)([-\w.\\/() \t]+)(?:[ \t]*[\">]?\)?)(?!.*edk2-ignore-hack)", re.MULTILINE | re.UNICODE | re.IGNORECASE)
     61## VBox 2024-11-17 bird: Added the negative 'edk2-ignore-hack' matching to help the tool ignore the asmdefs-first.mac include in iprt/asmdefs.mac.  ^^^^^^^^^^^^^^^^^^^^^^
    6162
    6263

  • trunk/src/VBox/Devices/EFI/Firmware/Config.kmk

    r106762 r107020  
    7777#
    7878ifeq ($(KBUILD_HOST),win)
    79  # Actually using VS2019, but no config for it, so VS2017 will have to do for now.
    80  ## @todo EFI has a VS2019 template now. We should migrate to it before we start using 2022... ;-)
    81  VBOX_EFI_TOOL_CHAIN := VS2017
     79 # The VS2019 template is the same as the VS2022 in upstream, so we stick with this till we upgrade.
     80 VBOX_EFI_TOOL_CHAIN := VS2019
    8281else
    8382 VBOX_EFI_TOOL_CHAIN = GCC48
    … …  
    130129 TEMPLATE_VBoxEfiBldProg_CXXFLAGS.win += -wd4703 # VfrCompile\VfrFormPkg.cpp(1344) : warning C4703: potentially uninitialized local pointer variable 'pNodeBeforeAdjust' used
    131130 TEMPLATE_VBoxEfiBldProg_CXXFLAGS.win += -wd5033 # DLexer.h(68): warning C5033: 'register' is no longer a supported storage class (in c++17 or later mode)
     131endif
     132if "$(VBOX_VCC_TOOL_STEM)" >= "VCC143"
     133 TEMPLATE_VBoxEfiBldProg_CXXFLAGS.win += -wd5264 # AParser.cpp(57): warning C5264: 'zzINF_DEF_TOKEN_BUFFER_SIZE': 'const' variable is not used
     134 TEMPLATE_VBoxEfiBldProg_CXXFLAGS.win += -wd5262 # VfrUtilityLib.cpp(687): warning C5262: implicit fall-through occurs here; are you missing a break statement? Use [[fallthrough]] when a break statement is intentionally omitted between cases
     135 TEMPLATE_VBoxEfiBldProg_CXXFLAGS.win += -wd5267 # AToken.h(60): warning C5267: definition of implicit copy constructor for 'ANTLRAbstractToken' is deprecated because it has a user-provided destructor
    132136endif
    133137

  • trunk/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

    r101291 r107020  
    3030  Ia32/MathLShiftS64.c      | MSFT
    3131  Ia32/MathRShiftU64.c      | MSFT
    32   Ia32/MathFtol.c           | MSFT
     32  # 2024-11-16 bird: Replaced MathFtol.c with ftol2-vcc.asm for VS2022:
     33  Ia32/ftol2-vcc.nasm       | MSFT
     34  # Ia32/MathFtol.c           | MSFT
    3335  Ia32/MathLlmul.asm        | MSFT
    3436  Ia32/MathLlshr.asm        | MSFT

  • trunk/src/VBox/Devices/EFI/Firmware/EfiModules.kmk

    r106061 r107020  
    4242 # up in, apparently.  In the generated makefiles, DEBUG_DIR points to them.
    4343 #
    44  if1of ($(VBOX_EFI_TOOL_CHAIN), VS2017) ## @todo figure why/how this happens.
     44 if1of ($(VBOX_EFI_TOOL_CHAIN), VS2017 VS2019 VS2022) ## @todo figure why/how this happens.
    4545  VBOX_EFI_DEBUG_DIR = OUTPUT
    4646 else

  • trunk/src/VBox/Devices/EFI/Firmware/Makefile.kmk

    r106386 r107020  
    352352                -e 's,@VBOX_PATH_PREFIX_GCC_ARM@,$(PATH_TOOL_VBoxXGccArmNoneEabi)/$(TOOL_VBoxXGccArmNoneEabi_PREFIX),' \
    353353               \
    354                 -e 's,@PATH_VS2010@,$(PATH_TOOL_$(VBOX_VCC_TOOL)),' \
    355                 -e 's,@PATH_VS2010_AMD64_BIN@,$(PATH_TOOL_$(VBOX_VCC_TOOL))/bin/$(subst x86,x86_amd64,$(KBUILD_HOST_ARCH)),' \
    356                \
    357354                -e 's,@PATH_VS2017_BIN_HOST@,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)AMD64_BIN),' \
    358355                -e 's,@PATH_VS2017_AMD64_BIN@,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)AMD64_BIN),' \
    359356                -e 's,@PATH_VS2017_X86_BIN@,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN),' \
     357                \
     358                -e 's,@VS_HOST@,$(WINCMN_MAP_ARCH.$(KBUILD_HOST_ARCH)),' \
     359                -e 's,@PATH_VS2019_BIN@,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)_BASE_BIN),' \
     360                \
     361                -e 's,@VBOX_PATH_ROOT@,$(PATH_ROOT),' \
    360362               \
    361363                -e 's,@PATH_SDK_WINSDK10_BIN@,$(PATH_SDK_WINSDK10_BIN),' \

  • trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

    r80721 r107020  
    5555  UefiRuntimeServicesTableLib
    5656  PrintLib
     57  IntrinsicLib # vbox 2022-11-17 bird: HORRIBLE HACK for unresolved memcpy w/ VS2022 in Image.obj. /kernel doens't fix it for AMD64.
    5758
    5859[Protocols]

  • trunk/src/VBox/Devices/EFI/Firmware/vbox-tools_def.txt

    r99473 r107020  
    11#
    2 #  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
     2#  Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>
    33#  Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
    4 #  Portions copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
     4#  Portions copyright (c) 2011 - 2019, ARM Ltd. All rights reserved.<BR>
    55#  Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>
    6 #  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
     6#  (C) Copyright 2020, Hewlett Packard Enterprise Development LP<BR>
     7#  Copyright (c) 2022, Loongson Technology Corporation Limited. All rights reserved.<BR>
     8#  Copyright (c) Microsoft Corporation
    79#
    810#  SPDX-License-Identifier: BSD-2-Clause-Patent
    … …  
    1214
    1315# common path macros
    14 DEFINE VS2010_BIN      = @PATH_VS2010@/bin
    15 DEFINE VS2010_DLL      = @PATH_VS2010@/bin
    16 DEFINE VS2010_BINX64   = @PATH_VS2010_AMD64_BIN@
    17 DEFINE VS2010_BIN64    = DEF(VS2010_BIN)\x86_ia64
    18 
    1916DEFINE VS2017_DLL      = @PATH_VS2017_BIN_HOST@
    2017DEFINE VS2017_BIN_HOST = @PATH_VS2017_BIN_HOST@
    … …  
    2421DEFINE VS2017_BIN_AARCH64 = c:\no\such\directory
    2522
    26 DEFINE WINSDK7_BIN       = c:\no\such\directory
     23DEFINE VS_HOST            = @VS_HOST@
     24
     25DEFINE VS2019_BIN         = @PATH_VS2019_BIN@
     26DEFINE VS2019_BIN_HOST    = DEF(VS2019_BIN)\HostDEF(VS_HOST)\DEF(VS_HOST)
     27DEFINE VS2019_BIN_IA32    = DEF(VS2019_BIN)\HostDEF(VS_HOST)\x86
     28DEFINE VS2019_BIN_X64     = DEF(VS2019_BIN)\HostDEF(VS_HOST)\x64
     29DEFINE VS2019_BIN_ARM     = DEF(VS2019_BIN)\HostDEF(VS_HOST)\arm
     30DEFINE VS2019_BIN_AARCH64 = DEF(VS2019_BIN)\HostDEF(VS_HOST)\arm64
     31
     32#
     33# Resource compiler
     34#
     35DEFINE RC_PATH           = @PATH_SDK_WINSDK10_BIN@\rc.exe
    2736DEFINE WINSDK10_BIN      = @PATH_SDK_WINSDK10_BIN@
     37
     38#DEFINE WINSDK7_BIN       = c:\no\such\directory
     39
    2840
    2941# These defines are needed for certain Microsoft Visual Studio tools that
    3042# are used by other toolchains.  An example is that ICC on Windows normally
    3143# uses Microsoft's nmake.exe.
    32 
    33 # Some MS_VS_BIN options: DEF(VS2008_BIN), DEF(VS2008x86_BIN)
    34 DEFINE MS_VS_BIN   = DEF(VS2010_BIN)
    35 # Some MS_VS_DLL options: DEF(VS2008_DLL), DEF(VS2008x86_DLL)
    36 DEFINE MS_VS_DLL   = DEF(VS2010_DLL)
    37 
    3844DEFINE WINDDK_BIN16     = ENV(WINDDK3790_PREFIX)bin16
    39 DEFINE WINDDK_BINX64    = ENV(WINDDK3790_PREFIX)win64\x86\amd64
    4045
    4146DEFINE EBC_BIN          = C:\Program Files\Intel\EBC\Bin
    … …  
    5762DEFINE DEFAULT_WIN_ASL_FLAGS    = DEF(IASL_FLAGS)
    5863DEFINE DEFAULT_WIN_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)
     64
     65# MSFT Build Flag for included header file list generation
     66DEFINE MSFT_DEPS_FLAGS         = /showIncludes /MP1
    5967
    6068DEFINE MSFT_ASLPP_FLAGS        = /nologo /E /C /FIAutoGen.h
    … …  
    9199# Supported Tool Chains
    92100# =====================
    93 #   VS2010      -win32-  Requires:
    94 #                             Microsoft Visual Studio 2010 Premium Edition
    95 #                             Microsoft Windows Server 2003 Driver Development Kit (Microsoft WINDDK) version 3790.1830
     101#   VS2017      -win32-  Requires:
     102#                             Microsoft Visual Studio 2017 version 15.2 (15.4 for ARM64) or later
    96103#                        Optional:
    97 #                             Required to build EBC drivers:
    98 #                               Intel(r) Compiler for Efi Byte Code (Intel(r) EBC Compiler)
    99104#                             Required to build platforms or ACPI tables:
    100105#                               Intel(r) ACPI Compiler (iasl.exe) from
    101106#                               https://acpica.org/downloads
     107#                        Note:
     108#                             Building of XIP firmware images for ARM/ARM64 is not currently supported (only applications).
     109#                             /FILEALIGN:4096 and other changes are needed for ARM firmware builds.
     110#   VS2019      -win32-  Requires:
     111#                             Microsoft Visual Studio 2019 version 16.2 or later
     112#                        Optional:
     113#                             Required to build platforms or ACPI tables:
     114#                               Intel(r) ACPI Compiler (iasl.exe) from
     115#                               https://acpica.org/downloads
     116#
    102117#   GCC48       -Linux,Windows-  Requires:
    103118#                             GCC 4.8 targeting x86_64-linux-gnu, aarch64-linux-gnu, or arm-linux-gnueabi
    … …  
    114129#   GCC            - GNU GCC
    115130####################################################################################
    116 
    117 
    118 
    119 ####################################################################################
    120 #
    121 # Microsoft Visual Studio 2010
    122 #
    123 #   VS2010  - Microsoft Visual Studio 2010 Premium Edition with Intel ASL
    124 #   ASL     - Intel ACPI Source Language Compiler
    125 ####################################################################################
    126 #   VS2010           - Microsoft Visual Studio 2010 Premium Edition
    127 *_VS2010_*_*_FAMILY               = MSFT
    128 
    129 *_VS2010_*_MAKE_PATH              = DEF(VS2010_BIN)/nmake.exe
    130 *_VS2010_*_MAKE_FLAGS             = /nologo
    131 *_VS2010_*_RC_PATH                = rc.exe
    132 
    133 *_VS2010_*_SLINK_FLAGS            = /NOLOGO /LTCG
    134 *_VS2010_*_APP_FLAGS              = /nologo /E /TC
    135 *_VS2010_*_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h
    136 *_VS2010_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
    137 
    138 *_VS2010_*_ASM16_PATH             = DEF(VS2010_BIN)\ml.exe
    139 
    140 ##################
    141 # ASL definitions
    142 ##################
    143 *_VS2010_*_ASL_PATH               = DEF(DEFAULT_WIN_ASL_BIN)
    144 *_VS2010_*_ASL_FLAGS              = DEF(DEFAULT_WIN_ASL_FLAGS)
    145 *_VS2010_*_ASL_OUTFLAGS           = DEF(DEFAULT_WIN_ASL_OUTFLAGS)
    146 *_VS2010_*_ASLCC_FLAGS            = DEF(MSFT_ASLCC_FLAGS)
    147 *_VS2010_*_ASLPP_FLAGS            = DEF(MSFT_ASLPP_FLAGS)
    148 *_VS2010_*_ASLDLINK_FLAGS         = DEF(MSFT_ASLDLINK_FLAGS)
    149 
    150 ##################
    151 # IA32 definitions
    152 ##################
    153 *_VS2010_IA32_*_DLL               = DEF(VS2010_DLL)
    154 
    155 *_VS2010_IA32_MAKE_PATH           = DEF(VS2010_BIN)\nmake.exe
    156 *_VS2010_IA32_CC_PATH             = DEF(VS2010_BIN)\cl.exe
    157 *_VS2010_IA32_VFRPP_PATH          = DEF(VS2010_BIN)\cl.exe
    158 *_VS2010_IA32_SLINK_PATH          = DEF(VS2010_BIN)\lib.exe
    159 *_VS2010_IA32_DLINK_PATH          = DEF(VS2010_BIN)\link.exe
    160 *_VS2010_IA32_APP_PATH            = DEF(VS2010_BIN)\cl.exe
    161 *_VS2010_IA32_PP_PATH             = DEF(VS2010_BIN)\cl.exe
    162 *_VS2010_IA32_ASM_PATH            = DEF(VS2010_BIN)\ml.exe
    163 *_VS2010_IA32_ASLCC_PATH          = DEF(VS2010_BIN)\cl.exe
    164 *_VS2010_IA32_ASLPP_PATH          = DEF(VS2010_BIN)\cl.exe
    165 *_VS2010_IA32_ASLDLINK_PATH       = DEF(VS2010_BIN)\link.exe
    166 
    167       *_VS2010_IA32_MAKE_FLAGS    = /nologo
    168   DEBUG_VS2010_IA32_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /MP
    169 RELEASE_VS2010_IA32_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /MP
    170 NOOPT_VS2010_IA32_CC_FLAGS        = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od /MP
    171 
    172   DEBUG_VS2010_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
    173 RELEASE_VS2010_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd
    174 NOOPT_VS2010_IA32_ASM_FLAGS       = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
    175 
    176   DEBUG_VS2010_IA32_NASM_FLAGS    = -Ox -f win32 -g
    177 RELEASE_VS2010_IA32_NASM_FLAGS    = -Ox -f win32
    178 NOOPT_VS2010_IA32_NASM_FLAGS      = -O0 -f win32 -g
    179 
    180   DEBUG_VS2010_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /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 /DEBUG
    181 RELEASE_VS2010_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /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=.data /DEBUG
    182 NOOPT_VS2010_IA32_DLINK_FLAGS     = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /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 /DEBUG
    183 
    184 ##################
    185 # X64 definitions
    186 ##################
    187 *_VS2010_X64_*_DLL         = DEF(VS2010_DLL)
    188 
    189 *_VS2010_X64_CC_PATH       = DEF(VS2010_BINX64)\cl.exe
    190 *_VS2010_X64_PP_PATH       = DEF(VS2010_BINX64)\cl.exe
    191 *_VS2010_X64_APP_PATH      = DEF(VS2010_BINX64)\cl.exe
    192 *_VS2010_X64_VFRPP_PATH    = DEF(VS2010_BINX64)\cl.exe
    193 *_VS2010_X64_ASM_PATH      = DEF(VS2010_BINX64)\ml64.exe
    194 *_VS2010_X64_SLINK_PATH    = DEF(VS2010_BINX64)\lib.exe
    195 *_VS2010_X64_DLINK_PATH    = DEF(VS2010_BINX64)\link.exe
    196 *_VS2010_X64_ASLCC_PATH    = DEF(VS2010_BINX64)\cl.exe
    197 *_VS2010_X64_ASLPP_PATH    = DEF(VS2010_BINX64)\cl.exe
    198 *_VS2010_X64_ASLDLINK_PATH = DEF(VS2010_BINX64)\link.exe
    199 
    200   DEBUG_VS2010_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /MP
    201 RELEASE_VS2010_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /MP
    202 NOOPT_VS2010_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od /MP
    203 
    204   DEBUG_VS2010_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi
    205 RELEASE_VS2010_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd
    206 NOOPT_VS2010_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi
    207 
    208   DEBUG_VS2010_X64_NASM_FLAGS   = -Ox -f win64 -g
    209 RELEASE_VS2010_X64_NASM_FLAGS   = -Ox -f win64
    210 NOOPT_VS2010_X64_NASM_FLAGS     = -O0 -f win64 -g
    211 
    212   DEBUG_VS2010_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /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
    213 RELEASE_VS2010_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /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 /MERGE:.rdata=.data /DEBUG
    214 NOOPT_VS2010_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /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
    215 
    216 ##################
    217 # EBC definitions
    218 ##################
    219 *_VS2010_EBC_*_FAMILY            = INTEL
    220 *_VS2010_EBC_*_DLL               = DEF(VS2010_DLL)
    221 
    222 *_VS2010_EBC_MAKE_PATH           = DEF(VS2010_BIN)\nmake.exe
    223 *_VS2010_EBC_PP_PATH             = DEF(EBC_BIN)\iec.exe
    224 *_VS2010_EBC_VFRPP_PATH          = DEF(EBC_BIN)\iec.exe
    225 *_VS2010_EBC_CC_PATH             = DEF(EBC_BIN)\iec.exe
    226 *_VS2010_EBC_SLINK_PATH          = DEF(VS2010_BIN)\link.exe
    227 *_VS2010_EBC_DLINK_PATH          = DEF(VS2010_BIN)\link.exe
    228 
    229 *_VS2010_EBC_MAKE_FLAGS          = /nologo
    230 *_VS2010_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h
    231 *_VS2010_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)
    232 *_VS2010_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
    233 *_VS2010_EBC_SLINK_FLAGS         = /lib /NOLOGO /MACHINE:EBC
    234 *_VS2010_EBC_DLINK_FLAGS         = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
     131####################################################################################
     132#
     133# Other Supported Tools
     134# =====================
     135#   NASM -- http://www.nasm.us/
     136#   - NASM 2.15.05 or later for use with the GCC toolchain family
     137#   - NASM 2.15.05 or later for use with all other toolchain families
     138#
     139####################################################################################
     140
     141
     142
    235143
    236144
    … …  
    244152
    245153*_VS2017_*_MAKE_PATH       = DEF(VS2017_BIN_HOST)\nmake.exe
    246 *_VS2017_*_MAKE_FLAG       = /nologo
    247 *_VS2017_*_RC_PATH         = DEF(WINSDK10_BIN)\rc.exe
    248 
    249154*_VS2017_*_MAKE_FLAGS      = /nologo
     155*_VS2017_*_RC_PATH         = DEF(RC_PATH)
     156
    250157*_VS2017_*_SLINK_FLAGS     = /NOLOGO /LTCG
    251158*_VS2017_*_APP_FLAGS       = /nologo /E /TC
    … …  
    254161*_VS2017_*_DLINK2_FLAGS    = /WHOLEARCHIVE
    255162*_VS2017_*_ASM16_PATH      = DEF(VS2017_BIN_IA32)\ml.exe
    256 
     163*_VS2017_*_DEPS_FLAGS      = DEF(MSFT_DEPS_FLAGS)
    257164##################
    258165# ASL definitions
    … …  
    398305*_VS2017_EBC_DLINK_FLAGS         = "C:\Program Files (x86)\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER
    399306
     307
     308####################################################################################
     309#   VS2019       - Microsoft Visual Studio 2019 with Intel ASL
     310#   ASL          - Intel ACPI Source Language Compiler (iasl.exe)
     311####################################################################################
     312#   VS2019           - Microsoft Visual Studio 2019 professional Edition with Intel ASL
     313*_VS2019_*_*_FAMILY        = MSFT
     314*_VS2019_*_*_DLL           = DEF(VS2019_BIN_HOST)
     315
     316*_VS2019_*_MAKE_PATH       = DEF(VS2019_BIN_HOST)\nmake.exe
     317*_VS2019_*_MAKE_FLAGS      = /nologo
     318*_VS2019_*_RC_PATH         = DEF(RC_PATH)
     319
     320*_VS2019_*_SLINK_FLAGS     = /NOLOGO /LTCG
     321*_VS2019_*_APP_FLAGS       = /nologo /E /TC
     322*_VS2019_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h
     323*_VS2019_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h
     324*_VS2019_*_DLINK2_FLAGS    = /WHOLEARCHIVE
     325*_VS2019_*_ASM16_PATH      = DEF(VS2019_BIN_IA32)\ml.exe
     326*_VS2019_*_DEPS_FLAGS      = DEF(MSFT_DEPS_FLAGS)
     327##################
     328# ASL definitions
     329##################
     330*_VS2019_*_ASL_PATH        = DEF(WIN_IASL_BIN)
     331*_VS2019_*_ASL_FLAGS       = DEF(DEFAULT_WIN_ASL_FLAGS)
     332*_VS2019_*_ASL_OUTFLAGS    = DEF(DEFAULT_WIN_ASL_OUTFLAGS)
     333*_VS2019_*_ASLCC_FLAGS     = DEF(MSFT_ASLCC_FLAGS)
     334*_VS2019_*_ASLPP_FLAGS     = DEF(MSFT_ASLPP_FLAGS)
     335*_VS2019_*_ASLDLINK_FLAGS  = DEF(MSFT_ASLDLINK_FLAGS)
     336
     337##################
     338# IA32 definitions
     339##################
     340*_VS2019_IA32_CC_PATH      = DEF(VS2019_BIN_IA32)\cl.exe
     341*_VS2019_IA32_VFRPP_PATH   = DEF(VS2019_BIN_IA32)\cl.exe
     342*_VS2019_IA32_ASLCC_PATH   = DEF(VS2019_BIN_IA32)\cl.exe
     343*_VS2019_IA32_ASLPP_PATH   = DEF(VS2019_BIN_IA32)\cl.exe
     344*_VS2019_IA32_SLINK_PATH   = DEF(VS2019_BIN_IA32)\lib.exe
     345*_VS2019_IA32_DLINK_PATH   = DEF(VS2019_BIN_IA32)\link.exe
     346*_VS2019_IA32_ASLDLINK_PATH= DEF(VS2019_BIN_IA32)\link.exe
     347*_VS2019_IA32_APP_PATH     = DEF(VS2019_BIN_IA32)\cl.exe
     348*_VS2019_IA32_PP_PATH      = DEF(VS2019_BIN_IA32)\cl.exe
     349*_VS2019_IA32_ASM_PATH     = DEF(VS2019_BIN_IA32)\ml.exe
     350
     351  DEBUG_VS2019_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Gw /MP
     352RELEASE_VS2019_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw /MP
     353NOOPT_VS2019_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Od /MP
     354
     355  DEBUG_VS2019_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
     356RELEASE_VS2019_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
     357NOOPT_VS2019_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd /Zi
     358
     359# 2024-11-16 bird: Added our include directory for CryptoPkg\Library\IntrinsicLib\Ia32\ftol2-vcc.nasm using iprt/asmdefs.mac.
     360  DEBUG_VS2019_IA32_NASM_FLAGS  = -Ox -f win32 -g -I@VBOX_PATH_ROOT@/include
     361RELEASE_VS2019_IA32_NASM_FLAGS  = -Ox -f win32 -g -I@VBOX_PATH_ROOT@/include
     362NOOPT_VS2019_IA32_NASM_FLAGS    = -O0 -f win32 -g -I@VBOX_PATH_ROOT@/include
     363
     364  DEBUG_VS2019_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /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 /DEBUG
     365RELEASE_VS2019_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /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=.data /DEBUG
     366NOOPT_VS2019_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /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 /DEBUG
     367
     368##################
     369# X64 definitions
     370##################
     371*_VS2019_X64_CC_PATH       = DEF(VS2019_BIN_X64)\cl.exe
     372*_VS2019_X64_PP_PATH       = DEF(VS2019_BIN_X64)\cl.exe
     373*_VS2019_X64_APP_PATH      = DEF(VS2019_BIN_X64)\cl.exe
     374*_VS2019_X64_VFRPP_PATH    = DEF(VS2019_BIN_X64)\cl.exe
     375*_VS2019_X64_ASLCC_PATH    = DEF(VS2019_BIN_X64)\cl.exe
     376*_VS2019_X64_ASLPP_PATH    = DEF(VS2019_BIN_X64)\cl.exe
     377*_VS2019_X64_ASM_PATH      = DEF(VS2019_BIN_X64)\ml64.exe
     378*_VS2019_X64_SLINK_PATH    = DEF(VS2019_BIN_X64)\lib.exe
     379*_VS2019_X64_DLINK_PATH    = DEF(VS2019_BIN_X64)\link.exe
     380*_VS2019_X64_ASLDLINK_PATH = DEF(VS2019_BIN_X64)\link.exe
     381
     382  DEBUG_VS2019_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Gw /MP /volatileMetadata-
     383RELEASE_VS2019_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Gw /MP /volatileMetadata-
     384NOOPT_VS2019_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od /MP /volatileMetadata-
     385
     386  DEBUG_VS2019_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi
     387RELEASE_VS2019_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi
     388NOOPT_VS2019_X64_ASM_FLAGS      = /nologo /c /WX /W3 /Cx /Zd /Zi
     389
     390# 2024-11-16 bird: Added our include directory.
     391  DEBUG_VS2019_X64_NASM_FLAGS   = -Ox -f win64 -g -I@VBOX_PATH_ROOT@/include
     392RELEASE_VS2019_X64_NASM_FLAGS   = -Ox -f win64 -g -I@VBOX_PATH_ROOT@/include
     393NOOPT_VS2019_X64_NASM_FLAGS     = -O0 -f win64 -g -I@VBOX_PATH_ROOT@/include
     394
     395  DEBUG_VS2019_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4281 /OPT:REF /OPT:ICF=10 /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
     396RELEASE_VS2019_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4281 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /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 /MERGE:.rdata=.data /DEBUG
     397NOOPT_VS2019_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4281 /OPT:REF /OPT:ICF=10 /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
     398
     399#################
     400# ARM definitions
     401#################
     402*_VS2019_ARM_CC_PATH              = DEF(VS2019_BIN_ARM)\cl.exe
     403*_VS2019_ARM_VFRPP_PATH           = DEF(VS2019_BIN_ARM)\cl.exe
     404*_VS2019_ARM_SLINK_PATH           = DEF(VS2019_BIN_ARM)\lib.exe
     405*_VS2019_ARM_DLINK_PATH           = DEF(VS2019_BIN_ARM)\link.exe
     406*_VS2019_ARM_APP_PATH             = DEF(VS2019_BIN_ARM)\cl.exe
     407*_VS2019_ARM_PP_PATH              = DEF(VS2019_BIN_ARM)\cl.exe
     408*_VS2019_ARM_ASM_PATH             = DEF(VS2019_BIN_ARM)\armasm.exe
     409*_VS2019_ARM_ASLCC_PATH           = DEF(VS2019_BIN_ARM)\cl.exe
     410*_VS2019_ARM_ASLPP_PATH           = DEF(VS2019_BIN_ARM)\cl.exe
     411*_VS2019_ARM_ASLDLINK_PATH        = DEF(VS2019_BIN_ARM)\link.exe
     412
     413  DEBUG_VS2019_ARM_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gw /Oi- /MP
     414RELEASE_VS2019_ARM_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw /Oi- /MP
     415NOOPT_VS2019_ARM_CC_FLAGS         = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Od /Oi- /MP
     416
     417  DEBUG_VS2019_ARM_ASM_FLAGS      = /nologo /g
     418RELEASE_VS2019_ARM_ASM_FLAGS      = /nologo
     419NOOPT_VS2019_ARM_ASM_FLAGS        = /nologo
     420
     421  DEBUG_VS2019_ARM_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:ARM /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
     422RELEASE_VS2019_ARM_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:ARM /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.rdata=.data /DEBUG
     423NOOPT_VS2019_ARM_DLINK_FLAGS      = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:ARM /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /DEBUG
     424
     425#####################
     426# AARCH64 definitions
     427#####################
     428*_VS2019_AARCH64_CC_PATH           = DEF(VS2019_BIN_AARCH64)\cl.exe
     429*_VS2019_AARCH64_VFRPP_PATH        = DEF(VS2019_BIN_AARCH64)\cl.exe
     430*_VS2019_AARCH64_SLINK_PATH        = DEF(VS2019_BIN_AARCH64)\lib.exe
     431*_VS2019_AARCH64_DLINK_PATH        = DEF(VS2019_BIN_AARCH64)\link.exe
     432*_VS2019_AARCH64_APP_PATH          = DEF(VS2019_BIN_AARCH64)\cl.exe
     433*_VS2019_AARCH64_PP_PATH           = DEF(VS2019_BIN_AARCH64)\cl.exe
     434*_VS2019_AARCH64_ASM_PATH          = DEF(VS2019_BIN_AARCH64)\armasm64.exe
     435*_VS2019_AARCH64_ASLCC_PATH        = DEF(VS2019_BIN_AARCH64)\cl.exe
     436*_VS2019_AARCH64_ASLPP_PATH        = DEF(VS2019_BIN_AARCH64)\cl.exe
     437*_VS2019_AARCH64_ASLDLINK_PATH     = DEF(VS2019_BIN_AARCH64)\link.exe
     438
     439  DEBUG_VS2019_AARCH64_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gw /Oi- /MP
     440RELEASE_VS2019_AARCH64_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw /Oi- /MP
     441NOOPT_VS2019_AARCH64_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Od /Oi- /MP
     442
     443  DEBUG_VS2019_AARCH64_ASM_FLAGS   = /nologo /g
     444RELEASE_VS2019_AARCH64_ASM_FLAGS   = /nologo
     445NOOPT_VS2019_AARCH64_ASM_FLAGS     = /nologo
     446
     447  DEBUG_VS2019_AARCH64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:ARM64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /DRIVER /DEBUG
     448RELEASE_VS2019_AARCH64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /MAP /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:ARM64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /DRIVER /MERGE:.rdata=.data /DEBUG
     449NOOPT_VS2019_AARCH64_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /MAP /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:ARM64 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /DRIVER /DEBUG
    400450
    401451####################################################################################
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette