Resync the VFR flags

[mirror_edk2.git] / Tools / Conf / tools_def.template

diff --git a/Tools/Conf/tools_def.template b/Tools/Conf/tools_def.template
index d6e57c74aa6e1535483c9ebcc3c7540331616bd2..b1da50db003c537f138d7edf3e010b3a573b915b 100644 (file)
--- a/Tools/Conf/tools_def.template
+++ b/Tools/Conf/tools_def.template
@@ -59,6 +59,7 @@ IDENTIFIER = Default TOOL_CHAIN_CONF
 *_VS2003_IA32_*_FAMILY          = MSFT\r
 \r
 *_VS2003_IA32_CC_NAME           = cl.exe  \r
+*_VS2003_IA32_VFR_NAME          = cl.exe\r
 *_VS2003_IA32_SLINK_NAME        = lib.exe\r
 *_VS2003_IA32_DLINK_NAME        = link.exe\r
 *_VS2003_IA32_ASMLINK_NAME      = link.exe\r
@@ -74,6 +75,7 @@ IDENTIFIER = Default TOOL_CHAIN_CONF
 *_VS2003_IA32_*_DPATH           = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\r
 \r
 *_VS2003_IA32_PP_FLAGS          = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h \r
+*_VS2003_IA32_VFR_FLAGS         = /nologo /P /TC /DVFRCOMPILE\r
 DEBUG_VS2003_IA32_CC_FLAGS      = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h /Zi /Gm\r
 RELEASE_VS2003_IA32_CC_FLAGS    = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yu${DEST_DIR_DEBUG}/AutoGen.h\r
 DEBUG_VS2003_IA32_PCH_FLAGS     = /nologo /W4 /WX /Gy /c /D UNICODE /D EFI32 /O1ib2 /GL /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h /EHs-c- /GF /Gs8192 /Fp${DEST_DIR_OUTPUT}/AutoGen.h.gch /Yc /TC /Zi /Gm\r
@@ -93,6 +95,7 @@ RELEASE_VS2003_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /O
 *_WINDDK3790x1830_*_*_FAMILY        = MSFT\r
 \r
 *_WINDDK3790x1830_*_CC_NAME         = cl.exe\r
+*_WINDDK3790x1830_*_VFR_NAME        = cl.exe\r
 *_WINDDK3790x1830_*_SLINK_NAME      = lib.exe\r
 *_WINDDK3790x1830_*_DLINK_NAME      = link.exe\r
 *_WINDDK3790x1830_*_ASMLINK_NAME    = link.exe\r
@@ -100,7 +103,7 @@ RELEASE_VS2003_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /O
 *_WINDDK3790x1830_*_PCH_NAME        = cl.exe\r
 \r
 *_WINDDK3790x1830_*_SLINK_FLAGS     = /nologo /LTCG\r
-\r
+*_WINDDK3790x1830_*_VFR_FLAGS       = /nologo /P /TC /DVFRCOMPILE\r
 ##################\r
 # IA32 definitions\r
 ##################\r
@@ -202,10 +205,12 @@ RELEASE_WINDDK3790x1830_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OP
 *_VS2005PRO_*_DLINK_NAME     = link.exe\r
 *_VS2005PRO_*_ASMLINK_NAME   = link.exe\r
 *_VS2005PRO_*_PP_NAME        = cl.exe\r
+*_VS2005PRO_*_VFR_NAME       = cl.exe\r
 *_VS2005PRO_*_PCH_NAME       = cl.exe\r
 \r
 *_VS2005PRO_*_SLINK_FLAGS       = /NOLOGO /LTCG\r
 *_VS2005PRO_*_PP_FLAGS          = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h \r
+*_VS2005PRO_*_VFR_FLAGS         = /nologo /P /TC /DVFRCOMPILE\r
 \r
 ##################\r
 # IA32 definitions\r
@@ -274,34 +279,49 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 #\r
 ####################################################################################\r
 \r
+\r
 ####################################################################################\r
 #\r
