]> git.proxmox.com Git - mirror_edk2.git/blobdiff - BaseTools/Conf/tools_def.template
projects / mirror_edk2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
BaseTools: Add new CLANG8ELF tool chain for new LLVM/CLANG8
[mirror_edk2.git] / BaseTools / Conf / tools_def.template
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index dce6c5875a237016c69b9b0860cba609122e45e3..c8ef1a1421a00184d056b0baddc7235288ea5573 100755 (executable)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -1,12 +1,21 @@
 #\r
-#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.<BR>\r
 #  Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
-#  Portions copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>\r
+#  Portions copyright (c) 2011 - 2019, ARM Ltd. All rights reserved.<BR>\r
 #  Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>\r
-#  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
+#  (C) Copyright 2020, Hewlett Packard Enterprise Development LP<BR>\r
+#  Copyright (c) Microsoft Corporation\r
 #\r
 #  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
+#\r
+# Increase this version tag any time you want user to get warning about updating this\r
+# file in the Conf dir.  By default it does not do update existing conf dirs.\r
+#\r
+# 2.00 - Initial version with changes for CI\r
+#      - Change RC path to use plugin\r
+#\r
+#!VERSION=2.00\r
 \r
 IDENTIFIER = Default TOOL_CHAIN_CONF\r
 \r
@@ -71,6 +80,11 @@ DEFINE VS2019_BIN_X64     = DEF(VS2019_BIN)\HostDEF(VS_HOST)\x64
 DEFINE VS2019_BIN_ARM     = DEF(VS2019_BIN)\HostDEF(VS_HOST)\arm\r
 DEFINE VS2019_BIN_AARCH64 = DEF(VS2019_BIN)\HostDEF(VS_HOST)\arm64\r
 \r
+#\r
+# Resource compiler\r
+#\r
+DEFINE RC_PATH    = ENV(WINSDK_PATH_FOR_RC_EXE)\rc.exe\r
+\r
 DEFINE WINSDK_BIN           = ENV(WINSDK_PREFIX)\r
 DEFINE WINSDKx86_BIN        = ENV(WINSDKx86_PREFIX)\r
 \r
@@ -133,6 +147,9 @@ DEFINE DEFAULT_WIN_ASL_BIN      = DEF(WIN_IASL_BIN)
 DEFINE DEFAULT_WIN_ASL_FLAGS    = DEF(IASL_FLAGS)\r
 DEFINE DEFAULT_WIN_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)\r
 \r
+# MSFT Build Flag for included header file list generation\r
+DEFINE MSFT_DEPS_FLAGS         = /showIncludes\r
+\r
 DEFINE MSFT_ASLPP_FLAGS        = /nologo /E /C /FIAutoGen.h\r
 DEFINE MSFT_ASLCC_FLAGS        = /nologo /c /FIAutoGen.h /TC /Dmain=ReferenceAcpiTable\r
 DEFINE MSFT_ASLDLINK_FLAGS     = /NODEFAULTLIB /ENTRY:ReferenceAcpiTable /SUBSYSTEM:CONSOLE\r
@@ -250,11 +267,12 @@ DEFINE DTC_BIN                 = ENV(DTC_PREFIX)dtc
 #                               Intel(r) ACPI Compiler from\r
 #                               https://acpica.org/downloads\r
 #   GCC5        -Linux,Windows-  Requires:\r
-#                             GCC 5 with LTO support, targeting x86_64-linux-gnu, aarch64-linux-gnu, or arm-linux-gnueabi\r
+#                             GCC 5 with LTO support, targeting x86_64-linux-gnu, aarch64-linux-gnu, arm-linux-gnueabi or riscv64-linux-gnu\r
 #                        Optional:\r
 #                             Required to build platforms or ACPI tables:\r
 #                               Intel(r) ACPI Compiler from\r
 #                               https://acpica.org/downloads\r
+#\r
 #   CLANG35     -Linux,Windows-  Requires:\r
 #                             Clang v3.5 or later, and GNU binutils targeting aarch64-linux-gnu or arm-linux-gnueabi\r
 #                        Optional:\r
@@ -268,12 +286,16 @@ DEFINE DTC_BIN                 = ENV(DTC_PREFIX)dtc
 #                             Required to build platforms or ACPI tables:\r
 #                               Intel(r) ACPI Compiler from\r
 #                               https://acpica.org/downloads\r
-#   CLANG9   -Linux, Windows, Mac-  Requires:\r
+#   CLANGPDB -Linux, Windows, Mac-  Requires:\r
 #                             Clang 9 or above from http://releases.llvm.org/\r
 #                        Optional:\r
 #                             Required to compile nasm source:\r
 #                               nasm compiler from\r
 #                               NASM -- http://www.nasm.us/\r
+#   CLANG8ELF -Linux,Windows,Mac-  Requires:\r
+#                             LLVM 8.0.0 or above, https://llvm.org/\r
+#                             On Windows OS, Visual Studio is required to be installed for nmake and compile BaseTools C tools.\r
+#                        Optional:\r
 #                             Required to build platforms or ACPI tables:\r
 #                               Intel(r) ACPI Compiler from\r
 #                               https://acpica.org/downloads\r
@@ -320,12 +342,16 @@ DEFINE DTC_BIN                 = ENV(DTC_PREFIX)dtc
 #                             Required to build platforms or ACPI tables:\r
 #                               Microsoft ASL ACPI Compiler (asl.exe) v4.0.0 from\r
 #                               http://download.microsoft.com/download/2/c/1/2c16c7e0-96c1-40f5-81fc-3e4bf7b65496/microsoft_asl_compiler-v4-0-0.msi\r
+#                        Notes: Since this tool chain is obsolete, it doesn't enable the compiler option for included header file list generation,\r
+#                               and lose the incremental build capability.\r
 #   RVCTLINUX   -unix-   Requires:\r
 #                             ARM C/C++ Compiler, 5.00\r
 #                        Optional:\r
 #                             Required to build platforms or ACPI tables:\r
 #                               Intel(r) ACPI Compiler from\r
 #                               https://acpica.org/downloads\r
+#                        Notes: Since this tool chain is obsolete, it doesn't enable the compiler option for included header file list generation,\r
+#                               and lose the incremental build capability.\r
 # * Commented out - All versions of VS2005 use the same standard install directory\r
 #\r
 ####################################################################################\r
@@ -401,7 +427,7 @@ DEFINE DTC_BIN                 = ENV(DTC_PREFIX)dtc
 *_VS2008_*_APP_FLAGS              = /nologo /E /TC\r
 *_VS2008_*_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h\r
 *_VS2008_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-\r
+*_VS2008_*_DEPS_FLAGS            = DEF(MSFT_DEPS_FLAGS)\r
 *_VS2008_*_ASM16_PATH             = DEF(VS2008_BIN)\ml.exe\r
 \r
 ##################\r
@@ -419,7 +445,6 @@ DEFINE DTC_BIN                 = ENV(DTC_PREFIX)dtc
 ##################\r
 *_VS2008_IA32_*_DLL               = DEF(VS2008_DLL)\r
 \r
-*_VS2008_IA32_MAKE_PATH           = DEF(VS2008_BIN)\nmake.exe\r
 *_VS2008_IA32_CC_PATH             = DEF(VS2008_BIN)\cl.exe\r
 *_VS2008_IA32_VFRPP_PATH          = DEF(VS2008_BIN)\cl.exe\r
 *_VS2008_IA32_SLINK_PATH          = DEF(VS2008_BIN)\lib.exe\r
@@ -431,7 +456,6 @@ DEFINE DTC_BIN                 = ENV(DTC_PREFIX)dtc
 *_VS2008_IA32_ASLPP_PATH          = DEF(VS2008_BIN)\cl.exe\r
 *_VS2008_IA32_ASLDLINK_PATH       = DEF(VS2008_BIN)\link.exe\r
 \r
-      *_VS2008_IA32_MAKE_FLAGS    = /nologo\r
   DEBUG_VS2008_IA32_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm\r
 RELEASE_VS2008_IA32_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
 NOOPT_VS2008_IA32_CC_FLAGS        = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od\r
@@ -464,9 +488,9 @@ NOOPT_VS2008_IA32_DLINK_FLAGS     = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2008_X64_ASLPP_PATH    = DEF(VS2008_BINX64)\cl.exe\r
 *_VS2008_X64_ASLDLINK_PATH = DEF(VS2008_BINX64)\link.exe\r
 \r
-  DEBUG_VS2008_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /MP\r
-RELEASE_VS2008_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /MP\r
-NOOPT_VS2008_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od /MP\r
+  DEBUG_VS2008_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7\r
+RELEASE_VS2008_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF\r
+NOOPT_VS2008_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od\r
 \r
   DEBUG_VS2008_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
 RELEASE_VS2008_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
@@ -486,14 +510,12 @@ NOOPT_VS2008_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2008_EBC_*_FAMILY            = INTEL\r
 *_VS2008_EBC_*_DLL               = DEF(VS2008_DLL)\r
 \r
-*_VS2008_EBC_MAKE_PATH           = DEF(VS2008_BIN)\nmake.exe\r
 *_VS2008_EBC_PP_PATH             = DEF(EBC_BIN)\iec.exe\r
 *_VS2008_EBC_VFRPP_PATH          = DEF(EBC_BIN)\iec.exe\r
 *_VS2008_EBC_CC_PATH             = DEF(EBC_BIN)\iec.exe\r
 *_VS2008_EBC_SLINK_PATH          = DEF(VS2008_BIN)\link.exe\r
 *_VS2008_EBC_DLINK_PATH          = DEF(VS2008_BIN)\link.exe\r
 \r
-*_VS2008_EBC_MAKE_FLAGS          = /nologo\r
 *_VS2008_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h\r
 *_VS2008_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
 *_VS2008_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
@@ -509,15 +531,14 @@ NOOPT_VS2008_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2008x86_*_*_FAMILY        = MSFT\r
 \r
 *_VS2008x86_*_MAKE_PATH       = DEF(VS2008x86_BIN)\nmake.exe\r
-*_VS2008x86_*_MAKE_FLAG       = /nologo\r
+*_VS2008x86_*_MAKE_FLAGS      = /nologo\r
 *_VS2008x86_*_RC_PATH         = DEF(WINSDK_BIN)\rc.exe\r
 \r
-*_VS2008x86_*_MAKE_FLAGS      = /nologo\r
 *_VS2008x86_*_SLINK_FLAGS     = /NOLOGO /LTCG\r
 *_VS2008x86_*_APP_FLAGS       = /nologo /E /TC\r
 *_VS2008x86_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h\r
 *_VS2008x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-\r
+*_VS2008x86_*_DEPS_FLAGS      = DEF(MSFT_DEPS_FLAGS)\r
 *_VS2008x86_*_ASM16_PATH      = DEF(VS2008x86_BIN)\ml.exe\r
 \r
 ##################\r
@@ -535,7 +556,6 @@ NOOPT_VS2008_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 ##################\r
 *_VS2008x86_IA32_*_DLL        = DEF(VS2008x86_DLL)\r
 \r
-*_VS2008x86_IA32_MAKE_PATH    = DEF(VS2008x86_BIN)\nmake.exe\r
 *_VS2008x86_IA32_CC_PATH      = DEF(VS2008x86_BIN)\cl.exe\r
 *_VS2008x86_IA32_VFRPP_PATH   = DEF(VS2008x86_BIN)\cl.exe\r
 *_VS2008x86_IA32_ASLCC_PATH   = DEF(VS2008x86_BIN)\cl.exe\r
@@ -547,10 +567,9 @@ NOOPT_VS2008_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2008x86_IA32_PP_PATH      = DEF(VS2008x86_BIN)\cl.exe\r
 *_VS2008x86_IA32_ASM_PATH     = DEF(VS2008x86_BIN)\ml.exe\r
 \r
-      *_VS2008x86_IA32_MAKE_FLAGS  = /nologo\r
-  DEBUG_VS2008x86_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /MP\r
-RELEASE_VS2008x86_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /MP\r
-NOOPT_VS2008x86_IA32_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Od /MP\r
+  DEBUG_VS2008x86_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7\r
+RELEASE_VS2008x86_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
+NOOPT_VS2008x86_IA32_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Od\r
 \r
   DEBUG_VS2008x86_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
 RELEASE_VS2008x86_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd\r
@@ -580,10 +599,9 @@ NOOPT_VS2008x86_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2008x86_X64_DLINK_PATH    = DEF(VS2008x86_BINX64)\link.exe\r
 *_VS2008x86_X64_ASLDLINK_PATH = DEF(VS2008x86_BINX64)\link.exe\r
 \r
-  DEBUG_VS2008x86_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /MP\r
-RELEASE_VS2008x86_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /MP\r
-NOOPT_VS2008x86_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od /MP\r
-\r
+  DEBUG_VS2008x86_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7\r
+RELEASE_VS2008x86_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF\r
+NOOPT_VS2008x86_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od\r
   DEBUG_VS2008x86_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
 RELEASE_VS2008x86_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
 NOOPT_VS2008x86_X64_ASM_FLAGS      = /nologo /c /WX /W3 /Cx /Zd /Zi\r
