From ca451dba1056b0daa50dcbe2af4363cabd952b52 Mon Sep 17 00:00:00 2001
From: jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 18 Jul 2007 15:23:51 +0000
Subject: [PATCH] Added GCC (CYGWIN only) tool chain family support

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3332 6f19259b-4bc3-4df7-8a09-765794883524
---
 BaseTools/Bin/Win32/build.exe      | Bin 1301668 -> 1303457 bytes
 BaseTools/Conf/build_rule.template |  90 +++++++++++++++--------------
 BaseTools/Conf/tools_def.template  |  28 ++-------
 3 files changed, 52 insertions(+), 66 deletions(-)

diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe
index a191dd566285fd50b173190580175fb04582fff7..f6b9cce92ad73060479eb940d40846a68a6ef5be 100644
GIT binary patch
delta 11672
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

delta 10199
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
Vm~<M;*KC7pPCL`gB|GV;`#((G_J{xg

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 5589a18389..6f93ff9505 100644
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -50,7 +50,7 @@ DefaultToolCode = ["CC", "ASM", "SLINK", "DLINK", "PCH", "PP", "ASL"]
 
 ToolCodeMapping = {
     "C-Code"                        :   ["CC"],
-    "C-Header"                      :   ["PCH"],
+#    "C-Header"                      :   ["PCH"],
     "Masm-Code"                     :   ["PP", "ASM"],
     "Iasm-Code"                     :   ["PP", "ASM"],      # IPF assembly code
     "Gasm-Code"                     :   ["ASM"],          	# GNU assembly code
@@ -87,67 +87,71 @@ ToolChainFamilyMapping = {
 #   ${fbase}	File name without extension and path
 #   ${fext}   File extension
 #   ${fdep}   File dependencies
-#   ${sep}    Directory separator
+#   ${_sep_}    Directory separator
+#   ${_of_}     Output flag
+#   ${_if_}     Include flag
 #
 Makefile = {
-"nmake"	: {
+"MSFT"	: {
 "C-Code"    : '''\
-$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(COMMON_DEPS)
-${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${fdep}
-${END}	"$(CC)" /Fo$@ $(CC_FLAGS) $(INC) $(WORKSPACE)${sep}${fpath}
+$(OUTPUT_DIR)${_sep_}${fdir}${_sep_}${fbase}.obj : $(COMMON_DEPS)
+${BEGIN}$(OUTPUT_DIR)${_sep_}${fdir}${_sep_}${fbase}.obj : $(WORKSPACE)${_sep_}${fdep}
+${END}\t"$(CC)" /Fo$@ $(CC_FLAGS) $(INC) $(WORKSPACE)${_sep_}${fpath}
 ''',
 
 "Masm-Code" : '''\
-$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(COMMON_DEPS)
-${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${fdep}
-${END}	"$(PP)" $(PP_FLAGS) $(INC) $(WORKSPACE)${sep}${fpath} > $(@D)${sep}${fbase}.i
-	Trim -CONVERT $(@D)${sep}${fbase}.i
-	"$(ASM)" /Fo$@ $(ASM_FLAGS) $(INC) $(@D)${sep}${fbase}.iii
+$(OUTPUT_DIR)${_sep_}${fdir}${_sep_}${fbase}.obj : $(COMMON_DEPS)
+${BEGIN}$(OUTPUT_DIR)${_sep_}${fdir}${_sep_}${fbase}.obj : $(WORKSPACE)${_sep_}${fdep}
+${END}\t"$(PP)" $(PP_FLAGS) $(INC) $(WORKSPACE)${_sep_}${fpath} > $(@D)${_sep_}${fbase}.i
+\tTrim -CONVERT $(@D)${_sep_}${fbase}.i
+\t"$(ASM)" /Fo$@ $(ASM_FLAGS) $(INC) $(@D)${_sep_}${fbase}.iii
 ''',
 
 "Iasm-Code" : '''\
-$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(COMMON_DEPS)
-${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${fdep}
-${END}	"$(APP)" $(APP_FLAGS) $(INC) $(WORKSPACE)${sep}${fpath} > $(@D)${sep}${fbase}.i
-	"$(ASM)" -o$@ $(ASM_FLAGS) $(@D)${sep}${fbase}.i
+$(OUTPUT_DIR)${_sep_}${fdir}${_sep_}${fbase}.obj : $(COMMON_DEPS)
+${BEGIN}$(OUTPUT_DIR)${_sep_}${fdir}${_sep_}${fbase}.obj : $(WORKSPACE)${_sep_}${fdep}
+${END}\t"$(APP)" $(APP_FLAGS) $(INC) $(WORKSPACE)${_sep_}${fpath} > $(@D)${_sep_}${fbase}.i
+\t"$(ASM)" -o $@ $(ASM_FLAGS) $(@D)${_sep_}${fbase}.i
 ''',
 
 "Visual-Form-Representation" : '''\
-$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(COMMON_DEPS)
-${BEGIN}$(OUTPUT_DIR)${sep}${fdir}${sep}${fbase}.obj : $(WORKSPACE)${sep}${fdep}
-${END}\t"$(PP)" $(VFRPP_FLAGS) $(INC) $(WORKSPACE)${sep}${fpath} > $(@D)${sep}${fbase}.i
-\tTrim -VFR $(@D)${sep}${fbase}.i
-\t-mkdir $(DEBUG_DIR)${sep}${fdir} > NUL 2>&1
-\tVfrCompile -od $(DEBUG_DIR)${sep}${fdir} $(@D)${sep}${fbase}.iii
-\t"$(CC)" /Fo$@ $(CC_FLAGS) $(INC) $(DEBUG_DIR)${sep}${fdir}${sep}${fbase}.c
+$(OUTPUT_DIR)${_sep_}${fdir}${_sep_}${fbase}.obj : $(COMMON_DEPS)
+${BEGIN}$(OUTPUT_DIR)${_sep_}${fdir}${_sep_}${fbase}.obj : $(WORKSPACE)${_sep_}${fdep}
+${END}\t"$(PP)" $(VFRPP_FLAGS) $(INC) $(WORKSPACE)${_sep_}${fpath} > $(@D)${_sep_}${fbase}.i
+\tTrim -VFR $(@D)${_sep_}${fbase}.i
+\t-mkdir $(DEBUG_DIR)${_sep_}${fdir} > NUL 2>&1
+\tVfrCompile -od $(DEBUG_DIR)${_sep_}${fdir} $(@D)${_sep_}${fbase}.iii
+\t"$(CC)" /Fo$@ $(CC_FLAGS) $(INC) $(DEBUG_DIR)${_sep_}${fdir}${_sep_}${fbase}.c
 ''',
 },
 
-"gmake" : {
+
+"GCC" : {
+
 "C-Code"    : 
-'''$(OUTPUT_DIR)/%(fdir)s/%(fbase)s.obj : $(MODULE_DIR)/%(fdir)s/%(fname)s $(DEP_FILES)
-\t"$(CC)" $(CC_FLAGS) $(INC) $(CC_OUTPUT)$@ $<''',
-
-"Masm-Code" : 
-'''$(OUTPUT_DIR)/%(fdir)s/%(fbase)s.obj : $(MODULE_DIR)/%(fdir)s/%(fname)s $(DEP_FILES)
-\t"$(PP)" $(PP_FLAGS) $(INC) $? $(PP_OUTPUT)$(@D)/%(fbase)s.i
-\tTrim -CONVERT $(@D)/%(fbase)s.i
-\t"$(ASM)" $(ASM_FLAGS) $(ASM_OUTPUT)$@ $(@D)/%(fbase)s.iii''',
-    
-"Gasm-Code" : 
-'''$(OUTPUT_DIR)/%(fdir)s/%(fbase)s.obj : $(MODULE_DIR)/%(fdir)s/%(fname)s $(DEP_FILES)
-\t"$(ASM)" $(ASM_FLAGS) $(INC) $(ASM_OUTPUT)$@ $<''',
+'''
+$(OUTPUT_DIR)${_sep_}${fdir}${_sep_}${fbase}.obj : $(COMMON_DEPS)
+${BEGIN}$(OUTPUT_DIR)${_sep_}${fdir}${_sep_}${fbase}.obj : $(WORKSPACE)${_sep_}${fdep}
+${END}\t"$(CC)" -o $@ $(CC_FLAGS) $(INC) $(WORKSPACE)${_sep_}${fpath}
+''',
 
-"Iasm-Code" : 
-'''$(OUTPUT_DIR)/%(fdir)s/%(fbase)s.obj : $(MODULE_DIR)/%(fdir)s/%(fname)s $(DEP_FILES)
-\t"$(APP)" $(APP_FLAGS) $(INC) $< $(PP_OUTPUT)$(@D)/%(fbase)s.i
-\t"$(ASM)" $(ASM_FLAGS) $(ASM_OUTPUT)$@ $(@D)/%(fbase)s.i''',
+"Gasm-Code" : 
+'''
+$(OUTPUT_DIR)${_sep_}${fdir}${_sep_}${fbase}.obj : $(COMMON_DEPS)
+${BEGIN}$(OUTPUT_DIR)${_sep_}${fdir}${_sep_}${fbase}.obj : $(WORKSPACE)${_sep_}${fdep}
+${END}\t"$(ASM)" -o $@ $(ASM_FLAGS) $(INC) $(WORKSPACE)${_sep_}${fpath}
+''',
 
 "Visual-Form-Representation" : 
-'''$(OUTPUT_DIR)/%(fdir)s/%(fbase)s.obj : $(MODULE_DIR)/%(fdir)s/%(fname)s $(DEP_FILES)
-\t"$(PP)" $(PP_FLAGS) $(INC) $< $(PP_OUTPUT)$(@D)/%(fbase)s.i
-\t"$(VFRC)" $(VFRC_FLAGS) $(INC) $(VFRC_OUTPUT)$(DEBUG_DIR)/%(fdir)s/%(fbase)s.c $(@D)/%(fbase)s.i
-\t"$(CC)" $(CC_FLAGS) $(INC) $(CC_OUTPUT)$@ $(DEBUG_DIR)/%(fdir)s/%(fbase)s.c''',
+'''
+$(OUTPUT_DIR)${_sep_}${fdir}${_sep_}${fbase}.obj : $(COMMON_DEPS)
+${BEGIN}$(OUTPUT_DIR)${_sep_}${fdir}${_sep_}${fbase}.obj : $(WORKSPACE)${_sep_}${fdep}
+${END}\t"$(PP)" $(VFRPP_FLAGS) $(INC) $(WORKSPACE)${_sep_}${fpath} -o $(@D)${_sep_}${fbase}.i
+\tTrim -VFR $(@D)${_sep_}${fbase}.i
+\t-mkdir $(DEBUG_DIR)${_sep_}${fdir} > NUL 2>&1
+\tVfrCompile -od $(DEBUG_DIR)${_sep_}${fdir} $(@D)${_sep_}${fbase}.iii
+\t"$(CC)" -o $@ $(CC_FLAGS) $(INC) $(DEBUG_DIR)${_sep_}${fdir}${_sep_}${fbase}.c
+''',
 }
 }
 
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 26e5054142..d0a1cecbcc 100644
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -77,7 +77,6 @@ IDENTIFIER = Default TOOL_CHAIN_CONF
 *_VS2003_IA32_APP_NAME          = cl.exe
 *_VS2003_IA32_PP_NAME           = cl.exe
 *_VS2003_IA32_ASM_NAME          = ml.exe
-*_VS2003_IA32_ASM_EXT           = .asm
 *_VS2003_IA32_PCH_NAME          = cl.exe
 
 ##################
@@ -125,7 +124,6 @@ RELEASE_VS2003_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /O
 # IA32 definitions
 ##################
 *_WINDDK3790x1830_IA32_ASM_NAME          = ml.exe
-*_WINDDK3790x1830_IA32_ASM_EXT           = .asm
 *_WINDDK3790x1830_IA32_*_PATH            = C:\WINDDK\3790.1830\bin\x86
 *_WINDDK3790x1830_IA32_*_DPATH           = C:\WINDDK\3790.1830\bin\x86
 *_WINDDK3790x1830_IA32_ASMLINK_PATH      = C:\WINDDK\3790.1830\bin\bin16\
@@ -145,7 +143,6 @@ RELEASE_WINDDK3790x1830_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 # x64 definitions
 ##################
 *_WINDDK3790x1830_X64_ASM_NAME          = ml64.exe
-*_WINDDK3790x1830_X64_ASM_EXT           = .asm
 *_WINDDK3790x1830_X64_*_PATH            = C:\WINDDK\3790.1830\bin\win64\x86\amd64
 *_WINDDK3790x1830_X64_ASMLINK_PATH      = C:\WINDDK\3790.1830\bin\bin16\
 
@@ -163,7 +160,6 @@ RELEASE_WINDDK3790x1830_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OP
 # IPF definitions
 ##################
 *_WINDDK3790x1830_IPF_ASM_NAME          = ias.exe
-*_WINDDK3790x1830_IPF_ASM_EXT           = .s
 *_WINDDK3790x1830_IPF_*_PATH            = C:\WINDDK\3790.1830\bin\win64\x86
 
 *_WINDDK3790x1830_IPF_PP_FLAGS          = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h
@@ -229,7 +225,6 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:
 # IA32 definitions
 ##################
 #*_VS2005EXP_IA32_ASM_NAME     = ml.exe
-#*_VS2005EXP_IA32_ASM_EXT      = .asm
 #*_VS2005EXP_IA32_*_PATH       = C:\Program Files\Microsoft Visual Studio 8\Vc\bin
 #*_VS2005EXP_IA32_*_DPATH      = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE
 #*_VS2005EXP_IA32_ASM_PATH     = C:\WINDDK\3790.1830\bin\x86
@@ -298,7 +293,6 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:
 # IA32 definitions
 ##################
 #*_VS2005STD_IA32_ASM_NAME     = ml.exe
-#*_VS2005STD_IA32_ASM_EXT      = .asm
 #*_VS2005STD_IA32_*_PATH       = C:\Program Files\Microsoft Visual Studio 8\Vc\bin
 #*_VS2005STD_IA32_*_DPATH      = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE
 #*_VS2005STD_IA32_ASM_PATH     = C:\WINDDK\3790.1830\bin\x86
@@ -364,7 +358,6 @@ RELEASE_WINDDK3790x1830_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:
 # IA32 definitions
 ##################
 *_VS2005PRO_IA32_ASM_NAME     = ml.exe
-*_VS2005PRO_IA32_ASM_EXT      = .asm
 *_VS2005PRO_IA32_*_PATH       = C:\Program Files\Microsoft Visual Studio 8\Vc\bin
 *_VS2005PRO_IA32_*_DPATH      = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE
 *_VS2005PRO_IA32_ASM_PATH     = C:\WINDDK\3790.1830\bin\x86
@@ -384,7 +377,6 @@ RELEASE_VS2005PRO_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 # x64 definitions
 ##################
 *_VS2005PRO_X64_ASM_NAME       = ml64.exe
-*_VS2005PRO_X64_ASM_EXT        = .asm
 *_VS2005PRO_X64_*_PATH         = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_amd64
 *_VS2005PRO_X64_*_DPATH        = C:\Program Files\Microsoft Visual Studio 8\VC\bin\x86_amd64;C:\Program Files\Microsoft Visual Studio 8\Common7\IDE
 *_VS2005PRO_X64_ASMLINK_PATH   = C:\WINDDK\3790.1830\bin\bin16\
@@ -451,7 +443,6 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 # IA32 definitions
 ##################
 #*_VS2005TEAMSUITE_IA32_ASM_NAME     = ml.exe
-#*_VS2005TEAMSUITE_IA32_ASM_EXT      = .asm
 #*_VS2005TEAMSUITE_IA32_*_PATH       = C:\Program Files\Microsoft Visual Studio 8\Vc\bin
 #*_VS2005TEAMSUITE_IA32_*_DPATH      = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE
 #*_VS2005TEAMSUITE_IA32_ASM_PATH     = C:\WINDDK\3790.1830\bin\x86
@@ -471,7 +462,6 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 # x64 definitions
 ##################
 #*_VS2005TEAMSUITE_X64_ASM_NAME       = ml64.exe
-#*_VS2005TEAMSUITE_X64_ASM_EXT        = .asm
 #*_VS2005TEAMSUITE_X64_*_PATH         = C:\Program Files\Microsoft Visual Studio 8\Vc\bin\x86_amd64
 #*_VS2005TEAMSUITE_X64_*_DPATH        = C:\Program Files\Microsoft Visual Studio 8\VC\bin\x86_amd64;C:\Program Files\Microsoft Visual Studio 8\Common7\IDE
 #*_VS2005TEAMSUITE_X64_ASMLINK_PATH   = C:\WINDDK\3790.1830\bin\bin16\
@@ -489,7 +479,6 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 # IPF definitions
 ##################
 #*_VS2005TEAMSUITE_IPF_ASM_NAME          = ias.exe
-#*_VS2005TEAMSUITE_IPF_ASM_EXT           = .s
 #*_VS2005TEAMSUITE_IPF_*_PATH            = C:\Program Files\Microsoft Visual Studio 8\Vc\bin
 #*_VS2005TEAMSUITE_IPF_*_DPATH           = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE
 
@@ -560,10 +549,9 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 *_UNIXGCC_X64_CC_FLAGS      = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include $(DEST_DIR_DEBUG)/AutoGen.h -D_EFI_P64
 
 *_UNIXGCC_*_DLINK_FLAGS     = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _$(ENTRYPOINT) --file-alignment 0x20 --section-alignment 0x20
-*_UNIXGCC_*_ASM_FLAGS       = -c -imacros $(DEST_DIR_DEBUG)/AutoGen.h -DASM_PFX(name)=_##name
+*_UNIXGCC_*_ASM_FLAGS       = -c -imacros $(DEST_DIR_DEBUG)/AutoGen.h
 *_UNIXGCC_*_PP_FLAGS        = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h
 *_UNIXGCC_*_VFRPP_FLAGS     = -x c -E -P -DVFRCOMPILE --include AutoGen.h
-*_UNIXGCC_*_ASM_EXT         = .S
 
 
 ####################################################################################
@@ -595,10 +583,9 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 
 *_CYGWINGCC_X64_CC_FLAGS      = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include $(DEST_DIR_DEBUG)/AutoGen.h -D_EFI_P64
 *_CYGWINGCC_*_DLINK_FLAGS     = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _$(ENTRYPOINT) --file-alignment 0x20 --section-alignment 0x20
-*_CYGWINGCC_*_ASM_FLAGS       = -c -imacros $(DEST_DIR_DEBUG)/AutoGen.h -DASM_PFX(name)=_##name
+*_CYGWINGCC_*_ASM_FLAGS       = -c -imacros $(DEST_DIR_DEBUG)/AutoGen.h
 *_CYGWINGCC_*_PP_FLAGS        = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h
 *_CYGWINGCC_*_VFRPP_FLAGS     = -x c -E -P -DVFRCOMPILE --include AutoGen.h
-*_CYGWINGCC_*_ASM_EXT         = .S
 
 *_CYGWINGCC_*_*_DPATH         = c:/Cygwin/bin
 
@@ -620,10 +607,9 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 
 *_ELFGCC_IA32_CC_FLAGS     = -m32 -g -fshort-wchar -fno-strict-aliasing -Wall -malign-double -c -include $(DEST_DIR_DEBUG)/AutoGen.h -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
 *_ELFGCC_*_DLINK_FLAGS     = -melf_i386 -nostdlib -n -q -Ttext 0x220 --entry $(ENTRYPOINT) -u $(ENTRYPOINT)
-*_ELFGCC_*_ASM_FLAGS       = -m32 -c -imacros $(DEST_DIR_DEBUG)/AutoGen.h -DASM_PFX(name)=name
+*_ELFGCC_*_ASM_FLAGS       = -m32 -c -imacros $(DEST_DIR_DEBUG)/AutoGen.h
 *_ELFGCC_*_PP_FLAGS        = -m32 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h
 *_ELFGCC_*_VFRPP_FLAGS     = -x c -E -P -DVFRCOMPILE --include AutoGen.h
-*_ELFGCC_*_ASM_EXT         = .S
 
 *_ELFGCC_IA32_*_PATH       = /usr/bin
 
@@ -694,7 +680,6 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 ##################
 *_ICC_IA32_*_PATH            = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin
 *_ICC_IA32_PCH_NAME          = cl.exe
-*_ICC_IA32_ASM_EXT           = .asm
 *_ICC_IA32_*_DPATH           = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE
 *_ICC_IA32_ASMLINK_PATH      = C:\WINDDK\3790.1830\bin\bin16\
 
@@ -726,7 +711,6 @@ RELEASE_ICC_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:
 #*_ICC_IPF_PCH_NAME          = icl.exe
 *_ICC_IPF_APP_NAME          = icl.exe
 *_ICC_IPF_ASM_NAME          = ias.exe
-*_ICC_IPF_ASM_EXT           = .s
 
 *_ICC_IPF_APP_FLAGS         = /nologo /E /TC
 *_ICC_IPF_PP_FLAGS          = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h
@@ -773,7 +757,7 @@ RELEASE_ICC_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGN
 
 *_MYTOOLS_*_LZMA_NAME = Lzma.bat
 *_MYTOOLS_*_LZMA_GUID = EE4E5898-3914-4259-9D6E-DC7B-D79403CF
-*_MYTOOLS_*_LAMA_PATH =
+*_MYTOOLS_*_LZMA_PATH =
 
 *_MYTOOLS_*_TIANO_NAME = Tiano.bat
 *_MYTOOLS_*_TIANO_GUID = A31280AD-481E-41B6-95E8-127F-4C984779
@@ -783,7 +767,6 @@ RELEASE_ICC_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGN
 # IA32 definitions
 ##################
 *_MYTOOLS_IA32_PCH_NAME          = cl.exe
-*_MYTOOLS_IA32_ASM_EXT           = .asm
 
 *_MYTOOLS_IA32_*_PATH            = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin
 *_MYTOOLS_IA32_*_DPATH           = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE
@@ -807,7 +790,6 @@ RELEASE_MYTOOLS_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /
 ##################
 *_MYTOOLS_X64_PCH_NAME          = cl.exe
 *_MYTOOLS_X64_ASM_NAME          = ml64.exe
-*_MYTOOLS_X64_ASM_EXT           = .asm
 
 *_MYTOOLS_X64_*_PATH            = C:\WINDDK\3790.1830\bin\win64\x86\amd64
 *_MYTOOLS_X64_ASMLINK_PATH      = C:\WINDDK\3790.1830\bin\bin16\
@@ -829,7 +811,7 @@ RELEASE_MYTOOLS_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /O
 ##################
 *_MYTOOLS_IPF_PCH_NAME          = cl.exe
 *_MYTOOLS_IPF_ASM_NAME          = ias.exe
-*_MYTOOLS_IPF_ASM_EXT           = .s
+*_MYTOOLS_IPF_ASM_OUTPUT        = "-o "
 
 *_MYTOOLS_IPF_*_PATH            = C:\WINDDK\3790.1830\bin\win64\x86
 
-- 
2.39.2