-# UNIX GCC\r
+# Unix GCC\r
 #\r
 ####################################################################################\r
 \r
-*_UNIXGCC_IA32_*_FAMILY     = GCC\r
+*_UNIXGCC_*_*_FAMILY        = GCC\r
+*_UNIXGCC_*_*_FAMILY        = GCC\r
 \r
 *_UNIXGCC_IA32_CC_NAME      = gcc\r
 *_UNIXGCC_IA32_SLINK_NAME   = ar\r
 *_UNIXGCC_IA32_DLINK_NAME   = ld\r
 *_UNIXGCC_IA32_ASM_NAME     = gcc\r
 *_UNIXGCC_IA32_PP_NAME      = gcc\r
+*_UNIXGCC_IA32_VFR_NAME     = gcc\r
+\r
+*_UNIXGCC_X64_CC_NAME       = gcc\r
+*_UNIXGCC_X64_SLINK_NAME    = ar\r
+*_UNIXGCC_X64_DLINK_NAME    = ld\r
+*_UNIXGCC_X64_ASM_NAME      = gcc\r
+*_UNIXGCC_X64_PP_NAME       = gcc\r
+*_UNIXGCC_X64_VFR_NAME      = gcc\r
 \r
 *_UNIXGCC_IA32_CC_FLAGS     = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h\r
+*_UNIXGCC_X64_CC_FLAGS      = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h -D_EFI_P64\r
 *_UNIXGCC_*_DLINK_FLAGS     = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _${ENTRYPOINT}\r
-*_UNIXGCC_IA32_ASM_FLAGS    = -c -imacros ${DEST_DIR_DEBUG}/AutoGen.h\r
+*_UNIXGCC_*_ASM_FLAGS       = -c -imacros ${DEST_DIR_DEBUG}/AutoGen.h\r
 *_UNIXGCC_*_PP_FLAGS        = -E -x assembler-with-cpp -include ${DEST_DIR_DEBUG}/AutoGen.h\r
+*_UNIXGCC_*_VFR_FLAGS       = -x c -E -P -DVFRCOMPILE\r
+*_UNIXGCC_*_ASM_EXT         = .S\r
 \r
-*_UNIXGCC_IA32_ASM_EXT      = .S\r
 *_UNIXGCC_IA32_*_PATH       = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r
+*_UNIXGCC_X64_*_PATH        = /opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin\r
+\r
 \r
 ####################################################################################\r
 #\r
-# CygWin GCC\r
+# Cygwin GCC\r
 #\r
 ####################################################################################\r
 \r
+*_CYGWINGCC_X64_*_FAMILY      = GCC\r
 *_CYGWINGCC_IA32_*_FAMILY     = GCC\r
 \r
 *_CYGWINGCC_IA32_CC_NAME      = gcc\r
@@ -309,15 +329,61 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 *_CYGWINGCC_IA32_DLINK_NAME   = ld\r
 *_CYGWINGCC_IA32_ASM_NAME     = gcc\r
 *_CYGWINGCC_IA32_PP_NAME      = gcc\r
+*_CYGWINGCC_IA32_VFR_NAME     = gcc\r
+\r
+*_CYGWINGCC_X64_CC_NAME       = gcc\r
+*_CYGWINGCC_X64_SLINK_NAME    = ar\r
+*_CYGWINGCC_X64_DLINK_NAME    = ld\r
+*_CYGWINGCC_X64_ASM_NAME      = gcc\r
+*_CYGWINGCC_X64_PP_NAME       = gcc\r
+*_CYGWINGCC_X64_VFR_NAME      = gcc\r
 \r
 *_CYGWINGCC_IA32_CC_FLAGS     = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h\r
+*_CYGWINGCC_X64_CC_FLAGS      = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h -D_EFI_P64\r
 *_CYGWINGCC_*_DLINK_FLAGS     = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _${ENTRYPOINT}\r