@@ -602,14 +620,12 @@ NOOPT_VS2008x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2008x86_EBC_*_FAMILY            = INTEL\r
 *_VS2008x86_EBC_*_DLL               = DEF(VS2008x86_DLL)\r
 \r
-*_VS2008x86_EBC_MAKE_PATH           = DEF(VS2008x86_BIN)\nmake.exe\r
 *_VS2008x86_EBC_PP_PATH             = DEF(EBC_BINx86)\iec.exe\r
 *_VS2008x86_EBC_VFRPP_PATH          = DEF(EBC_BINx86)\iec.exe\r
 *_VS2008x86_EBC_CC_PATH             = DEF(EBC_BINx86)\iec.exe\r
 *_VS2008x86_EBC_SLINK_PATH          = DEF(VS2008x86_BIN)\link.exe\r
 *_VS2008x86_EBC_DLINK_PATH          = DEF(VS2008x86_BIN)\link.exe\r
 \r
-*_VS2008x86_EBC_MAKE_FLAGS          = /nologo\r
 *_VS2008x86_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h\r
 *_VS2008x86_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
 *_VS2008x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
@@ -636,7 +652,7 @@ NOOPT_VS2008x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2010_*_APP_FLAGS              = /nologo /E /TC\r
 *_VS2010_*_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h\r
 *_VS2010_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-\r
+*_VS2010_*_DEPS_FLAGS      = DEF(MSFT_DEPS_FLAGS)\r
 *_VS2010_*_ASM16_PATH             = DEF(VS2010_BIN)\ml.exe\r
 \r
 ##################\r
@@ -654,7 +670,6 @@ NOOPT_VS2008x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 ##################\r
 *_VS2010_IA32_*_DLL               = DEF(VS2010_DLL)\r
 \r
-*_VS2010_IA32_MAKE_PATH           = DEF(VS2010_BIN)\nmake.exe\r
 *_VS2010_IA32_CC_PATH             = DEF(VS2010_BIN)\cl.exe\r
 *_VS2010_IA32_VFRPP_PATH          = DEF(VS2010_BIN)\cl.exe\r
 *_VS2010_IA32_SLINK_PATH          = DEF(VS2010_BIN)\lib.exe\r
@@ -666,10 +681,9 @@ NOOPT_VS2008x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2010_IA32_ASLPP_PATH          = DEF(VS2010_BIN)\cl.exe\r
 *_VS2010_IA32_ASLDLINK_PATH       = DEF(VS2010_BIN)\link.exe\r
 \r
-      *_VS2010_IA32_MAKE_FLAGS    = /nologo\r
-  DEBUG_VS2010_IA32_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /MP\r
-RELEASE_VS2010_IA32_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /MP\r
-NOOPT_VS2010_IA32_CC_FLAGS        = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od /MP\r
+  DEBUG_VS2010_IA32_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7\r
+RELEASE_VS2010_IA32_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
+NOOPT_VS2010_IA32_CC_FLAGS        = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od\r
 \r
   DEBUG_VS2010_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
 RELEASE_VS2010_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd\r
@@ -699,9 +713,9 @@ NOOPT_VS2010_IA32_DLINK_FLAGS     = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2010_X64_ASLPP_PATH    = DEF(VS2010_BINX64)\cl.exe\r
 *_VS2010_X64_ASLDLINK_PATH = DEF(VS2010_BINX64)\link.exe\r
 \r
-  DEBUG_VS2010_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /MP\r
-RELEASE_VS2010_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /MP\r
-NOOPT_VS2010_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od /MP\r
+  DEBUG_VS2010_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7\r
+RELEASE_VS2010_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF\r
+NOOPT_VS2010_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od\r
 \r
   DEBUG_VS2010_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
 RELEASE_VS2010_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
@@ -721,14 +735,12 @@ NOOPT_VS2010_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2010_EBC_*_FAMILY            = INTEL\r
 *_VS2010_EBC_*_DLL               = DEF(VS2010_DLL)\r
 \r
-*_VS2010_EBC_MAKE_PATH           = DEF(VS2010_BIN)\nmake.exe\r
 *_VS2010_EBC_PP_PATH             = DEF(EBC_BIN)\iec.exe\r
 *_VS2010_EBC_VFRPP_PATH          = DEF(EBC_BIN)\iec.exe\r
 *_VS2010_EBC_CC_PATH             = DEF(EBC_BIN)\iec.exe\r
 *_VS2010_EBC_SLINK_PATH          = DEF(VS2010_BIN)\link.exe\r
 *_VS2010_EBC_DLINK_PATH          = DEF(VS2010_BIN)\link.exe\r
 \r
-*_VS2010_EBC_MAKE_FLAGS          = /nologo\r
 *_VS2010_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h\r
 *_VS2010_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
 *_VS2010_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
@@ -744,15 +756,14 @@ NOOPT_VS2010_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2010x86_*_*_FAMILY        = MSFT\r
 \r
 *_VS2010x86_*_MAKE_PATH       = DEF(VS2010x86_BIN)\nmake.exe\r
-*_VS2010x86_*_MAKE_FLAG       = /nologo\r
+*_VS2010x86_*_MAKE_FLAGS      = /nologo\r
 *_VS2010x86_*_RC_PATH         = DEF(WINSDK7x86_BIN)\rc.exe\r
 \r
-*_VS2010x86_*_MAKE_FLAGS      = /nologo\r
 *_VS2010x86_*_SLINK_FLAGS     = /NOLOGO /LTCG\r
 *_VS2010x86_*_APP_FLAGS       = /nologo /E /TC\r
 *_VS2010x86_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h\r
 *_VS2010x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-\r
+*_VS2010x86_*_DEPS_FLAGS      = DEF(MSFT_DEPS_FLAGS)\r
 *_VS2010x86_*_ASM16_PATH      = DEF(VS2010x86_BIN)\ml.exe\r
 \r
 ##################\r
@@ -770,7 +781,6 @@ NOOPT_VS2010_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 ##################\r
 *_VS2010x86_IA32_*_DLL        = DEF(VS2010x86_DLL)\r
 \r
-*_VS2010x86_IA32_MAKE_PATH    = DEF(VS2010x86_BIN)\nmake.exe\r
 *_VS2010x86_IA32_CC_PATH      = DEF(VS2010x86_BIN)\cl.exe\r
 *_VS2010x86_IA32_VFRPP_PATH   = DEF(VS2010x86_BIN)\cl.exe\r
 *_VS2010x86_IA32_ASLCC_PATH   = DEF(VS2010x86_BIN)\cl.exe\r
@@ -782,10 +792,9 @@ NOOPT_VS2010_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2010x86_IA32_PP_PATH      = DEF(VS2010x86_BIN)\cl.exe\r
 *_VS2010x86_IA32_ASM_PATH     = DEF(VS2010x86_BIN)\ml.exe\r
 \r
-      *_VS2010x86_IA32_MAKE_FLAGS  = /nologo\r
-  DEBUG_VS2010x86_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /MP\r
-RELEASE_VS2010x86_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /MP\r
-NOOPT_VS2010x86_IA32_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Od /MP\r
+  DEBUG_VS2010x86_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7\r
+RELEASE_VS2010x86_IA32_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
+NOOPT_VS2010x86_IA32_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Od\r
 \r
   DEBUG_VS2010x86_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
 RELEASE_VS2010x86_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd\r
@@ -815,9 +824,9 @@ NOOPT_VS2010x86_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2010x86_X64_DLINK_PATH    = DEF(VS2010x86_BINX64)\link.exe\r
 *_VS2010x86_X64_ASLDLINK_PATH = DEF(VS2010x86_BINX64)\link.exe\r
 \r
-  DEBUG_VS2010x86_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /MP\r
-RELEASE_VS2010x86_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /MP\r
-NOOPT_VS2010x86_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od /MP\r
+  DEBUG_VS2010x86_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7\r
+RELEASE_VS2010x86_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF\r
+NOOPT_VS2010x86_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od\r
 \r
   DEBUG_VS2010x86_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
 RELEASE_VS2010x86_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
@@ -837,14 +846,12 @@ NOOPT_VS2010x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2010x86_EBC_*_FAMILY            = INTEL\r
 *_VS2010x86_EBC_*_DLL               = DEF(VS2010x86_DLL)\r
 \r
-*_VS2010x86_EBC_MAKE_PATH           = DEF(VS2010x86_BIN)\nmake.exe\r
 *_VS2010x86_EBC_PP_PATH             = DEF(EBC_BINx86)\iec.exe\r
 *_VS2010x86_EBC_VFRPP_PATH          = DEF(EBC_BINx86)\iec.exe\r
 *_VS2010x86_EBC_CC_PATH             = DEF(EBC_BINx86)\iec.exe\r
 *_VS2010x86_EBC_SLINK_PATH          = DEF(VS2010x86_BIN)\link.exe\r
 *_VS2010x86_EBC_DLINK_PATH          = DEF(VS2010x86_BIN)\link.exe\r
 \r
-*_VS2010x86_EBC_MAKE_FLAGS          = /nologo\r
 *_VS2010x86_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h\r
 *_VS2010x86_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
 *_VS2010x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
@@ -870,7 +877,7 @@ NOOPT_VS2010x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2012_*_APP_FLAGS              = /nologo /E /TC\r
 *_VS2012_*_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h\r
 *_VS2012_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-\r
+*_VS2012_*_DEPS_FLAGS      = DEF(MSFT_DEPS_FLAGS)\r
 *_VS2012_*_ASM16_PATH             = DEF(VS2012_BIN)\ml.exe\r
 \r
 ##################\r
@@ -888,7 +895,6 @@ NOOPT_VS2010x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 ##################\r
 *_VS2012_IA32_*_DLL               = DEF(VS2012_DLL)\r
 \r
-*_VS2012_IA32_MAKE_PATH           = DEF(VS2012_BIN)\nmake.exe\r
 *_VS2012_IA32_CC_PATH             = DEF(VS2012_BIN)\cl.exe\r
 *_VS2012_IA32_VFRPP_PATH          = DEF(VS2012_BIN)\cl.exe\r
 *_VS2012_IA32_SLINK_PATH          = DEF(VS2012_BIN)\lib.exe\r
@@ -900,10 +906,9 @@ NOOPT_VS2010x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2012_IA32_ASLPP_PATH          = DEF(VS2012_BIN)\cl.exe\r
 *_VS2012_IA32_ASLDLINK_PATH       = DEF(VS2012_BIN)\link.exe\r
 \r
-      *_VS2012_IA32_MAKE_FLAGS    = /nologo\r
-  DEBUG_VS2012_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /MP\r
-RELEASE_VS2012_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /MP\r
-NOOPT_VS2012_IA32_CC_FLAGS        = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Od /MP\r
+  DEBUG_VS2012_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7\r
+RELEASE_VS2012_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
+NOOPT_VS2012_IA32_CC_FLAGS        = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Od\r
 \r
   DEBUG_VS2012_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
 RELEASE_VS2012_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd\r
@@ -933,9 +938,9 @@ NOOPT_VS2012_IA32_DLINK_FLAGS     = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2012_X64_ASLPP_PATH    = DEF(VS2012_BINX64)\cl.exe\r
 *_VS2012_X64_ASLDLINK_PATH = DEF(VS2012_BINX64)\link.exe\r
 \r
-  DEBUG_VS2012_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /MP\r
-RELEASE_VS2012_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /MP\r
-NOOPT_VS2012_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od /MP\r
+  DEBUG_VS2012_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7\r
+RELEASE_VS2012_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF\r
+NOOPT_VS2012_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od\r
 \r
   DEBUG_VS2012_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
 RELEASE_VS2012_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
@@ -955,14 +960,12 @@ NOOPT_VS2012_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2012_EBC_*_FAMILY            = INTEL\r
 *_VS2012_EBC_*_DLL               = DEF(VS2012_DLL)\r
 \r
-*_VS2012_EBC_MAKE_PATH           = DEF(VS2012_BIN)\nmake.exe\r
 *_VS2012_EBC_PP_PATH             = DEF(EBC_BIN)\iec.exe\r
 *_VS2012_EBC_VFRPP_PATH          = DEF(EBC_BIN)\iec.exe\r
 *_VS2012_EBC_CC_PATH             = DEF(EBC_BIN)\iec.exe\r
 *_VS2012_EBC_SLINK_PATH          = DEF(VS2012_BIN)\link.exe\r
 *_VS2012_EBC_DLINK_PATH          = DEF(VS2012_BIN)\link.exe\r
 \r
-*_VS2012_EBC_MAKE_FLAGS          = /nologo\r
 *_VS2012_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h\r
 *_VS2012_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
 *_VS2012_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
@@ -978,15 +981,14 @@ NOOPT_VS2012_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2012x86_*_*_FAMILY        = MSFT\r
 \r
 *_VS2012x86_*_MAKE_PATH       = DEF(VS2012x86_BIN)\nmake.exe\r
-*_VS2012x86_*_MAKE_FLAG       = /nologo\r
+*_VS2012x86_*_MAKE_FLAGS      = /nologo\r
 *_VS2012x86_*_RC_PATH         = DEF(WINSDK71x86_BIN)\rc.exe\r
 \r
-*_VS2012x86_*_MAKE_FLAGS      = /nologo\r
 *_VS2012x86_*_SLINK_FLAGS     = /NOLOGO /LTCG\r
 *_VS2012x86_*_APP_FLAGS       = /nologo /E /TC\r
 *_VS2012x86_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h\r
 *_VS2012x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-\r
+*_VS2012x86_*_DEPS_FLAGS      = DEF(MSFT_DEPS_FLAGS)\r
 *_VS2012x86_*_ASM16_PATH      = DEF(VS2012x86_BIN)\ml.exe\r
 \r
 ##################\r
@@ -1004,7 +1006,6 @@ NOOPT_VS2012_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 ##################\r
 *_VS2012x86_IA32_*_DLL        = DEF(VS2012x86_DLL)\r
 \r
-*_VS2012x86_IA32_MAKE_PATH    = DEF(VS2012x86_BIN)\nmake.exe\r
 *_VS2012x86_IA32_CC_PATH      = DEF(VS2012x86_BIN)\cl.exe\r
 *_VS2012x86_IA32_VFRPP_PATH   = DEF(VS2012x86_BIN)\cl.exe\r
 *_VS2012x86_IA32_ASLCC_PATH   = DEF(VS2012x86_BIN)\cl.exe\r
@@ -1016,10 +1017,9 @@ NOOPT_VS2012_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2012x86_IA32_PP_PATH      = DEF(VS2012x86_BIN)\cl.exe\r
 *_VS2012x86_IA32_ASM_PATH     = DEF(VS2012x86_BIN)\ml.exe\r
 \r
-      *_VS2012x86_IA32_MAKE_FLAGS  = /nologo\r
-  DEBUG_VS2012x86_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /MP\r
-RELEASE_VS2012x86_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /MP\r
-NOOPT_VS2012x86_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Od /MP\r
+  DEBUG_VS2012x86_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7\r
+RELEASE_VS2012x86_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
+NOOPT_VS2012x86_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Od\r
 \r
   DEBUG_VS2012x86_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
 RELEASE_VS2012x86_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd\r
@@ -1049,9 +1049,9 @@ NOOPT_VS2012x86_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2012x86_X64_DLINK_PATH    = DEF(VS2012x86_BINX64)\link.exe\r
 *_VS2012x86_X64_ASLDLINK_PATH = DEF(VS2012x86_BINX64)\link.exe\r
 \r
-  DEBUG_VS2012x86_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /MP\r
-RELEASE_VS2012x86_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /MP\r
-NOOPT_VS2012x86_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od /MP\r
+  DEBUG_VS2012x86_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7\r
+RELEASE_VS2012x86_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF\r
+NOOPT_VS2012x86_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od\r
 \r
   DEBUG_VS2012x86_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
 RELEASE_VS2012x86_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
@@ -1071,14 +1071,12 @@ NOOPT_VS2012x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2012x86_EBC_*_FAMILY            = INTEL\r
 *_VS2012x86_EBC_*_DLL               = DEF(VS2012x86_DLL)\r
 \r
-*_VS2012x86_EBC_MAKE_PATH           = DEF(VS2012x86_BIN)\nmake.exe\r
 *_VS2012x86_EBC_PP_PATH             = DEF(EBC_BINx86)\iec.exe\r
 *_VS2012x86_EBC_VFRPP_PATH          = DEF(EBC_BINx86)\iec.exe\r
 *_VS2012x86_EBC_CC_PATH             = DEF(EBC_BINx86)\iec.exe\r
 *_VS2012x86_EBC_SLINK_PATH          = DEF(VS2012x86_BIN)\link.exe\r
 *_VS2012x86_EBC_DLINK_PATH          = DEF(VS2012x86_BIN)\link.exe\r
 \r
-*_VS2012x86_EBC_MAKE_FLAGS          = /nologo\r
 *_VS2012x86_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h\r
 *_VS2012x86_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
 *_VS2012x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
@@ -1104,7 +1102,7 @@ NOOPT_VS2012x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2013_*_APP_FLAGS              = /nologo /E /TC\r
 *_VS2013_*_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h\r
 *_VS2013_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-\r
+*_VS2013_*_DEPS_FLAGS      = DEF(MSFT_DEPS_FLAGS)\r
 *_VS2013_*_ASM16_PATH             = DEF(VS2013_BIN)\ml.exe\r
 \r
 ##################\r
@@ -1122,7 +1120,6 @@ NOOPT_VS2012x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 ##################\r
 *_VS2013_IA32_*_DLL               = DEF(VS2013_DLL)\r
 \r
-*_VS2013_IA32_MAKE_PATH           = DEF(VS2013_BIN)\nmake.exe\r
 *_VS2013_IA32_CC_PATH             = DEF(VS2013_BIN)\cl.exe\r
 *_VS2013_IA32_VFRPP_PATH          = DEF(VS2013_BIN)\cl.exe\r
 *_VS2013_IA32_SLINK_PATH          = DEF(VS2013_BIN)\lib.exe\r
@@ -1134,10 +1131,9 @@ NOOPT_VS2012x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2013_IA32_ASLPP_PATH          = DEF(VS2013_BIN)\cl.exe\r
 *_VS2013_IA32_ASLDLINK_PATH       = DEF(VS2013_BIN)\link.exe\r
 \r
-      *_VS2013_IA32_MAKE_FLAGS    = /nologo\r
-  DEBUG_VS2013_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\r
-RELEASE_VS2013_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw /MP\r
-NOOPT_VS2013_IA32_CC_FLAGS        = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Od /MP\r
+  DEBUG_VS2013_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Gw\r
+RELEASE_VS2013_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw\r
+NOOPT_VS2013_IA32_CC_FLAGS        = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Od\r
 \r
   DEBUG_VS2013_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
 RELEASE_VS2013_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd\r
@@ -1167,9 +1163,9 @@ NOOPT_VS2013_IA32_DLINK_FLAGS     = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2013_X64_ASLPP_PATH    = DEF(VS2013_BINX64)\cl.exe\r
 *_VS2013_X64_ASLDLINK_PATH = DEF(VS2013_BINX64)\link.exe\r
 \r
-  DEBUG_VS2013_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Gw /MP\r
-RELEASE_VS2013_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Gw /MP\r
-NOOPT_VS2013_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od /MP\r
+  DEBUG_VS2013_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Gw\r
+RELEASE_VS2013_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Gw\r
+NOOPT_VS2013_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od\r
 \r
   DEBUG_VS2013_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
 RELEASE_VS2013_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
@@ -1189,14 +1185,12 @@ NOOPT_VS2013_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2013_EBC_*_FAMILY            = INTEL\r
 *_VS2013_EBC_*_DLL               = DEF(VS2013_DLL)\r
 \r
-*_VS2013_EBC_MAKE_PATH           = DEF(VS2013_BIN)\nmake.exe\r
 *_VS2013_EBC_PP_PATH             = DEF(EBC_BIN)\iec.exe\r
 *_VS2013_EBC_VFRPP_PATH          = DEF(EBC_BIN)\iec.exe\r
 *_VS2013_EBC_CC_PATH             = DEF(EBC_BIN)\iec.exe\r
 *_VS2013_EBC_SLINK_PATH          = DEF(VS2013_BIN)\link.exe\r
 *_VS2013_EBC_DLINK_PATH          = DEF(VS2013_BIN)\link.exe\r
 \r
-*_VS2013_EBC_MAKE_FLAGS          = /nologo\r
 *_VS2013_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h\r
 *_VS2013_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
 *_VS2013_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
@@ -1212,15 +1206,14 @@ NOOPT_VS2013_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2013x86_*_*_FAMILY        = MSFT\r
 \r
 *_VS2013x86_*_MAKE_PATH       = DEF(VS2013x86_BIN)\nmake.exe\r
-*_VS2013x86_*_MAKE_FLAG       = /nologo\r
+*_VS2013x86_*_MAKE_FLAGS      = /nologo\r
 *_VS2013x86_*_RC_PATH         = DEF(WINSDK8x86_BIN)\rc.exe\r
 \r
-*_VS2013x86_*_MAKE_FLAGS      = /nologo\r
 *_VS2013x86_*_SLINK_FLAGS     = /NOLOGO /LTCG\r
 *_VS2013x86_*_APP_FLAGS       = /nologo /E /TC\r
 *_VS2013x86_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h\r
 *_VS2013x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
-\r
+*_VS2013x86_*_DEPS_FLAGS      = DEF(MSFT_DEPS_FLAGS)\r
 *_VS2013x86_*_ASM16_PATH      = DEF(VS2013x86_BIN)\ml.exe\r
 \r
 ##################\r
@@ -1238,7 +1231,6 @@ NOOPT_VS2013_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 ##################\r
 *_VS2013x86_IA32_*_DLL        = DEF(VS2013x86_DLL)\r
 \r
-*_VS2013x86_IA32_MAKE_PATH    = DEF(VS2013x86_BIN)\nmake.exe\r
 *_VS2013x86_IA32_CC_PATH      = DEF(VS2013x86_BIN)\cl.exe\r
 *_VS2013x86_IA32_VFRPP_PATH   = DEF(VS2013x86_BIN)\cl.exe\r
 *_VS2013x86_IA32_ASLCC_PATH   = DEF(VS2013x86_BIN)\cl.exe\r
@@ -1250,10 +1242,9 @@ NOOPT_VS2013_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2013x86_IA32_PP_PATH      = DEF(VS2013x86_BIN)\cl.exe\r
 *_VS2013x86_IA32_ASM_PATH     = DEF(VS2013x86_BIN)\ml.exe\r
 \r
-      *_VS2013x86_IA32_MAKE_FLAGS  = /nologo\r
-  DEBUG_VS2013x86_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\r
-RELEASE_VS2013x86_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw /MP\r
-NOOPT_VS2013x86_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Od /MP\r
+  DEBUG_VS2013x86_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Gw\r
+RELEASE_VS2013x86_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw\r
+NOOPT_VS2013x86_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Od\r
 \r
   DEBUG_VS2013x86_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
 RELEASE_VS2013x86_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd\r
@@ -1283,9 +1274,9 @@ NOOPT_VS2013x86_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2013x86_X64_DLINK_PATH    = DEF(VS2013x86_BINX64)\link.exe\r
 *_VS2013x86_X64_ASLDLINK_PATH = DEF(VS2013x86_BINX64)\link.exe\r
 \r
-  DEBUG_VS2013x86_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Gw /MP\r
-RELEASE_VS2013x86_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Gw /MP\r
-NOOPT_VS2013x86_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od /MP\r
+  DEBUG_VS2013x86_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Gw\r
+RELEASE_VS2013x86_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Gw\r
+NOOPT_VS2013x86_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od\r
 \r
   DEBUG_VS2013x86_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
 RELEASE_VS2013x86_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
@@ -1305,14 +1296,12 @@ NOOPT_VS2013x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2013x86_EBC_*_FAMILY            = INTEL\r
 *_VS2013x86_EBC_*_DLL               = DEF(VS2013x86_DLL)\r
 \r
-*_VS2013x86_EBC_MAKE_PATH           = DEF(VS2013x86_BIN)\nmake.exe\r
 *_VS2013x86_EBC_PP_PATH             = DEF(EBC_BINx86)\iec.exe\r
 *_VS2013x86_EBC_VFRPP_PATH          = DEF(EBC_BINx86)\iec.exe\r
 *_VS2013x86_EBC_CC_PATH             = DEF(EBC_BINx86)\iec.exe\r
 *_VS2013x86_EBC_SLINK_PATH          = DEF(VS2013x86_BIN)\link.exe\r
 *_VS2013x86_EBC_DLINK_PATH          = DEF(VS2013x86_BIN)\link.exe\r
 \r
-*_VS2013x86_EBC_MAKE_FLAGS          = /nologo\r
 *_VS2013x86_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h\r
 *_VS2013x86_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
 *_VS2013x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
@@ -1339,7 +1328,7 @@ NOOPT_VS2013x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2015_*_PP_FLAGS               = /nologo /E /TC /FIAutoGen.h\r
 *_VS2015_*_VFRPP_FLAGS            = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
 *_VS2015_*_DLINK2_FLAGS           =\r
-\r
+*_VS2015_*_DEPS_FLAGS      = DEF(MSFT_DEPS_FLAGS)\r
 *_VS2015_*_ASM16_PATH             = DEF(VS2015_BIN)\ml.exe\r
 \r
 ##################\r
@@ -1357,7 +1346,6 @@ NOOPT_VS2013x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 ##################\r
 *_VS2015_IA32_*_DLL               = DEF(VS2015_DLL)\r
 \r
-*_VS2015_IA32_MAKE_PATH           = DEF(VS2015_BIN)\nmake.exe\r
 *_VS2015_IA32_CC_PATH             = DEF(VS2015_BIN)\cl.exe\r
 *_VS2015_IA32_VFRPP_PATH          = DEF(VS2015_BIN)\cl.exe\r
 *_VS2015_IA32_SLINK_PATH          = DEF(VS2015_BIN)\lib.exe\r
@@ -1369,10 +1357,9 @@ NOOPT_VS2013x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2015_IA32_ASLPP_PATH          = DEF(VS2015_BIN)\cl.exe\r
 *_VS2015_IA32_ASLDLINK_PATH       = DEF(VS2015_BIN)\link.exe\r
 \r
