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 c6c9edf5a0d7248fcaebfdfffe9d0980bdc10607..c8ef1a1421a00184d056b0baddc7235288ea5573 100755 (executable)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -292,6 +292,10 @@ DEFINE DTC_BIN                 = ENV(DTC_PREFIX)dtc
 #                             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
@@ -441,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
@@ -453,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
@@ -508,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
@@ -534,7 +534,6 @@ NOOPT_VS2008_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_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
@@ -557,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
@@ -569,7 +567,6 @@ 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\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
@@ -623,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
@@ -675,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
@@ -687,7 +681,6 @@ 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\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
@@ -742,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
@@ -768,7 +759,6 @@ NOOPT_VS2010_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_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
@@ -791,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
@@ -803,7 +792,6 @@ 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\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
@@ -858,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
@@ -909,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
@@ -921,7 +906,6 @@ 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\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
@@ -976,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
@@ -1002,7 +984,6 @@ NOOPT_VS2012_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_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
@@ -1025,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
@@ -1037,7 +1017,6 @@ 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\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
@@ -1092,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
@@ -1143,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
@@ -1155,7 +1131,6 @@ 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\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
@@ -1210,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
@@ -1236,7 +1209,6 @@ NOOPT_VS2013_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_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
@@ -1259,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
@@ -1271,7 +1242,6 @@ 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\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
@@ -1326,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
@@ -1378,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
@@ -1390,7 +1357,6 @@ 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\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
@@ -1445,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
@@ -1471,7 +1435,6 @@ NOOPT_VS2015_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_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
@@ -1495,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
@@ -1507,7 +1469,6 @@ 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\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
@@ -1562,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
@@ -1589,7 +1548,6 @@ NOOPT_VS2015x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2017_*_MAKE_FLAGS      = /nologo\r
 *_VS2017_*_RC_PATH         = DEF(RC_PATH)\r
 \r
-*_VS2017_*_MAKE_FLAGS      = /nologo\r
 *_VS2017_*_SLINK_FLAGS     = /NOLOGO /LTCG\r
 *_VS2017_*_APP_FLAGS       = /nologo /E /TC\r
 *_VS2017_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h\r
@@ -1621,7 +1579,6 @@ 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\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
@@ -1682,7 +1639,6 @@ 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 /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 /Od /Oi-\r
@@ -1709,7 +1665,6 @@ 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 /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 /Od /Oi-\r
@@ -1733,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
@@ -1752,7 +1706,6 @@ NOOPT_VS2017_AARCH64_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2019_*_MAKE_FLAGS      = /nologo\r
 *_VS2019_*_RC_PATH         = DEF(RC_PATH)\r
 \r
-*_VS2019_*_MAKE_FLAGS      = /nologo\r
 *_VS2019_*_SLINK_FLAGS     = /NOLOGO /LTCG\r
 *_VS2019_*_APP_FLAGS       = /nologo /E /TC\r
 *_VS2019_*_PP_FLAGS        = /nologo /E /TC /FIAutoGen.h\r
@@ -1784,7 +1737,6 @@ 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\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
@@ -1845,7 +1797,6 @@ 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 /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 /Od /Oi-\r
@@ -1872,7 +1823,6 @@ 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 /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 /Od /Oi-\r
@@ -1896,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
@@ -2513,6 +2462,7 @@ RELEASE_GCC5_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20
 *_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
@@ -2882,6 +2832,104 @@ NOOPT_CLANGPDB_X64_DLINK_FLAGS      = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:RE
 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
+###########################\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
 # XCODE5 support\r