-*_CYGWINGCC_IA32_ASM_FLAGS    = -c -imacros ${DEST_DIR_DEBUG}/AutoGen.h\r
+*_CYGWINGCC_*_ASM_FLAGS       = -c -imacros ${DEST_DIR_DEBUG}/AutoGen.h\r
 *_CYGWINGCC_*_PP_FLAGS        = -E -x assembler-with-cpp -include ${DEST_DIR_DEBUG}/AutoGen.h\r
+*_CYGWINGCC_*_VFR_FLAGS       = -x c -E -P -DVFRCOMPILE\r
+*_CYGWINGCC_*_ASM_EXT         = .S\r
 \r
-*_CYGWINGCC_IA32_ASM_EXT      = .S\r
 *_CYGWINGCC_IA32_*_PATH       = c:/Cygwin/opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r
-*_CYGWINGCC_IA32_*_DPATH      = c:/Cygwin/bin\r
+*_CYGWINGCC_X64_*_PATH        = c:/Cygwin/opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin\r
+*_CYGWINGCC_*_*_DPATH         = c:/Cygwin/bin\r
+\r
+\r
+####################################################################################\r
+#\r
+# Mixed x64 - This configuration is used to compile C code with gcc and assemble\r
+#             with the Microsoft assembler.\r
+#\r
+####################################################################################\r
+\r
+*_MIXED_X64_CC_FAMILY    = GCC\r
+*_MIXED_X64_SLINK_FAMILY = GCC\r
+*_MIXED_X64_DLINK_FAMILY = GCC\r
+*_MIXED_X64_ASM_FAMILY   = MSFT\r
+*_MIXED_X64_PP_FAMILY    = MSFT\r
+\r
+*_MIXED_X64_CC_NAME      = gcc\r
+*_MIXED_X64_SLINK_NAME   = ar\r
+*_MIXED_X64_DLINK_NAME   = ld\r
+*_MIXED_X64_ASM_NAME     = gcc\r
+*_MIXED_X64_PP_NAME      = cl.exe\r
+\r
+*_MIXED_X64_CC_FLAGS     = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h -D_EFI_P64\r
+*_MIXED_*_DLINK_FLAGS    = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _${ENTRYPOINT}\r
+*_MIXED_X64_PP_FLAGS     = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h \r
+\r
+*_MIXED_X64_ASM_NAME     = ml64.exe\r
+*_MIXED_X64_ASM_PATH     = C:/WINDDK/3790.1830/bin/win64/x86/amd64\r
+*_MIXED_X64_CC_PATH      = C:/cygwin/opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin\r
+*_MIXED_X64_PP_PATH      = C:/WINDDK/3790.1830/bin/win64/x86/amd64\r
+*_MIXED_X64_SLINK_PATH   = C:/cygwin/opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin\r
+*_MIXED_X64_DLINK_PATH   = C:/cygwin/opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin\r
+*_MIXED_X64_ASMLINK_PATH = C:/WINDDK/3790.1830/bin/bin16/\r
+\r
+DEBUG_MIXED_X64_ASM_FLAGS     = /nologo /W3 /WX /c /Cx /Zd /Zi\r
+RELEASE_MIXED_X64_ASM_FLAGS   = /nologo /W3 /WX /c /Cx /Zd\r
 \r
 ####################################################################################\r
 #\r
@@ -375,9 +441,11 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 *_MYTOOLS_*_DLINK_NAME           = link.exe\r
 *_MYTOOLS_*_ASMLINK_NAME         = link.exe\r
 *_MYTOOLS_*_PP_NAME              = cl.exe \r
+*_MYTOOLS_*_VFR_NAME             = cl.exe \r
 *_MYTOOLS_*_APP_NAME             = cl.exe\r
 *_MYTOOLS_*_ASM_NAME             = ml.exe\r
 \r
+*_MYTOOLS_*_VFR_FLAGS            = /nologo /P /TC /DVFRCOMPILE\r
 ##################\r
 # IA32 definitions\r
 ##################\r