Resync the VFR flags

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1973 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Conf/tools_def.template b/Tools/Conf/tools_def.template
index c0d39a7d7536f69ac28370c5647c472a4232d190..b1da50db003c537f138d7edf3e010b3a573b915b 100644 (file)
--- a/Tools/Conf/tools_def.template
+++ b/Tools/Conf/tools_def.template
@@ -279,30 +279,6 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 #\r
 ####################################################################################\r
 \r
-####################################################################################\r
-#\r
-# UNIX GCC\r
-#\r
-####################################################################################\r
-\r
-*_UNIXGCC_IA32_*_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_IA32_CC_FLAGS     = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h\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_*_PP_FLAGS        = -E -x assembler-with-cpp -include ${DEST_DIR_DEBUG}/AutoGen.h\r
-*_UNIXGCC_*_VFR_FLAGS        = -x c -E -P -DVFRCOMPILE\r
-\r
-*_UNIXGCC_IA32_ASM_EXT      = .S\r
-*_UNIXGCC_IA32_*_PATH       = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r
-\r
 \r
 ####################################################################################\r
 #\r
@@ -318,18 +294,21 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 *_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_*_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_*_PATH       = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r