-      *_VS2015_IA32_MAKE_FLAGS    = /nologo\r
-  DEBUG_VS2015_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\r
-RELEASE_VS2015_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw /MP\r
-NOOPT_VS2015_IA32_CC_FLAGS        = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Od /MP\r
+  DEBUG_VS2015_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Gw\r
+RELEASE_VS2015_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw\r
+NOOPT_VS2015_IA32_CC_FLAGS        = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Od\r
 \r
   DEBUG_VS2015_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
 RELEASE_VS2015_IA32_ASM_FLAGS     = /nologo /c /WX /W3 /Cx /coff /Zd\r
@@ -1402,9 +1389,9 @@ NOOPT_VS2015_IA32_DLINK_FLAGS     = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2015_X64_ASLPP_PATH    = DEF(VS2015_BINX64)\cl.exe\r
 *_VS2015_X64_ASLDLINK_PATH = DEF(VS2015_BINX64)\link.exe\r
 \r
-  DEBUG_VS2015_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Gw /MP\r
-RELEASE_VS2015_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Gw /MP\r
-NOOPT_VS2015_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od /MP\r
+  DEBUG_VS2015_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Gw\r
+RELEASE_VS2015_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Gw\r
+NOOPT_VS2015_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od\r
 \r
   DEBUG_VS2015_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
 RELEASE_VS2015_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
@@ -1424,14 +1411,12 @@ NOOPT_VS2015_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2015_EBC_*_FAMILY            = INTEL\r
 *_VS2015_EBC_*_DLL               = DEF(VS2015_DLL)\r
 \r
-*_VS2015_EBC_MAKE_PATH           = DEF(VS2015_BIN)\nmake.exe\r
 *_VS2015_EBC_PP_PATH             = DEF(EBC_BIN)\iec.exe\r
 *_VS2015_EBC_VFRPP_PATH          = DEF(EBC_BIN)\iec.exe\r
 *_VS2015_EBC_CC_PATH             = DEF(EBC_BIN)\iec.exe\r
 *_VS2015_EBC_SLINK_PATH          = DEF(VS2015_BIN)\link.exe\r
 *_VS2015_EBC_DLINK_PATH          = DEF(VS2015_BIN)\link.exe\r
 \r
-*_VS2015_EBC_MAKE_FLAGS          = /nologo\r
 *_VS2015_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h\r
 *_VS2015_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
 *_VS2015_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
@@ -1447,16 +1432,15 @@ NOOPT_VS2015_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2015x86_*_*_FAMILY        = MSFT\r
 \r
 *_VS2015x86_*_MAKE_PATH       = DEF(VS2015x86_BIN)\nmake.exe\r
-*_VS2015x86_*_MAKE_FLAG       = /nologo\r
+*_VS2015x86_*_MAKE_FLAGS      = /nologo\r
 *_VS2015x86_*_RC_PATH         = DEF(WINSDK81x86_BIN)\rc.exe\r
 \r
-*_VS2015x86_*_MAKE_FLAGS      = /nologo\r
 *_VS2015x86_*_SLINK_FLAGS     = /NOLOGO /LTCG\r
 *_VS2015x86_*_APP_FLAGS       = /nologo /E /TC\r
 *_VS2015x86_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h\r
 *_VS2015x86_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
 *_VS2015x86_*_DLINK2_FLAGS    =\r
-\r
+*_VS2015x86_*_DEPS_FLAGS      = DEF(MSFT_DEPS_FLAGS)\r
 *_VS2015x86_*_ASM16_PATH      = DEF(VS2015x86_BIN)\ml.exe\r
 \r
 ##################\r
@@ -1474,7 +1458,6 @@ NOOPT_VS2015_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 ##################\r
 *_VS2015x86_IA32_*_DLL        = DEF(VS2015x86_DLL)\r
 \r
-*_VS2015x86_IA32_MAKE_PATH    = DEF(VS2015x86_BIN)\nmake.exe\r
 *_VS2015x86_IA32_CC_PATH      = DEF(VS2015x86_BIN)\cl.exe\r
 *_VS2015x86_IA32_VFRPP_PATH   = DEF(VS2015x86_BIN)\cl.exe\r
 *_VS2015x86_IA32_ASLCC_PATH   = DEF(VS2015x86_BIN)\cl.exe\r
@@ -1486,10 +1469,9 @@ NOOPT_VS2015_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2015x86_IA32_PP_PATH      = DEF(VS2015x86_BIN)\cl.exe\r
 *_VS2015x86_IA32_ASM_PATH     = DEF(VS2015x86_BIN)\ml.exe\r
 \r
-      *_VS2015x86_IA32_MAKE_FLAGS  = /nologo\r
-  DEBUG_VS2015x86_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\r
-RELEASE_VS2015x86_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw /MP\r
-NOOPT_VS2015x86_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Od /MP\r
+  DEBUG_VS2015x86_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Gw\r
+RELEASE_VS2015x86_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw\r
+NOOPT_VS2015x86_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Od\r
 \r
   DEBUG_VS2015x86_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
 RELEASE_VS2015x86_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd\r
@@ -1519,9 +1501,9 @@ NOOPT_VS2015x86_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2015x86_X64_DLINK_PATH    = DEF(VS2015x86_BINX64)\link.exe\r
 *_VS2015x86_X64_ASLDLINK_PATH = DEF(VS2015x86_BINX64)\link.exe\r
 \r
-  DEBUG_VS2015x86_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Gw /MP\r
-RELEASE_VS2015x86_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Gw /MP\r
-NOOPT_VS2015x86_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od /MP\r
+  DEBUG_VS2015x86_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Gw\r
+RELEASE_VS2015x86_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Gw\r
+NOOPT_VS2015x86_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od\r
 \r
   DEBUG_VS2015x86_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
 RELEASE_VS2015x86_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
@@ -1541,14 +1523,12 @@ NOOPT_VS2015x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2015x86_EBC_*_FAMILY            = INTEL\r
 *_VS2015x86_EBC_*_DLL               = DEF(VS2015x86_DLL)\r
 \r
-*_VS2015x86_EBC_MAKE_PATH           = DEF(VS2015x86_BIN)\nmake.exe\r
 *_VS2015x86_EBC_PP_PATH             = DEF(EBC_BINx86)\iec.exe\r
 *_VS2015x86_EBC_VFRPP_PATH          = DEF(EBC_BINx86)\iec.exe\r
 *_VS2015x86_EBC_CC_PATH             = DEF(EBC_BINx86)\iec.exe\r
 *_VS2015x86_EBC_SLINK_PATH          = DEF(VS2015x86_BIN)\link.exe\r
 *_VS2015x86_EBC_DLINK_PATH          = DEF(VS2015x86_BIN)\link.exe\r
 \r
-*_VS2015x86_EBC_MAKE_FLAGS          = /nologo\r
 *_VS2015x86_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h\r
 *_VS2015x86_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
 *_VS2015x86_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
@@ -1565,17 +1545,16 @@ NOOPT_VS2015x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2017_*_*_DLL           = DEF(VS2017_BIN_HOST)\r
 \r
 *_VS2017_*_MAKE_PATH       = DEF(VS2017_BIN_HOST)\nmake.exe\r
-*_VS2017_*_MAKE_FLAG       = /nologo\r
-*_VS2017_*_RC_PATH         = DEF(WINSDK10_BIN)\rc.exe\r
-\r
 *_VS2017_*_MAKE_FLAGS      = /nologo\r
+*_VS2017_*_RC_PATH         = DEF(RC_PATH)\r
+\r
 *_VS2017_*_SLINK_FLAGS     = /NOLOGO /LTCG\r
 *_VS2017_*_APP_FLAGS       = /nologo /E /TC\r
 *_VS2017_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h\r
 *_VS2017_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
 *_VS2017_*_DLINK2_FLAGS    = /WHOLEARCHIVE\r
 *_VS2017_*_ASM16_PATH      = DEF(VS2017_BIN_IA32)\ml.exe\r
-\r
+*_VS2017_*_DEPS_FLAGS      = DEF(MSFT_DEPS_FLAGS)\r
 ##################\r
 # ASL definitions\r
 ##################\r
@@ -1600,10 +1579,9 @@ NOOPT_VS2015x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2017_IA32_PP_PATH      = DEF(VS2017_BIN_IA32)\cl.exe\r
 *_VS2017_IA32_ASM_PATH     = DEF(VS2017_BIN_IA32)\ml.exe\r
 \r
-      *_VS2017_IA32_MAKE_FLAGS  = /nologo\r
-  DEBUG_VS2017_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\r
-RELEASE_VS2017_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw /MP\r
-NOOPT_VS2017_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Od /MP\r
+  DEBUG_VS2017_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Gw\r
+RELEASE_VS2017_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw\r
+NOOPT_VS2017_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Od\r
 \r
   DEBUG_VS2017_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
 RELEASE_VS2017_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd\r
@@ -1631,9 +1609,9 @@ NOOPT_VS2017_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /O
 *_VS2017_X64_DLINK_PATH    = DEF(VS2017_BIN_X64)\link.exe\r
 *_VS2017_X64_ASLDLINK_PATH = DEF(VS2017_BIN_X64)\link.exe\r
 \r
-  DEBUG_VS2017_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Gw /MP\r
-RELEASE_VS2017_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Gw /MP\r
-NOOPT_VS2017_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od /MP\r
+  DEBUG_VS2017_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Gw\r
+RELEASE_VS2017_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Gw\r
+NOOPT_VS2017_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od\r
 \r
   DEBUG_VS2017_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
 RELEASE_VS2017_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
@@ -1661,10 +1639,9 @@ NOOPT_VS2017_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:428
 *_VS2017_ARM_ASLPP_PATH           = DEF(VS2017_BIN_ARM)\cl.exe\r
 *_VS2017_ARM_ASLDLINK_PATH        = DEF(VS2017_BIN_ARM)\link.exe\r
 \r
-      *_VS2017_ARM_MAKE_FLAGS     = /nologo\r
-  DEBUG_VS2017_ARM_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Gw /Oi-\r
+  DEBUG_VS2017_ARM_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gw /Oi-\r
 RELEASE_VS2017_ARM_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw /Oi-\r
-NOOPT_VS2017_ARM_CC_FLAGS         = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od /Oi-\r
+NOOPT_VS2017_ARM_CC_FLAGS         = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Od /Oi-\r
 \r
   DEBUG_VS2017_ARM_ASM_FLAGS      = /nologo /g\r
 RELEASE_VS2017_ARM_ASM_FLAGS      = /nologo\r
@@ -1688,10 +1665,9 @@ NOOPT_VS2017_ARM_DLINK_FLAGS      = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2017_AARCH64_ASLPP_PATH        = DEF(VS2017_BIN_AARCH64)\cl.exe\r
 *_VS2017_AARCH64_ASLDLINK_PATH     = DEF(VS2017_BIN_AARCH64)\link.exe\r
 \r
-      *_VS2017_AARCH64_MAKE_FLAGS  = /nologo\r
-  DEBUG_VS2017_AARCH64_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Gw /Oi-\r
+  DEBUG_VS2017_AARCH64_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gw /Oi-\r
 RELEASE_VS2017_AARCH64_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw /Oi-\r
-NOOPT_VS2017_AARCH64_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od /Oi-\r
+NOOPT_VS2017_AARCH64_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Od /Oi-\r
 \r
   DEBUG_VS2017_AARCH64_ASM_FLAGS   = /nologo /g\r
 RELEASE_VS2017_AARCH64_ASM_FLAGS   = /nologo\r
@@ -1712,7 +1688,6 @@ NOOPT_VS2017_AARCH64_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2017_EBC_SLINK_PATH          = DEF(VS2017_BIN_IA32)\link.exe\r
 *_VS2017_EBC_DLINK_PATH          = DEF(VS2017_BIN_IA32)\link.exe\r
 \r
-*_VS2017_EBC_MAKE_FLAGS          = /nologo\r
 *_VS2017_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h\r
 *_VS2017_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
 *_VS2017_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
@@ -1728,17 +1703,16 @@ NOOPT_VS2017_AARCH64_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2019_*_*_DLL           = DEF(VS2019_BIN_HOST)\r
 \r
 *_VS2019_*_MAKE_PATH       = DEF(VS2019_BIN_HOST)\nmake.exe\r
-*_VS2019_*_MAKE_FLAG       = /nologo\r
-*_VS2019_*_RC_PATH         = DEF(WINSDK10_BIN)\rc.exe\r
-\r
 *_VS2019_*_MAKE_FLAGS      = /nologo\r
+*_VS2019_*_RC_PATH         = DEF(RC_PATH)\r
+\r
 *_VS2019_*_SLINK_FLAGS     = /NOLOGO /LTCG\r
 *_VS2019_*_APP_FLAGS       = /nologo /E /TC\r
 *_VS2019_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h\r
 *_VS2019_*_VFRPP_FLAGS     = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
 *_VS2019_*_DLINK2_FLAGS    = /WHOLEARCHIVE\r
 *_VS2019_*_ASM16_PATH      = DEF(VS2019_BIN_IA32)\ml.exe\r
-\r
+*_VS2019_*_DEPS_FLAGS      = DEF(MSFT_DEPS_FLAGS)\r
 ##################\r
 # ASL definitions\r
 ##################\r
@@ -1763,10 +1737,9 @@ NOOPT_VS2017_AARCH64_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2019_IA32_PP_PATH      = DEF(VS2019_BIN_IA32)\cl.exe\r
 *_VS2019_IA32_ASM_PATH     = DEF(VS2019_BIN_IA32)\ml.exe\r
 \r
-      *_VS2019_IA32_MAKE_FLAGS  = /nologo\r
-  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\r
-RELEASE_VS2019_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw /MP\r
-NOOPT_VS2019_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Od /MP\r
+  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\r
+RELEASE_VS2019_IA32_CC_FLAGS    = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw\r
+NOOPT_VS2019_IA32_CC_FLAGS      = /nologo /arch:IA32 /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Z7 /Od\r
 \r
   DEBUG_VS2019_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd /Zi\r
 RELEASE_VS2019_IA32_ASM_FLAGS   = /nologo /c /WX /W3 /Cx /coff /Zd\r
@@ -1794,9 +1767,9 @@ NOOPT_VS2019_IA32_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /O
 *_VS2019_X64_DLINK_PATH    = DEF(VS2019_BIN_X64)\link.exe\r
 *_VS2019_X64_ASLDLINK_PATH = DEF(VS2019_BIN_X64)\link.exe\r
 \r
-  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\r
-RELEASE_VS2019_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Gw /MP\r
-NOOPT_VS2019_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od /MP\r
+  DEBUG_VS2019_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Gw\r
+RELEASE_VS2019_X64_CC_FLAGS     = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Gw\r
+NOOPT_VS2019_X64_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Z7 /Od\r
 \r
   DEBUG_VS2019_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd /Zi\r
 RELEASE_VS2019_X64_ASM_FLAGS    = /nologo /c /WX /W3 /Cx /Zd\r
@@ -1824,10 +1797,9 @@ NOOPT_VS2019_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:428
 *_VS2019_ARM_ASLPP_PATH           = DEF(VS2019_BIN_ARM)\cl.exe\r
 *_VS2019_ARM_ASLDLINK_PATH        = DEF(VS2019_BIN_ARM)\link.exe\r
 \r
-      *_VS2019_ARM_MAKE_FLAGS     = /nologo\r
-  DEBUG_VS2019_ARM_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Gw /Oi-\r
+  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-\r
 RELEASE_VS2019_ARM_CC_FLAGS       = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw /Oi-\r
-NOOPT_VS2019_ARM_CC_FLAGS         = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od /Oi-\r
+NOOPT_VS2019_ARM_CC_FLAGS         = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Od /Oi-\r
 \r
   DEBUG_VS2019_ARM_ASM_FLAGS      = /nologo /g\r
 RELEASE_VS2019_ARM_ASM_FLAGS      = /nologo\r
@@ -1851,10 +1823,9 @@ NOOPT_VS2019_ARM_DLINK_FLAGS      = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2019_AARCH64_ASLPP_PATH        = DEF(VS2019_BIN_AARCH64)\cl.exe\r
 *_VS2019_AARCH64_ASLDLINK_PATH     = DEF(VS2019_BIN_AARCH64)\link.exe\r
 \r
-      *_VS2019_AARCH64_MAKE_FLAGS  = /nologo\r
-  DEBUG_VS2019_AARCH64_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Gw /Oi-\r
+  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-\r
 RELEASE_VS2019_AARCH64_CC_FLAGS    = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Gw /Oi-\r
-NOOPT_VS2019_AARCH64_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /Od /Oi-\r
+NOOPT_VS2019_AARCH64_CC_FLAGS      = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Od /Oi-\r
 \r
   DEBUG_VS2019_AARCH64_ASM_FLAGS   = /nologo /g\r
 RELEASE_VS2019_AARCH64_ASM_FLAGS   = /nologo\r
@@ -1875,7 +1846,6 @@ NOOPT_VS2019_AARCH64_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2019_EBC_SLINK_PATH          = DEF(VS2019_BIN_IA32)\link.exe\r
 *_VS2019_EBC_DLINK_PATH          = DEF(VS2019_BIN_IA32)\link.exe\r
 \r
-*_VS2019_EBC_MAKE_FLAGS          = /nologo\r
 *_VS2019_EBC_PP_FLAGS            = /nologo /E /TC /FIAutoGen.h\r
 *_VS2019_EBC_CC_FLAGS            = /nologo /c /WX /W3 /FIAutoGen.h /D$(MODULE_ENTRY_POINT)=$(ARCH_ENTRY_POINT)\r
 *_VS2019_EBC_VFRPP_FLAGS         = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h\r
@@ -1926,8 +1896,12 @@ DEFINE GCC_IA32_RC_FLAGS           = -I binary -O elf32-i386          -B i386
 DEFINE GCC_X64_RC_FLAGS            = -I binary -O elf64-x86-64        -B i386    --rename-section .data=.hii\r
 DEFINE GCC_ARM_RC_FLAGS            = -I binary -O elf32-littlearm     -B arm     --rename-section .data=.hii\r
 DEFINE GCC_AARCH64_RC_FLAGS        = -I binary -O elf64-littleaarch64 -B aarch64 --rename-section .data=.hii\r
+DEFINE GCC_RISCV64_RC_FLAGS        = -I binary -O elf64-littleriscv   -B riscv   --rename-section .data=.hii\r
 \r
-DEFINE GCC48_ALL_CC_FLAGS            = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings\r
+# GCC Build Flag for included header file list generation\r
+DEFINE GCC_DEPS_FLAGS              = -MMD -MF $@.deps\r
+\r
+DEFINE GCC48_ALL_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -ffunction-sections -fdata-sections -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings\r
 DEFINE GCC48_IA32_X64_DLINK_COMMON   = -nostdlib -Wl,-n,-q,--gc-sections -z common-page-size=0x20\r
 DEFINE GCC48_IA32_CC_FLAGS           = DEF(GCC48_ALL_CC_FLAGS) -m32 -march=i586 -malign-double -fno-stack-protector -D EFI32 -fno-asynchronous-unwind-tables -Wno-address\r
 DEFINE GCC48_X64_CC_FLAGS            = DEF(GCC48_ALL_CC_FLAGS) -m64 -fno-stack-protector "-DEFIAPI=__attribute__((ms_abi))" -maccumulate-outgoing-args -mno-red-zone -Wno-address -mcmodel=small -fpie -fno-asynchronous-unwind-tables -Wno-address\r
@@ -1951,7 +1925,7 @@ DEFINE GCC48_ARM_ASLDLINK_FLAGS      = DEF(GCC_ARM_ASLDLINK_FLAGS) -Wl,--oformat
 DEFINE GCC48_AARCH64_ASLDLINK_FLAGS  = DEF(GCC_AARCH64_ASLDLINK_FLAGS)\r
 DEFINE GCC48_ASLCC_FLAGS             = DEF(GCC_ASLCC_FLAGS)\r
 \r
-DEFINE GCC49_IA32_CC_FLAGS           = DEF(GCC48_IA32_CC_FLAGS)\r
+DEFINE GCC49_IA32_CC_FLAGS           = DEF(GCC48_IA32_CC_FLAGS) -fno-pic -fno-pie\r
 DEFINE GCC49_X64_CC_FLAGS            = DEF(GCC48_X64_CC_FLAGS)\r
 DEFINE GCC49_IA32_X64_DLINK_COMMON   = -nostdlib -Wl,-n,-q,--gc-sections -z common-page-size=0x40\r
 DEFINE GCC49_IA32_X64_ASLDLINK_FLAGS = DEF(GCC49_IA32_X64_DLINK_COMMON) -Wl,--defsym=PECOFF_HEADER_SIZE=0 DEF(GCC_DLINK2_FLAGS_COMMON) -Wl,--entry,ReferenceAcpiTable -u ReferenceAcpiTable\r
@@ -1974,7 +1948,7 @@ DEFINE GCC49_ARM_ASLDLINK_FLAGS      = DEF(GCC48_ARM_ASLDLINK_FLAGS)
 DEFINE GCC49_AARCH64_ASLDLINK_FLAGS  = DEF(GCC48_AARCH64_ASLDLINK_FLAGS)\r
 DEFINE GCC49_ASLCC_FLAGS             = DEF(GCC48_ASLCC_FLAGS)\r
 \r
-DEFINE GCC5_IA32_CC_FLAGS            = DEF(GCC49_IA32_CC_FLAGS) -fno-pic -fno-pie\r
+DEFINE GCC5_IA32_CC_FLAGS            = DEF(GCC49_IA32_CC_FLAGS)\r
 DEFINE GCC5_X64_CC_FLAGS             = DEF(GCC49_X64_CC_FLAGS)\r
 DEFINE GCC5_IA32_X64_DLINK_COMMON    = DEF(GCC49_IA32_X64_DLINK_COMMON)\r
 DEFINE GCC5_IA32_X64_ASLDLINK_FLAGS  = DEF(GCC49_IA32_X64_ASLDLINK_FLAGS)\r
@@ -1997,6 +1971,23 @@ DEFINE GCC5_ARM_ASLDLINK_FLAGS       = DEF(GCC49_ARM_ASLDLINK_FLAGS)
 DEFINE GCC5_AARCH64_ASLDLINK_FLAGS   = DEF(GCC49_AARCH64_ASLDLINK_FLAGS)\r
 DEFINE GCC5_ASLCC_FLAGS              = DEF(GCC49_ASLCC_FLAGS) -fno-lto\r
 \r
+DEFINE GCC5_RISCV_ALL_CC_FLAGS                    = -g -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings -msmall-data-limit=0\r
+DEFINE GCC5_RISCV_ALL_DLINK_COMMON                = -nostdlib -Wl,-n,-q,--gc-sections -z common-page-size=0x40\r
+DEFINE GCC5_RISCV_ALL_DLINK_FLAGS                 = DEF(GCC5_RISCV_ALL_DLINK_COMMON) -Wl,--entry,$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Wl,-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
+DEFINE GCC5_RISCV_ALL_DLINK2_FLAGS                = -Wl,--defsym=PECOFF_HEADER_SIZE=0x220,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds\r
+DEFINE GCC5_RISCV_ALL_ASM_FLAGS                   = -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h\r
+DEFINE GCC5_RISCV_ALL_CC_FLAGS_WARNING_DISABLE    = -Wno-tautological-compare -Wno-pointer-compare\r
+\r
+DEFINE GCC5_RISCV_OPENSBI_TYPES                   = -DOPENSBI_EXTERNAL_SBI_TYPES=OpensbiTypes.h\r
+\r
+DEFINE GCC5_RISCV64_ARCH                   = rv64imafdc\r
+DEFINE GCC5_RISCV32_RISCV64_ASLDLINK_FLAGS = DEF(GCC5_RISCV_ALL_DLINK_COMMON) -Wl,--entry,ReferenceAcpiTable -u ReferenceAcpiTable\r
+DEFINE GCC5_RISCV64_CC_FLAGS               = DEF(GCC5_RISCV_ALL_CC_FLAGS) DEF(GCC5_RISCV_ALL_CC_FLAGS_WARNING_DISABLE) DEF(GCC5_RISCV_OPENSBI_TYPES) -march=DEF(GCC5_RISCV64_ARCH) -fno-builtin -fno-builtin-memcpy -fno-stack-protector -Wno-address -fno-asynchronous-unwind-tables -Wno-unused-but-set-variable -fpack-struct=8 -mcmodel=medany -mabi=lp64 -mno-relax\r
+DEFINE GCC5_RISCV64_DLINK_FLAGS            = DEF(GCC5_RISCV_ALL_DLINK_FLAGS) -Wl,-melf64lriscv,--oformat=elf64-littleriscv,--no-relax\r
+DEFINE GCC5_RISCV64_DLINK2_FLAGS           = DEF(GCC5_RISCV_ALL_DLINK2_FLAGS)\r
+DEFINE GCC5_RISCV64_ASM_FLAGS              = DEF(GCC5_RISCV_ALL_ASM_FLAGS) -march=DEF(GCC5_RISCV64_ARCH) -mcmodel=medany -mabi=lp64\r
+DEFINE GCC_PP_FLAGS                        = -E -x assembler-with-cpp -include AutoGen.h DEF(GCC5_RISCV_OPENSBI_TYPES)\r
+\r
 ####################################################################################\r
 #\r
 # GCC 4.8 - This configuration is used to compile under Linux to produce\r
@@ -2016,6 +2007,7 @@ DEFINE GCC5_ASLCC_FLAGS              = DEF(GCC49_ASLCC_FLAGS) -fno-lto
 *_GCC48_*_APP_FLAGS                    =\r
 *_GCC48_*_ASL_FLAGS                    = DEF(IASL_FLAGS)\r
 *_GCC48_*_ASL_OUTFLAGS                 = DEF(IASL_OUTFLAGS)\r
+*_GCC48_*_DEPS_FLAGS                   = DEF(GCC_DEPS_FLAGS)\r
 \r
 ##################\r
 # GCC48 IA32 definitions\r
