X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FConf%2Ftools_def.template;h=3da28a453e7fd85b4509b4a18f114740508ce493;hp=b577ecac1ca707707889f91df02c981ef47816fb;hb=7c707b0214fac6307281ab6181d68a02891141e1;hpb=e1459606bd19463028c36973d13341176eb6f3e7

diff --git a/Tools/Conf/tools_def.template b/Tools/Conf/tools_def.template
index b577ecac1c..3da28a453e 100644
--- a/Tools/Conf/tools_def.template
+++ b/Tools/Conf/tools_def.template
@@ -1,16 +1,16 @@
 # format: TARGET_TOOLCHAIN_ARCH_COMMANDTYPE_ATTRIBUTE = <string>
 
 #Default values
-*_MSFT_*_*_FAMILY = MSFT
-*_MSFT_*_ASL_FAMILY = MSFT
+*_MSFT_*_*_FAMILY       = MSFT
+*_MSFT_*_ASL_FAMILY     = INTEL
 
-*_MSFT_*_CC_NAME = cl.exe
-*_MSFT_*_SLINK_NAME = lib.exe
-*_MSFT_*_DLINK_NAME = link.exe
-*_MSFT_*_ASM_NAME = ml.exe
-*_MSFT_*_ASMLINK_NAME = link.exe
-*_MSFT_*_ASL_NAME = iasl.exe
-*_MSFT_*_PP_NAME = cl.exe
+*_MSFT_*_CC_NAME        = cl.exe
+*_MSFT_*_SLINK_NAME     = lib.exe
+*_MSFT_*_DLINK_NAME     = link.exe
+*_MSFT_*_ASM_NAME       = ml.exe
+*_MSFT_*_ASMLINK_NAME   = link.exe
+*_MSFT_*_ASL_NAME       = iasl.exe
+*_MSFT_*_PP_NAME        = cl.exe
 
 # HOST definitions
 #*_MSFT_HOST_*_PATH = C:\Program Files\Intel\Compiler\C++\9.0\IA32\Bin
@@ -18,27 +18,44 @@
 
 
 # IA32 definitions
-*_MSFT_IA32_*_PATH = D:\Microsoft Visual Studio .NET 2003\Vc7\bin
-*_MSFT_IA32_ASL_PATH = C:\TianoTools\Bin
-*_MSFT_IA32_ASM_PATH = C:\TianoTools\Bin\Ia32\Masm611\BIN
-*_MSFT_IA32_*_DPATH = D:\Microsoft Visual Studio .NET 2003\Common7\IDE
-#*_MSFT_IA32_ASM_EXT = .asm
-
-# DEBUG_MSFT_IA32_CC_PATH = 
+*_MSFT_IA32_*_PATH       = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin
+*_MSFT_IA32_ASM_PATH     = C:\WINDDK\3790.1830\bin\x86
+*_MSFT_IA32_ASMLINK_PATH = C:\WINDDK\3790.1830\Bin\Bin16\
+*_MSFT_IA32_ASL_PATH     = C:\TianoTools\Bin
+*_MSFT_IA32_*_DPATH      = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE
+*_MSFT_IA32_ASM_EXT      = .asm
 
 # x64 definitions
-*_MSFT_X64_*_PATH = D:\WINDDK\3790.1830\bin\win64\x86\amd64
-*_MSFT_X64_ASM_NAME = ml64.exe
-*_MSFT_X64_ASM_EXT = .asm
-
+*_MSFT_X64_*_PATH       = C:\WINDDK\3790.1830\bin\win64\x86\amd64
+*_MSFT_X64_ASMLINK_PATH = C:\WINDDK\3790.1830\Bin\Bin16\
+*_MSFT_X64_ASL_PATH     = C:\TianoTools\Bin
+*_MSFT_X64_ASM_NAME     = ml64.exe
+*_MSFT_X64_ASM_EXT      = .asm
 
 # IPF definitions
-*_MSFT_IPF_*_PATH = D:\WINDDK\3790.1830\bin\win64\x86
-*_MSFT_IPF_ASM_NAME = ias.exe
+*_MSFT_IPF_*_PATH       = C:\WINDDK\3790.1830\bin\win64\x86
+*_MSFT_IPF_ASM_NAME     = ias.exe
+*_MSFT_IPF_ASM_EXT      = .s
 
 # EBC definitions
-*_MSFT_EBC_*_FAMILY = INTEL
-*_MSFT_EBC_*_PATH = D:\Intel\EBC\Bin
-*_MSFT_EBC_*_SPATH = D:\Intel\EBC\Lib\EbcLib.lib
-*_MSFT_EBC_CC_NAME = iec.exe
-*_MSFT_EBC_SLINK_NAME = link.exe
+*_MSFT_EBC_*_FAMILY     = INTEL
+*_MSFT_EBC_*_PATH       = C:\Program Files\Intel\EBC\Bin
+*_MSFT_EBC_*_SPATH      = C:\Progra~1\Intel\EBC\Lib\EbcLib.lib
+*_MSFT_EBC_CC_NAME      = iec.exe
+*_MSFT_EBC_SLINK_NAME   = link.exe
+*_MSFT_EBC_PP_NAME      = iec.exe
+
+# GCC definitions
+*_GCC_IA32_*_FAMILY     = GCC
+*_GCC_IA32_CC_NAME      = gcc
+*_GCC_IA32_SLINK_NAME   = ar
+*_GCC_IA32_DLINK_NAME   = ld
+*_GCC_IA32_ASM_NAME     = gcc
+*_GCC_IA32_PP_NAME      = gcc
+
+# GCC, IA32
+# Use this if you built the tiano gcc tool chain on a Windows/Cygwin system.
+*_GCC_IA32_*_PATH       = C:\cygwin\opt\tiano\i386-tiano-pe\i386-tiano-pe\bin
+# Use this if you built the tiano gcc tool chain on a Unix system.
+# *_GCC_IA32_*_PATH       = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin
+*_GCC_IA32_ASM_EXT      = .S