Add new tool chain configs for x64 gcc

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

diff --git a/Tools/Conf/tools_def.template b/Tools/Conf/tools_def.template
index e54cd8c62389bf56c49822b2b7c82b19989e709d..98898d41f9dc865eca04a7f34b94fd9d45c05b0c 100644 (file)
--- a/Tools/Conf/tools_def.template
+++ b/Tools/Conf/tools_def.template
@@ -296,12 +296,46 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 *_UNIXGCC_IA32_ASM_EXT      = .S\r
 *_UNIXGCC_IA32_*_PATH       = /opt/tiano/i386-tiano-pe/i386-tiano-pe/bin\r
 \r
+\r
+####################################################################################\r
+#\r
+# Unix GCC\r
+#\r
+####################################################################################\r
+\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
+\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
+\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_*_ASM_EXT         = .S\r
+\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
@@ -310,18 +344,28 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 *_CYGWINGCC_IA32_ASM_NAME     = gcc\r
 *_CYGWINGCC_IA32_PP_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
+\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_*_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_64\r
+# Mixed x64 - This configuration is used to compile C code with gcc and assemble\r
+#             with the Microsoft assembler.\r
 #\r
 ####################################################################################\r
 \r
@@ -352,7 +396,6 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 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
 #\r
 # Intel EFI Byte Code Compiler (Template)\r