@@ -2155,6 +2147,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS   = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s
 *_GCC49_*_APP_FLAGS                    =\r
 *_GCC49_*_ASL_FLAGS                    = DEF(IASL_FLAGS)\r
 *_GCC49_*_ASL_OUTFLAGS                 = DEF(IASL_OUTFLAGS)\r
+*_GCC49_*_DEPS_FLAGS                   = DEF(GCC_DEPS_FLAGS)\r
 \r
 ##################\r
 # GCC49 IA32 definitions\r
@@ -2301,6 +2294,7 @@ RELEASE_GCC49_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20
 *_GCC5_*_APP_FLAGS               =\r
 *_GCC5_*_ASL_FLAGS               = DEF(IASL_FLAGS)\r
 *_GCC5_*_ASL_OUTFLAGS            = DEF(IASL_OUTFLAGS)\r
+*_GCC5_*_DEPS_FLAGS                   = DEF(GCC_DEPS_FLAGS)\r
 \r
 ##################\r
 # GCC5 IA32 definitions\r
@@ -2438,6 +2432,38 @@ RELEASE_GCC5_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20
   NOOPT_GCC5_AARCH64_DLINK_FLAGS = DEF(GCC5_AARCH64_DLINK_FLAGS) -O0\r
   NOOPT_GCC5_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20 -O0\r
 \r
+####################################################################################\r
+#\r
+# GCC RISC-V This configuration is used to compile under Linux to produce\r
+#             PE/COFF binaries using GCC RISC-V tool chain\r
+#\r
+####################################################################################\r
+\r
+##################\r
+# GCC5 RISCV64 definitions\r
+##################\r
+*_GCC5_RISCV64_OBJCOPY_PATH         = ENV(GCC5_RISCV64_PREFIX)objcopy\r
+*_GCC5_RISCV64_CC_PATH              = ENV(GCC5_RISCV64_PREFIX)gcc\r
+*_GCC5_RISCV64_SLINK_PATH           = ENV(GCC5_RISCV64_PREFIX)gcc-ar\r
+*_GCC5_RISCV64_DLINK_PATH           = ENV(GCC5_RISCV64_PREFIX)gcc\r
+*_GCC5_RISCV64_ASLDLINK_PATH        = ENV(GCC5_RISCV64_PREFIX)gcc\r
+*_GCC5_RISCV64_ASM_PATH             = ENV(GCC5_RISCV64_PREFIX)gcc\r
+*_GCC5_RISCV64_PP_PATH              = ENV(GCC5_RISCV64_PREFIX)gcc\r
+*_GCC5_RISCV64_VFRPP_PATH           = ENV(GCC5_RISCV64_PREFIX)gcc\r
+*_GCC5_RISCV64_ASLCC_PATH           = ENV(GCC5_RISCV64_PREFIX)gcc\r
+*_GCC5_RISCV64_ASLPP_PATH           = ENV(GCC5_RISCV64_PREFIX)gcc\r
+*_GCC5_RISCV64_RC_PATH              = ENV(GCC5_RISCV64_PREFIX)objcopy\r
+\r
+*_GCC5_RISCV64_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS)\r
+*_GCC5_RISCV64_ASLDLINK_FLAGS       = DEF(GCC5_RISCV32_RISCV64_ASLDLINK_FLAGS)\r
+*_GCC5_RISCV64_ASM_FLAGS            = DEF(GCC5_RISCV64_ASM_FLAGS)\r
+*_GCC5_RISCV64_CC_FLAGS             = DEF(GCC5_RISCV64_CC_FLAGS) -save-temps\r
+*_GCC5_RISCV64_DLINK_FLAGS          = DEF(GCC5_RISCV64_DLINK_FLAGS)\r
+*_GCC5_RISCV64_DLINK2_FLAGS         = DEF(GCC5_RISCV64_DLINK2_FLAGS)\r
+*_GCC5_RISCV64_RC_FLAGS             = DEF(GCC_RISCV64_RC_FLAGS)\r
+*_GCC5_RISCV64_OBJCOPY_FLAGS        =\r
+*_GCC5_RISCV64_DTCPP_FLAGS          = DEF(GCC_DTCPP_FLAGS)\r
+\r
 ####################################################################################\r
 #\r
 # CLANG35   - This configuration is used to compile under Linux to produce\r
@@ -2466,6 +2492,7 @@ RELEASE_GCC5_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20
 *_CLANG35_*_ASLPP_PATH           = ENV(CLANG35_BIN)clang\r
 *_CLANG35_*_DLINK_PATH           = ENV(CLANG35_BIN)clang\r
 *_CLANG35_*_ASLDLINK_PATH        = ENV(CLANG35_BIN)clang\r
+*_CLANG35_*_DEPS_FLAGS           = DEF(GCC_DEPS_FLAGS)\r
 \r
 DEFINE CLANG35_ARM_TARGET        = -target arm-linux-gnueabi\r
 DEFINE CLANG35_AARCH64_TARGET    = -target aarch64-linux-gnu\r
@@ -2533,7 +2560,7 @@ RELEASE_CLANG35_AARCH64_CC_FLAGS = DEF(CLANG35_AARCH64_CC_FLAGS) $(ARCHCC_FLAGS)
 *_CLANG38_*_APP_FLAGS               =\r
 *_CLANG38_*_ASL_FLAGS               = DEF(IASL_FLAGS)\r
 *_CLANG38_*_ASL_OUTFLAGS            = DEF(IASL_OUTFLAGS)\r
-\r
+*_CLANG38_*_DEPS_FLAGS              = DEF(GCC_DEPS_FLAGS)\r
 DEFINE CLANG38_IA32_PREFIX          = ENV(CLANG38_BIN)\r
 DEFINE CLANG38_X64_PREFIX           = ENV(CLANG38_BIN)\r
 \r
@@ -2709,98 +2736,199 @@ RELEASE_CLANG38_AARCH64_DLINK_FLAGS = DEF(CLANG38_AARCH64_DLINK_FLAGS) -flto -Wl
 \r
 ####################################################################################\r
 #\r
-# CLANG9 - This configuration is used to compile under Windows/Linux/Mac to produce\r
+# CLANGPDB - This configuration is used to compile under Windows/Linux/Mac to produce\r
 #  PE/COFF binaries using LLVM/Clang/LLD with Link Time Optimization enabled\r
 #\r
 ####################################################################################\r
-*_CLANG9_*_*_FAMILY                = GCC\r
-*_CLANG9_*_*_BUILDRULEFAMILY       = CLANGPE\r
-*_CLANG9_*_MAKE_PATH               = ENV(CLANG_HOST_BIN)make\r
-*_CLANG9_*_*_DLL                   = ENV(CLANG9_DLL)\r
-*_CLANG9_*_ASL_PATH                = DEF(UNIX_IASL_BIN)\r
+*_CLANGPDB_*_*_FAMILY                = GCC\r
+*_CLANGPDB_*_*_BUILDRULEFAMILY       = CLANGPDB\r
+*_CLANGPDB_*_MAKE_PATH               = ENV(CLANG_HOST_BIN)make\r
+*_CLANGPDB_*_*_DLL                   = ENV(CLANGPDB_DLL)\r
+*_CLANGPDB_*_ASL_PATH                = DEF(UNIX_IASL_BIN)\r
 \r
-*_CLANG9_*_APP_FLAGS               =\r
-*_CLANG9_*_ASL_FLAGS               = DEF(DEFAULT_WIN_ASL_FLAGS)\r
-*_CLANG9_*_ASL_OUTFLAGS            = DEF(DEFAULT_WIN_ASL_OUTFLAGS)\r
-*_CLANG9_*_ASLDLINK_FLAGS          = DEF(MSFT_ASLDLINK_FLAGS)\r
+*_CLANGPDB_*_APP_FLAGS               =\r
+*_CLANGPDB_*_ASL_FLAGS               = DEF(DEFAULT_WIN_ASL_FLAGS)\r
+*_CLANGPDB_*_ASL_OUTFLAGS            = DEF(DEFAULT_WIN_ASL_OUTFLAGS)\r
+*_CLANGPDB_*_ASLDLINK_FLAGS          = DEF(MSFT_ASLDLINK_FLAGS)\r
+*_CLANGPDB_*_DEPS_FLAGS              = DEF(GCC_DEPS_FLAGS)\r
 \r
-DEFINE CLANG9_IA32_PREFIX          = ENV(CLANG9_BIN)\r
-DEFINE CLANG9_X64_PREFIX           = ENV(CLANG9_BIN)\r
+DEFINE CLANGPDB_IA32_PREFIX          = ENV(CLANG_BIN)\r
+DEFINE CLANGPDB_X64_PREFIX           = ENV(CLANG_BIN)\r
 \r
-DEFINE CLANG9_IA32_TARGET          = -target i686-unknown-windows\r
-DEFINE CLANG9_X64_TARGET           = -target x86_64-unknown-windows\r
+DEFINE CLANGPDB_IA32_TARGET          = -target i686-unknown-windows-gnu\r
+DEFINE CLANGPDB_X64_TARGET           = -target x86_64-unknown-windows-gnu\r
 \r
-DEFINE CLANG9_WARNING_OVERRIDES    = -Wno-parentheses-equality -Wno-tautological-compare -Wno-tautological-constant-out-of-range-compare -Wno-empty-body -Wno-unused-const-variable -Wno-varargs -Wno-unknown-warning-option -Wno-microsoft-enum-forward-reference\r
-DEFINE CLANG9_ALL_CC_FLAGS         = DEF(GCC48_ALL_CC_FLAGS) DEF(CLANG9_WARNING_OVERRIDES) -fno-stack-protector -mms-bitfields -Wno-address -Wno-shift-negative-value -Wno-unknown-pragmas -Wno-incompatible-library-redeclaration -fno-asynchronous-unwind-tables -mno-implicit-float  -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -funsigned-char -fno-ms-extensions -Wno-null-dereference -fms-compatibility -mno-stack-arg-probe\r
+DEFINE CLANGPDB_WARNING_OVERRIDES    = -Wno-parentheses-equality -Wno-tautological-compare -Wno-tautological-constant-out-of-range-compare -Wno-empty-body -Wno-unused-const-variable -Wno-varargs -Wno-unknown-warning-option -Wno-microsoft-enum-forward-reference\r
+DEFINE CLANGPDB_ALL_CC_FLAGS         = DEF(GCC48_ALL_CC_FLAGS) DEF(CLANGPDB_WARNING_OVERRIDES) -fno-stack-protector -funsigned-char -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -Wno-address -Wno-shift-negative-value -Wno-unknown-pragmas -Wno-incompatible-library-redeclaration -Wno-null-dereference -mno-implicit-float -mms-bitfields -mno-stack-arg-probe -nostdlib -nostdlibinc -fseh-exceptions\r
 \r
 ###########################\r
-# CLANG9 IA32 definitions\r
+# CLANGPDB IA32 definitions\r
 ###########################\r
