1 files changed, 3 insertions, 24 deletions
diff --git a/Tools/Conf/tools_def.template b/Tools/Conf/tools_def.template
index c0d39a7..b1da50d 100644
--- 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
 #
 ####################################################################################
 
-####################################################################################
-#
-# UNIX GCC
-#
-####################################################################################
-
-*_UNIXGCC_IA32_*_FAMILY     = GCC
-
-*_UNIXGCC_IA32_CC_NAME      = gcc
-*_UNIXGCC_IA32_SLINK_NAME   = ar
-*_UNIXGCC_IA32_DLINK_NAME   = ld
-*_UNIXGCC_IA32_ASM_NAME     = gcc
-*_UNIXGCC_IA32_PP_NAME      = gcc
-*_UNIXGCC_IA32_VFR_NAME     = gcc
-
-*_UNIXGCC_IA32_CC_FLAGS     = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h
-*_UNIXGCC_*_DLINK_FLAGS     = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _${ENTRYPOINT}
-*_UNIXGCC_IA32_ASM_FLAGS    = -c -imacros ${DEST_DIR_DEBUG}/AutoGen.h
-*_UNIXGCC_*_PP_FLAGS        = -E -x assembler-with-cpp -include ${DEST_DIR_DEBUG}/AutoGen.h
-*_UNIXGCC_*_VFR_FLAGS        = -x c -E -P -DVFRCOMPILE
-
-*_UNIXGCC_IA32_ASM_EXT      = .S
-*_UNIXGCC_IA32_*_PATH       = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin
-
 
 ####################################################################################
 #
@@ -318,18 +294,21 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 *_UNIXGCC_IA32_DLINK_NAME   = ld
 *_UNIXGCC_IA32_ASM_NAME     = gcc
 *_UNIXGCC_IA32_PP_NAME      = gcc
+*_UNIXGCC_IA32_VFR_NAME     = gcc
 
 *_UNIXGCC_X64_CC_NAME       = gcc
 *_UNIXGCC_X64_SLINK_NAME    = ar
 *_UNIXGCC_X64_DLINK_NAME    = ld
 *_UNIXGCC_X64_ASM_NAME      = gcc
 *_UNIXGCC_X64_PP_NAME       = gcc
+*_UNIXGCC_X64_VFR_NAME      = gcc
 
 *_UNIXGCC_IA32_CC_FLAGS     = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h
 *_UNIXGCC_X64_CC_FLAGS      = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h -D_EFI_P64
 *_UNIXGCC_*_DLINK_FLAGS     = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _${ENTRYPOINT}
 *_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_*_VFR_FLAGS       = -x c -E -P -DVFRCOMPILE
 *_UNIXGCC_*_ASM_EXT         = .S
 
 *_UNIXGCC_IA32_*_PATH       = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin