Sync EDKII BaseTools to BaseTools project r1971

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

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index b53826ba05fc94886a250b3a9ed2bb26c2767071..c5a4bd723eea37843bb2f2237065f52a88fd73b3 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -1,8 +1,8 @@
 #\r
-#  Copyright (c) 2006-2010, Intel Corporation\r
-#  Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.\r
+#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+#  Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
 #\r
-#  All rights reserved. This program and the accompanying materials\r
+#  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
@@ -109,6 +109,8 @@ DEFINE CYGWIN_BINIPF           = c:/cygwin/opt/tiano/gcc/ipf/bin/ia64-pc-elf-
 \r
 DEFINE GCC44_IA32_PREFIX       = /usr/bin/\r
 #DEFINE GCC44_IA32_PREFIX       = ENV(HOME)/programs/gcc/4.4/ia32/\r
+DEFINE GCC44_X64_PREFIX        = /usr/bin/\r
+#DEFINE GCC44_X64_PREFIX       = ENV(HOME)/programs/gcc/4.4/x64/\r
 \r
 DEFINE UNIX_IASL_BIN           = /usr/bin/iasl\r
 #DEFINE UNIX_IASL_BIN           = $(HOME)/programs/iasl\r
@@ -1571,10 +1573,11 @@ DEFINE GCC_IPF_RC_FLAGS            = -I binary -O elf64-ia64-little -B ia64 --re
 \r
 DEFINE GCC44_ALL_CC_FLAGS            = -g -fshort-wchar -fno-stack-protector -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-array-bounds -ffunction-sections -fdata-sections -c -include AutoGen.h -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings\r
 DEFINE GCC44_IA32_CC_FLAGS           = DEF(GCC44_ALL_CC_FLAGS) -m32 -malign-double -D EFI32\r
-DEFINE GCC44_X64_CC_FLAGS            = DEF(GCC44_ALL_CC_FLAGS) -m64 "-DEFIAPI=__attribute__((ms_abi))" -mno-red-zone -Wno-address\r
+DEFINE GCC44_X64_CC_FLAGS            = DEF(GCC44_ALL_CC_FLAGS) -m64 "-DEFIAPI=__attribute__((ms_abi))" -DNO_BUILTIN_VA_FUNCS -mno-red-zone -Wno-address\r
 DEFINE GCC44_IA32_X64_DLINK_COMMON   = -nostdlib -n -q --gc-sections\r
 DEFINE GCC44_IA32_X64_ASLDLINK_FLAGS = DEF(GCC44_IA32_X64_DLINK_COMMON) --entry ReferenceAcpiTable -u ReferenceAcpiTable\r
 DEFINE GCC44_IA32_X64_DLINK_FLAGS    = DEF(GCC44_IA32_X64_DLINK_COMMON) --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
+DEFINE GCC44_X64_DLINK_FLAGS         = DEF(GCC44_IA32_X64_DLINK_FLAGS)  -melf_x86_64 --oformat=elf64-x86-64 --script=$(EDK_TOOLS_PATH)/Scripts/gcc4.4-ld-script\r
 DEFINE GCC44_ASM_FLAGS               = DEF(GCC_ASM_FLAGS)\r
 \r
 ####################################################################################\r
@@ -1703,6 +1706,27 @@ DEFINE GCC44_ASM_FLAGS               = DEF(GCC_ASM_FLAGS)
 *_GCC44_IA32_DLINK_FLAGS          = DEF(GCC44_IA32_X64_DLINK_FLAGS) -m elf_i386 --oformat=elf32-i386\r
 *_GCC44_IA32_RC_FLAGS             = DEF(GCC_IA32_RC_FLAGS)\r
 \r
+##################\r
+# GCC44 X64 definitions\r
+##################\r
+*_GCC44_X64_CC_PATH              = DEF(GCC44_X64_PREFIX)gcc\r
+*_GCC44_X64_SLINK_PATH           = DEF(GCC44_X64_PREFIX)ar\r
+*_GCC44_X64_DLINK_PATH           = DEF(GCC44_X64_PREFIX)ld\r
+*_GCC44_X64_ASLDLINK_PATH        = DEF(GCC44_X64_PREFIX)ld\r
+*_GCC44_X64_ASM_PATH             = DEF(GCC44_X64_PREFIX)gcc\r
+*_GCC44_X64_PP_PATH              = DEF(GCC44_X64_PREFIX)gcc\r
+*_GCC44_X64_VFRPP_PATH           = DEF(GCC44_X64_PREFIX)gcc\r
+*_GCC44_X64_ASLCC_PATH           = DEF(GCC44_X64_PREFIX)gcc\r
+*_GCC44_X64_ASLPP_PATH           = DEF(GCC44_X64_PREFIX)gcc\r
+*_GCC44_X64_RC_PATH              = DEF(GCC44_X64_PREFIX)objcopy\r
+\r
+*_GCC44_X64_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m64\r
+*_GCC44_X64_ASLDLINK_FLAGS       = DEF(GCC44_IA32_X64_ASLDLINK_FLAGS) -m elf_x86_64\r
+*_GCC44_X64_ASM_FLAGS            = DEF(GCC44_ASM_FLAGS) -m64 --64 -melf_x86_64\r
+*_GCC44_X64_CC_FLAGS             = DEF(GCC44_X64_CC_FLAGS) -Os\r
+*_GCC44_X64_DLINK_FLAGS          = DEF(GCC44_X64_DLINK_FLAGS)\r
+*_GCC44_X64_RC_FLAGS             = DEF(GCC_X64_RC_FLAGS)\r
+\r
 \r
 ####################################################################################\r
 #\r