-*_CLANG9_IA32_CC_PATH              = DEF(CLANG9_IA32_PREFIX)clang\r
-*_CLANG9_IA32_SLINK_PATH           = DEF(CLANG9_IA32_PREFIX)llvm-lib\r
-*_CLANG9_IA32_DLINK_PATH           = DEF(CLANG9_IA32_PREFIX)lld-link\r
-*_CLANG9_IA32_ASLDLINK_PATH        = DEF(CLANG9_IA32_PREFIX)lld-link\r
-*_CLANG9_IA32_ASM_PATH             = DEF(CLANG9_IA32_PREFIX)clang\r
-*_CLANG9_IA32_PP_PATH              = DEF(CLANG9_IA32_PREFIX)clang\r
-*_CLANG9_IA32_VFRPP_PATH           = DEF(CLANG9_IA32_PREFIX)clang\r
-*_CLANG9_IA32_ASLCC_PATH           = DEF(CLANG9_IA32_PREFIX)clang\r
-*_CLANG9_IA32_ASLPP_PATH           = DEF(CLANG9_IA32_PREFIX)clang\r
-*_CLANG9_IA32_RC_PATH              = DEF(CLANG9_IA32_PREFIX)llvm-rc\r
-\r
-*_CLANG9_IA32_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m32 -fno-lto DEF(CLANG9_IA32_TARGET)\r
-*_CLANG9_IA32_ASM_FLAGS            = DEF(GCC_ASM_FLAGS) -m32 -march=i386 DEF(CLANG9_IA32_TARGET)\r
-*_CLANG9_IA32_OBJCOPY_FLAGS        =\r
-*_CLANG9_IA32_NASM_FLAGS           = -f win32\r
-*_CLANG9_IA32_PP_FLAGS             = DEF(GCC_PP_FLAGS) DEF(CLANG9_IA32_TARGET)\r
-*_CLANG9_IA32_ASLPP_FLAGS          = DEF(GCC_ASLPP_FLAGS) DEF(CLANG9_IA32_TARGET)\r
-*_CLANG9_IA32_VFRPP_FLAGS          = DEF(GCC_VFRPP_FLAGS) DEF(CLANG9_IA32_TARGET)\r
-\r
-DEBUG_CLANG9_IA32_CC_FLAGS         = DEF(CLANG9_ALL_CC_FLAGS) -m32 -Oz -flto -march=i586 DEF(CLANG9_IA32_TARGET) -gcodeview\r
-DEBUG_CLANG9_IA32_DLINK_FLAGS      = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /ALIGN:32 /FILEALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DEBUG:GHASH  /lldmap\r
-DEBUG_CLANG9_IA32_DLINK2_FLAGS     =\r
-\r
-RELEASE_CLANG9_IA32_CC_FLAGS       = DEF(CLANG9_ALL_CC_FLAGS) -m32 -Oz -flto -march=i586 DEF(CLANG9_IA32_TARGET)\r
-RELEASE_CLANG9_IA32_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /ALIGN:32 /FILEALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /MERGE:.rdata=.data  /lldmap\r
-RELEASE_CLANG9_IA32_DLINK2_FLAGS   =\r
-\r
-NOOPT_CLANG9_IA32_CC_FLAGS         = DEF(CLANG9_ALL_CC_FLAGS) -m32 -O0 -march=i586 DEF(CLANG9_IA32_TARGET) -gcodeview\r
-NOOPT_CLANG9_IA32_DLINK_FLAGS      = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /ALIGN:32 /FILEALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DEBUG:GHASH  /lldmap\r
-NOOPT_CLANG9_IA32_DLINK2_FLAGS     =\r
+*_CLANGPDB_IA32_CC_PATH              = DEF(CLANGPDB_IA32_PREFIX)clang\r
+*_CLANGPDB_IA32_SLINK_PATH           = DEF(CLANGPDB_IA32_PREFIX)llvm-lib\r
+*_CLANGPDB_IA32_DLINK_PATH           = DEF(CLANGPDB_IA32_PREFIX)lld-link\r
+*_CLANGPDB_IA32_ASLDLINK_PATH        = DEF(CLANGPDB_IA32_PREFIX)lld-link\r
+*_CLANGPDB_IA32_ASM_PATH             = DEF(CLANGPDB_IA32_PREFIX)clang\r
+*_CLANGPDB_IA32_PP_PATH              = DEF(CLANGPDB_IA32_PREFIX)clang\r
+*_CLANGPDB_IA32_VFRPP_PATH           = DEF(CLANGPDB_IA32_PREFIX)clang\r
+*_CLANGPDB_IA32_ASLCC_PATH           = DEF(CLANGPDB_IA32_PREFIX)clang\r
+*_CLANGPDB_IA32_ASLPP_PATH           = DEF(CLANGPDB_IA32_PREFIX)clang\r
+*_CLANGPDB_IA32_RC_PATH              = DEF(CLANGPDB_IA32_PREFIX)llvm-rc\r
+\r
+*_CLANGPDB_IA32_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m32 -fno-lto DEF(CLANGPDB_IA32_TARGET)\r
+*_CLANGPDB_IA32_ASM_FLAGS            = DEF(GCC_ASM_FLAGS) -m32 -march=i386 DEF(CLANGPDB_IA32_TARGET)\r
+*_CLANGPDB_IA32_OBJCOPY_FLAGS        =\r
+*_CLANGPDB_IA32_NASM_FLAGS           = -f win32\r
+*_CLANGPDB_IA32_PP_FLAGS             = DEF(GCC_PP_FLAGS) DEF(CLANGPDB_IA32_TARGET)\r
+*_CLANGPDB_IA32_ASLPP_FLAGS          = DEF(GCC_ASLPP_FLAGS) DEF(CLANGPDB_IA32_TARGET)\r
+*_CLANGPDB_IA32_VFRPP_FLAGS          = DEF(GCC_VFRPP_FLAGS) DEF(CLANGPDB_IA32_TARGET)\r
+\r
+DEBUG_CLANGPDB_IA32_CC_FLAGS         = DEF(CLANGPDB_ALL_CC_FLAGS) -m32 -Oz -flto -march=i586 DEF(CLANGPDB_IA32_TARGET) -gcodeview\r
+DEBUG_CLANGPDB_IA32_DLINK_FLAGS      = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /ALIGN:32 /FILEALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DEBUG:GHASH /MLLVM:-exception-model=wineh /lldmap\r
+DEBUG_CLANGPDB_IA32_DLINK2_FLAGS     =\r
+\r
+RELEASE_CLANGPDB_IA32_CC_FLAGS       = DEF(CLANGPDB_ALL_CC_FLAGS) -m32 -Oz -flto -march=i586 DEF(CLANGPDB_IA32_TARGET)\r
+RELEASE_CLANGPDB_IA32_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /ALIGN:32 /FILEALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /MERGE:.rdata=.data /MLLVM:-exception-model=wineh /lldmap\r
+RELEASE_CLANGPDB_IA32_DLINK2_FLAGS   =\r
+\r
+NOOPT_CLANGPDB_IA32_CC_FLAGS         = DEF(CLANGPDB_ALL_CC_FLAGS) -m32 -O0 -march=i586 DEF(CLANGPDB_IA32_TARGET) -gcodeview\r
+NOOPT_CLANGPDB_IA32_DLINK_FLAGS      = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /ALIGN:32 /FILEALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:X86 /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DEBUG:GHASH /MLLVM:-exception-model=wineh /lldmap\r
+NOOPT_CLANGPDB_IA32_DLINK2_FLAGS     =\r
 \r
 ##########################\r
 # CLANGWIN X64 definitions\r
 ##########################\r
-*_CLANG9_X64_CC_PATH              = DEF(CLANG9_X64_PREFIX)clang\r
-*_CLANG9_X64_SLINK_PATH           = DEF(CLANG9_X64_PREFIX)llvm-lib\r
-*_CLANG9_X64_DLINK_PATH           = DEF(CLANG9_X64_PREFIX)lld-link\r
-*_CLANG9_X64_ASLDLINK_PATH        = DEF(CLANG9_X64_PREFIX)lld-link\r
-*_CLANG9_X64_ASM_PATH             = DEF(CLANG9_X64_PREFIX)clang\r
-*_CLANG9_X64_PP_PATH              = DEF(CLANG9_X64_PREFIX)clang\r
-*_CLANG9_X64_VFRPP_PATH           = DEF(CLANG9_X64_PREFIX)clang\r
-*_CLANG9_X64_ASLCC_PATH           = DEF(CLANG9_X64_PREFIX)clang\r
-*_CLANG9_X64_ASLPP_PATH           = DEF(CLANG9_X64_PREFIX)clang\r
-*_CLANG9_X64_RC_PATH              = DEF(CLANG9_IA32_PREFIX)llvm-rc\r
-\r
-*_CLANG9_X64_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m64 -fno-lto DEF(CLANG9_X64_TARGET)\r
-*_CLANG9_X64_ASM_FLAGS            = DEF(GCC_ASM_FLAGS) -m64 DEF(CLANG9_X64_TARGET)\r
-*_CLANG9_X64_OBJCOPY_FLAGS        =\r
-*_CLANG9_X64_NASM_FLAGS           = -f win64\r
-*_CLANG9_X64_PP_FLAGS             = DEF(GCC_PP_FLAGS) DEF(CLANG9_X64_TARGET)\r
-*_CLANG9_X64_ASLPP_FLAGS          = DEF(GCC_ASLPP_FLAGS) DEF(CLANG9_X64_TARGET)\r
-*_CLANG9_X64_VFRPP_FLAGS          = DEF(GCC_VFRPP_FLAGS) DEF(CLANG9_X64_TARGET)\r
-\r
-DEBUG_CLANG9_X64_CC_FLAGS         = DEF(CLANG9_ALL_CC_FLAGS) -m64 "-DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -Oz -flto DEF(CLANG9_X64_TARGET) -gcodeview\r
-DEBUG_CLANG9_X64_DLINK_FLAGS      = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /ALIGN:32 /FILEALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DEBUG:GHASH  /lldmap\r
-DEBUG_CLANG9_X64_DLINK2_FLAGS     =\r
-\r
-RELEASE_CLANG9_X64_CC_FLAGS       = DEF(CLANG9_ALL_CC_FLAGS) -m64 "-DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -Oz -flto DEF(CLANG9_X64_TARGET)\r
-RELEASE_CLANG9_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /ALIGN:32 /FILEALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /MERGE:.rdata=.data  /lldmap\r
-RELEASE_CLANG9_X64_DLINK2_FLAGS   =\r
+*_CLANGPDB_X64_CC_PATH              = DEF(CLANGPDB_X64_PREFIX)clang\r
+*_CLANGPDB_X64_SLINK_PATH           = DEF(CLANGPDB_X64_PREFIX)llvm-lib\r
+*_CLANGPDB_X64_DLINK_PATH           = DEF(CLANGPDB_X64_PREFIX)lld-link\r
+*_CLANGPDB_X64_ASLDLINK_PATH        = DEF(CLANGPDB_X64_PREFIX)lld-link\r
+*_CLANGPDB_X64_ASM_PATH             = DEF(CLANGPDB_X64_PREFIX)clang\r
+*_CLANGPDB_X64_PP_PATH              = DEF(CLANGPDB_X64_PREFIX)clang\r
+*_CLANGPDB_X64_VFRPP_PATH           = DEF(CLANGPDB_X64_PREFIX)clang\r
+*_CLANGPDB_X64_ASLCC_PATH           = DEF(CLANGPDB_X64_PREFIX)clang\r
+*_CLANGPDB_X64_ASLPP_PATH           = DEF(CLANGPDB_X64_PREFIX)clang\r
+*_CLANGPDB_X64_RC_PATH              = DEF(CLANGPDB_IA32_PREFIX)llvm-rc\r
+\r
+*_CLANGPDB_X64_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m64 -fno-lto DEF(CLANGPDB_X64_TARGET)\r
+*_CLANGPDB_X64_ASM_FLAGS            = DEF(GCC_ASM_FLAGS) -m64 DEF(CLANGPDB_X64_TARGET)\r
+*_CLANGPDB_X64_OBJCOPY_FLAGS        =\r
+*_CLANGPDB_X64_NASM_FLAGS           = -f win64\r
+*_CLANGPDB_X64_PP_FLAGS             = DEF(GCC_PP_FLAGS) DEF(CLANGPDB_X64_TARGET)\r
+*_CLANGPDB_X64_ASLPP_FLAGS          = DEF(GCC_ASLPP_FLAGS) DEF(CLANGPDB_X64_TARGET)\r
+*_CLANGPDB_X64_VFRPP_FLAGS          = DEF(GCC_VFRPP_FLAGS) DEF(CLANGPDB_X64_TARGET)\r
+\r
+DEBUG_CLANGPDB_X64_CC_FLAGS         = DEF(CLANGPDB_ALL_CC_FLAGS) -m64 "-DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -Oz -flto DEF(CLANGPDB_X64_TARGET) -gcodeview  -funwind-tables\r
+DEBUG_CLANGPDB_X64_DLINK_FLAGS      = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /ALIGN:32 /FILEALIGN:32 /Machine:X64 /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DEBUG:GHASH /MLLVM:-exception-model=wineh /lldmap\r
+DEBUG_CLANGPDB_X64_DLINK2_FLAGS     =\r
+DEBUG_CLANGPDB_X64_GENFW_FLAGS      = --keepexceptiontable\r
+\r
+RELEASE_CLANGPDB_X64_CC_FLAGS       = DEF(CLANGPDB_ALL_CC_FLAGS) -m64 "-DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -Oz -flto DEF(CLANGPDB_X64_TARGET) -fno-unwind-tables\r
+RELEASE_CLANGPDB_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /IGNORE:4254 /OPT:REF /OPT:ICF=10 /ALIGN:32 /FILEALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /MERGE:.rdata=.data /MLLVM:-exception-model=wineh /lldmap\r
+RELEASE_CLANGPDB_X64_DLINK2_FLAGS   =\r
+RELEASE_CLANGPDB_X64_GENFW_FLAGS    =\r
+\r
+NOOPT_CLANGPDB_X64_CC_FLAGS         = DEF(CLANGPDB_ALL_CC_FLAGS) -m64 "-DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -O0 DEF(CLANGPDB_X64_TARGET) -gcodeview -funwind-tables\r
+NOOPT_CLANGPDB_X64_DLINK_FLAGS      = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /ALIGN:32 /FILEALIGN:32 /Machine:X64 /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DEBUG:GHASH /MLLVM:-exception-model=wineh /lldmap\r
+NOOPT_CLANGPDB_X64_DLINK2_FLAGS     =\r
+NOOPT_CLANGPDB_X64_GENFW_FLAGS      = --keepexceptiontable\r
+\r
+# Clang 8.0.0 - This configuration is used to compile under Windows, Linux, Mac to\r
+# produce ELF image, and convert to PE/COFF image using LLVM/CLANG 8.0 with LTO\r
+#\r
+####################################################################################\r
+*_CLANG8ELF_*_*_FAMILY                = GCC\r
+*_CLANG8ELF_*_*_BUILDRULEFAMILY       = CLANGGCC\r
+*_CLANG8ELF_*_MAKE_PATH               = ENV(CLANG_HOST_BIN)make\r
+*_CLANG8ELF_*_*_DLL                   = ENV(CLANG8_DLL)\r
+*_CLANG8ELF_*_ASL_PATH                = DEF(UNIX_IASL_BIN)\r
+\r
+*_CLANG8ELF_*_APP_FLAGS               =\r
+*_CLANG8ELF_*_ASL_FLAGS               = DEF(IASL_FLAGS)\r
+*_CLANG8ELF_*_ASL_OUTFLAGS            = DEF(IASL_OUTFLAGS)\r
+\r
+DEFINE CLANG8ELF_IA32_PREFIX          = ENV(CLANG8_BIN)\r
+DEFINE CLANG8ELF_X64_PREFIX           = ENV(CLANG8_BIN)\r
+\r
+# LLVM/CLANG doesn't support -n link option. So, it can't share the same IA32_X64_DLINK_COMMON flag.\r
+# LLVM/CLANG doesn't support common page size. So, it can't share the same GccBase.lds script.\r
+DEFINE CLANG8ELF_IA32_X64_DLINK_COMMON   = -nostdlib -Wl,-q,--gc-sections -z max-page-size=0x40\r
+DEFINE CLANG8ELF_DLINK2_FLAGS_COMMON     = -Wl,--script=$(EDK_TOOLS_PATH)/Scripts/ClangBase.lds\r
+DEFINE CLANG8ELF_IA32_X64_ASLDLINK_FLAGS = DEF(CLANG8ELF_IA32_X64_DLINK_COMMON) -Wl,--defsym=PECOFF_HEADER_SIZE=0 DEF(CLANG8ELF_DLINK2_FLAGS_COMMON) -Wl,--entry,ReferenceAcpiTable -u ReferenceAcpiTable\r
+DEFINE CLANG8ELF_IA32_X64_DLINK_FLAGS    = DEF(CLANG8ELF_IA32_X64_DLINK_COMMON) -Wl,--entry,$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Wl,-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map,--whole-archive\r
+DEFINE CLANG8ELF_IA32_DLINK2_FLAGS       = -Wl,--defsym=PECOFF_HEADER_SIZE=0x220 DEF(CLANG8ELF_DLINK2_FLAGS_COMMON)\r
+DEFINE CLANG8ELF_X64_DLINK2_FLAGS        = -Wl,--defsym=PECOFF_HEADER_SIZE=0x228 DEF(CLANG8ELF_DLINK2_FLAGS_COMMON)\r
 \r
-NOOPT_CLANG9_X64_CC_FLAGS         = DEF(CLANG9_ALL_CC_FLAGS) -m64 "-DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -O0 DEF(CLANG9_X64_TARGET) -gcodeview\r
-NOOPT_CLANG9_X64_DLINK_FLAGS      = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT:ICF=10 /ALIGN:32 /FILEALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /Machine:X64 /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DEBUG:GHASH  /lldmap\r
-NOOPT_CLANG9_X64_DLINK2_FLAGS     =\r
+###########################\r
+# CLANG8ELF IA32 definitions\r
+###########################\r
+*_CLANG8ELF_IA32_CC_PATH              = DEF(CLANG8ELF_IA32_PREFIX)clang\r
+*_CLANG8ELF_IA32_SLINK_PATH           = DEF(CLANG8ELF_IA32_PREFIX)llvm-ar\r
+*_CLANG8ELF_IA32_DLINK_PATH           = DEF(CLANG8ELF_IA32_PREFIX)clang\r
+*_CLANG8ELF_IA32_ASLDLINK_PATH        = DEF(CLANG8ELF_IA32_PREFIX)clang\r
+*_CLANG8ELF_IA32_ASM_PATH             = DEF(CLANG8ELF_IA32_PREFIX)clang\r
+*_CLANG8ELF_IA32_PP_PATH              = DEF(CLANG8ELF_IA32_PREFIX)clang\r
+*_CLANG8ELF_IA32_VFRPP_PATH           = DEF(CLANG8ELF_IA32_PREFIX)clang\r
+*_CLANG8ELF_IA32_ASLCC_PATH           = DEF(CLANG8ELF_IA32_PREFIX)clang\r
+*_CLANG8ELF_IA32_ASLPP_PATH           = DEF(CLANG8ELF_IA32_PREFIX)clang\r
+*_CLANG8ELF_IA32_RC_PATH              = DEF(CLANG8ELF_IA32_PREFIX)llvm-rc\r
+\r
+*_CLANG8ELF_IA32_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m32 -fno-lto DEF(CLANG38_IA32_TARGET)\r
+*_CLANG8ELF_IA32_ASLDLINK_FLAGS       = DEF(CLANG8ELF_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386 -fuse-ld=lld\r
+*_CLANG8ELF_IA32_ASM_FLAGS            = DEF(GCC5_ASM_FLAGS) -m32 -march=i386 DEF(CLANG38_IA32_TARGET)\r
+*_CLANG8ELF_IA32_RC_FLAGS             = DEF(GCC_IA32_RC_FLAGS)\r
+*_CLANG8ELF_IA32_OBJCOPY_FLAGS        =\r
+*_CLANG8ELF_IA32_NASM_FLAGS           = -f elf32\r
+*_CLANG8ELF_IA32_PP_FLAGS             = DEF(GCC_PP_FLAGS) DEF(CLANG38_IA32_TARGET)\r
+*_CLANG8ELF_IA32_ASLPP_FLAGS          = DEF(GCC_ASLPP_FLAGS) DEF(CLANG38_IA32_TARGET)\r
+*_CLANG8ELF_IA32_VFRPP_FLAGS          = DEF(GCC_VFRPP_FLAGS) DEF(CLANG38_IA32_TARGET)\r
+\r
+DEBUG_CLANG8ELF_IA32_CC_FLAGS         = DEF(CLANG38_ALL_CC_FLAGS) -m32 -Oz -flto -march=i586 DEF(CLANG38_IA32_TARGET) -g\r
+DEBUG_CLANG8ELF_IA32_DLINK_FLAGS      = DEF(CLANG8ELF_IA32_X64_DLINK_FLAGS) -flto -Wl,-O3 -Wl,-melf_i386 -Wl,--oformat,elf32-i386\r
+DEBUG_CLANG8ELF_IA32_DLINK2_FLAGS     = DEF(CLANG8ELF_IA32_DLINK2_FLAGS) -O3 -fuse-ld=lld\r
+\r
+RELEASE_CLANG8ELF_IA32_CC_FLAGS       = DEF(CLANG38_ALL_CC_FLAGS) -m32 -Oz -flto -march=i586 DEF(CLANG38_IA32_TARGET)\r
+RELEASE_CLANG8ELF_IA32_DLINK_FLAGS    = DEF(CLANG8ELF_IA32_X64_DLINK_FLAGS) -flto -Wl,-O3 -Wl,-melf_i386 -Wl,--oformat,elf32-i386\r
+RELEASE_CLANG8ELF_IA32_DLINK2_FLAGS   = DEF(CLANG8ELF_IA32_DLINK2_FLAGS) -O3 -fuse-ld=lld\r
+\r
+NOOPT_CLANG8ELF_IA32_CC_FLAGS         = DEF(CLANG38_ALL_CC_FLAGS) -m32 -O0 -march=i586 DEF(CLANG38_IA32_TARGET) -g\r
+NOOPT_CLANG8ELF_IA32_DLINK_FLAGS      = DEF(CLANG8ELF_IA32_X64_DLINK_FLAGS) -Wl,-O0 -Wl,-melf_i386 -Wl,--oformat,elf32-i386\r
+NOOPT_CLANG8ELF_IA32_DLINK2_FLAGS     = DEF(CLANG8ELF_IA32_DLINK2_FLAGS) -O0 -fuse-ld=lld\r
 \r
+##########################\r
+# CLANG8ELF X64 definitions\r
+##########################\r
+*_CLANG8ELF_X64_CC_PATH              = DEF(CLANG8ELF_X64_PREFIX)clang\r
+*_CLANG8ELF_X64_SLINK_PATH           = DEF(CLANG8ELF_X64_PREFIX)llvm-ar\r
+*_CLANG8ELF_X64_DLINK_PATH           = DEF(CLANG8ELF_X64_PREFIX)clang\r
+*_CLANG8ELF_X64_ASLDLINK_PATH        = DEF(CLANG8ELF_X64_PREFIX)clang\r
+*_CLANG8ELF_X64_ASM_PATH             = DEF(CLANG8ELF_X64_PREFIX)clang\r
+*_CLANG8ELF_X64_PP_PATH              = DEF(CLANG8ELF_X64_PREFIX)clang\r
+*_CLANG8ELF_X64_VFRPP_PATH           = DEF(CLANG8ELF_X64_PREFIX)clang\r
+*_CLANG8ELF_X64_ASLCC_PATH           = DEF(CLANG8ELF_X64_PREFIX)clang\r
+*_CLANG8ELF_X64_ASLPP_PATH           = DEF(CLANG8ELF_X64_PREFIX)clang\r
+*_CLANG8ELF_X64_RC_PATH              = DEF(CLANG8ELF_X64_PREFIX)llvm-rc\r
+\r
+*_CLANG8ELF_X64_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m64 -fno-lto DEF(CLANG38_X64_TARGET)\r
+*_CLANG8ELF_X64_ASLDLINK_FLAGS       = DEF(CLANG8ELF_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64 -fuse-ld=lld\r
+*_CLANG8ELF_X64_ASM_FLAGS            = DEF(GCC5_ASM_FLAGS) -m64 DEF(CLANG38_X64_TARGET)\r
+*_CLANG8ELF_X64_RC_FLAGS             = DEF(GCC_X64_RC_FLAGS)\r
+*_CLANG8ELF_X64_OBJCOPY_FLAGS        =\r
+*_CLANG8ELF_X64_NASM_FLAGS           = -f elf64\r
+*_CLANG8ELF_X64_PP_FLAGS             = DEF(GCC_PP_FLAGS) DEF(CLANG38_X64_TARGET)\r
+*_CLANG8ELF_X64_ASLPP_FLAGS          = DEF(GCC_ASLPP_FLAGS) DEF(CLANG38_X64_TARGET)\r
+*_CLANG8ELF_X64_VFRPP_FLAGS          = DEF(GCC_VFRPP_FLAGS) DEF(CLANG38_X64_TARGET)\r
+\r
+DEBUG_CLANG8ELF_X64_CC_FLAGS         = DEF(CLANG38_ALL_CC_FLAGS) -m64 "-DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -fpie -Oz -flto DEF(CLANG38_X64_TARGET) -g\r
+DEBUG_CLANG8ELF_X64_DLINK_FLAGS      = DEF(CLANG8ELF_IA32_X64_DLINK_FLAGS) -flto -Wl,-O3 -Wl,-melf_x86_64 -Wl,--oformat,elf64-x86-64 -Wl,-pie -mcmodel=small -Wl,--apply-dynamic-relocs\r
+DEBUG_CLANG8ELF_X64_DLINK2_FLAGS     = DEF(CLANG8ELF_X64_DLINK2_FLAGS) -O3 -fuse-ld=lld\r
+\r
+RELEASE_CLANG8ELF_X64_CC_FLAGS       = DEF(CLANG38_ALL_CC_FLAGS) -m64 "-DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -fpie -Oz -flto DEF(CLANG38_X64_TARGET)\r
+RELEASE_CLANG8ELF_X64_DLINK_FLAGS    = DEF(CLANG8ELF_IA32_X64_DLINK_FLAGS) -flto -Wl,-O3 -Wl,-melf_x86_64 -Wl,--oformat,elf64-x86-64 -Wl,-pie -mcmodel=small -Wl,--apply-dynamic-relocs\r
+RELEASE_CLANG8ELF_X64_DLINK2_FLAGS   = DEF(CLANG8ELF_X64_DLINK2_FLAGS) -O3 -fuse-ld=lld\r
+\r
+NOOPT_CLANG8ELF_X64_CC_FLAGS         = DEF(CLANG38_ALL_CC_FLAGS) -m64 "-DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -mcmodel=small -fpie -O0 DEF(CLANG38_X64_TARGET) -g\r
+NOOPT_CLANG8ELF_X64_DLINK_FLAGS      = DEF(CLANG8ELF_IA32_X64_DLINK_FLAGS) -Wl,-O0 -Wl,-melf_x86_64 -Wl,--oformat,elf64-x86-64 -Wl,-pie -mcmodel=small -Wl,--apply-dynamic-relocs\r
+NOOPT_CLANG8ELF_X64_DLINK2_FLAGS     = DEF(CLANG8ELF_X64_DLINK2_FLAGS) -O0 -fuse-ld=lld\r
 \r
 #\r
 #\r
@@ -2826,6 +2954,7 @@ NOOPT_CLANG9_X64_DLINK2_FLAGS     =
 *_XCODE5_*_ASLDLINK_PATH = ld\r
 *_XCODE5_*_DSYMUTIL_PATH = /usr/bin/dsymutil\r
 *_XCODE5_*_MTOC_PATH     = /usr/local/bin/mtoc\r
+*_XCODE5_*_DEPS_FLAGS    = DEF(GCC_DEPS_FLAGS)\r
 \r
 ##################\r
 # ASL definitions\r
EFI Development Kit II mirror for PVE