BaseTools: Modify gcc 4.8 and 4.9 tool chain definition to support building from...

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

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 15993ddf017e335a27a10e40f347df79e0d4c012..302a90ee2c9ed855effc798097ebb9f30ed96937 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -179,11 +179,11 @@ DEFINE GCC46_X64_PREFIX        = /usr/bin/
 DEFINE GCC47_IA32_PREFIX       = /usr/bin/\r
 DEFINE GCC47_X64_PREFIX        = /usr/bin/\r
 \r
-DEFINE GCC48_IA32_PREFIX       = /usr/bin/\r
-DEFINE GCC48_X64_PREFIX        = /usr/bin/\r
+DEFINE GCC48_IA32_PREFIX       = ENV(GCC48_BIN)\r
+DEFINE GCC48_X64_PREFIX        = ENV(GCC48_BIN)\r
 \r
-DEFINE GCC49_IA32_PREFIX       = /usr/bin/\r
-DEFINE GCC49_X64_PREFIX        = /usr/bin/\r
+DEFINE GCC49_IA32_PREFIX       = ENV(GCC49_BIN)\r
+DEFINE GCC49_X64_PREFIX        = ENV(GCC49_BIN)\r
 \r
 DEFINE UNIX_IASL_BIN           = ENV(IASL_PREFIX)iasl\r
 DEFINE WIN_ASL_BIN_DIR         = C:\ASL\r
@@ -333,14 +333,14 @@ DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G
 #                             Required to build platforms or ACPI tables:\r
 #                               Intel(r) ACPI Compiler v20101013 from\r
 #                               http://www.acpica.org/downloads/previous_releases.php\r
-#   GCC48       -Linux-  Requires:\r
-#                             GCC 4.8\r
+#   GCC48       -Linux,Windows-  Requires:\r
+#                             GCC 4.8 targeting x86_64-linux-gnu\r
 #                        Optional:\r
 #                             Required to build platforms or ACPI tables:\r
 #                               Intel(r) ACPI Compiler v20101013 from\r
 #                               http://www.acpica.org/downloads/previous_releases.php\r
-#   GCC49       -Linux-  Requires:\r
-#                             GCC 4.9\r
+#   GCC49       -Linux,Windows-  Requires:\r
+#                             GCC 4.9 targeting x86_64-linux-gnu\r
 #                        Optional:\r
 #                             Required to build platforms or ACPI tables:\r
 #                               Intel(r) ACPI Compiler v20101013 from\r
@@ -670,7 +670,7 @@ DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G
 #\r
 # Other Supported Tools\r
 # =====================\r
-#   NASM                 2.0.3   http://www.nasm.us/\r
+#   NASM 2.0.7 or later                 http://www.nasm.us/\r
 #\r
 ####################################################################################\r
 ####################################################################################\r
@@ -3811,7 +3811,7 @@ NOOPT_DDK3790xASL_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF
 *_*_*_OBJCOPY_FLAGS             = objcopy not needed for\r
 *_*_*_SYMRENAME_PATH            = echo\r
 *_*_*_SYMRENAME_FLAGS           = Symbol renaming not needed for\r
-DEBUG_*_*_OBJCOPY_ADDDEBUGFLAG     = --add-gnu-debuglink=$(DEBUG_DIR)\$(MODULE_NAME).debug\r
+DEBUG_*_*_OBJCOPY_ADDDEBUGFLAG     = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_NAME).debug\r
 RELEASE_*_*_OBJCOPY_ADDDEBUGFLAG   =\r
 \r
 DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -c -include AutoGen.h\r
@@ -3961,7 +3961,7 @@ DEFINE GCC49_AARCH64_ASLDLINK_FLAGS  = DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS)
 *_UNIXGCC_IA32_CC_FLAGS             = DEF(GCC_IA32_CC_FLAGS)\r
 *_UNIXGCC_IA32_RC_FLAGS             = DEF(GCC_IA32_RC_FLAGS)\r
 *_UNIXGCC_IA32_OBJCOPY_FLAGS        =\r
-*_UNIXGCC_IA32_NASM_FLAGS           = -f elf32\r
+*_UNIXGCC_IA32_NASM_FLAGS           = -f win32\r
 \r
 ##################\r
 # X64 definitions\r
@@ -3981,7 +3981,7 @@ DEFINE GCC49_AARCH64_ASLDLINK_FLAGS  = DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS)
 *_UNIXGCC_X64_CC_FLAGS              = DEF(GCC_X64_CC_FLAGS)\r
 *_UNIXGCC_X64_RC_FLAGS              = DEF(GCC_X64_RC_FLAGS)\r
 *_UNIXGCC_X64_OBJCOPY_FLAGS         =\r
-*_UNIXGCC_X64_NASM_FLAGS            = -f elf64\r
+*_UNIXGCC_X64_NASM_FLAGS            = -f win64\r
 \r
 ##################\r
 # IPF definitions\r
@@ -4367,7 +4367,8 @@ RELEASE_GCC47_AARCH64_CC_FLAGS   = DEF(GCC47_AARCH64_CC_FLAGS) -Wno-unused-but-s
 ####################################################################################\r
 *_GCC48_*_*_FAMILY               = GCC\r
 \r
-*_GCC48_*_MAKE_PATH                    = make\r
+*_GCC48_*_MAKE_PATH                    = DEF(GCC48_IA32_PREFIX)make\r
+*_GCC48_*_*_DLL                        = ENV(GCC48_DLL)\r
 *_GCC48_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)\r
 \r
 *_GCC48_*_PP_FLAGS                     = DEF(GCC_PP_FLAGS)\r
@@ -4489,7 +4490,8 @@ RELEASE_GCC48_AARCH64_CC_FLAGS   = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s
 ####################################################################################\r
 *_GCC49_*_*_FAMILY               = GCC\r
 \r
-*_GCC49_*_MAKE_PATH                    = make\r
+*_GCC49_*_MAKE_PATH                    = DEF(GCC49_IA32_PREFIX)make\r
+*_GCC49_*_*_DLL                        = ENV(GCC49_DLL)\r
 *_GCC49_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)\r
 \r
 *_GCC49_*_PP_FLAGS                     = DEF(GCC_PP_FLAGS)\r
@@ -4649,7 +4651,7 @@ RELEASE_GCC49_AARCH64_CC_FLAGS   = DEF(GCC49_AARCH64_CC_FLAGS) -Wno-unused-but-s
 *_CYGGCC_IA32_CC_FLAGS           = DEF(GCC_IA32_CC_FLAGS)\r
 *_CYGGCC_IA32_RC_FLAGS           = DEF(GCC_IA32_RC_FLAGS)\r
 *_CYGGCC_IA32_OBJCOPY_FLAGS      =\r
-*_CYGGCC_IA32_NASM_FLAGS         = -f elf32\r
+*_CYGGCC_IA32_NASM_FLAGS         = -f win32\r
 \r
 ##################\r
 # X64 definitions\r
@@ -4670,7 +4672,7 @@ RELEASE_GCC49_AARCH64_CC_FLAGS   = DEF(GCC49_AARCH64_CC_FLAGS) -Wno-unused-but-s
 *_CYGGCC_X64_CC_FLAGS            = DEF(GCC_X64_CC_FLAGS)\r
 *_CYGGCC_X64_RC_FLAGS            = DEF(GCC_X64_RC_FLAGS)\r
 *_CYGGCC_X64_OBJCOPY_FLAGS       =\r
-*_CYGGCC_X64_NASM_FLAGS          = -f elf64\r
+*_CYGGCC_X64_NASM_FLAGS          = -f win64\r
 \r
 ##################\r
 # IPF definitions\r
@@ -6478,6 +6480,7 @@ RELEASE_XCODE5_IA32_DLINK_FLAGS      = -arch i386 -u _$(IMAGE_ENTRY_POINT) -e _$
   DEBUG_XCODE5_IA32_ASM_FLAGS  = -arch i386 -g\r
   NOOPT_XCODE5_IA32_ASM_FLAGS  = -arch i386 -g\r
 RELEASE_XCODE5_IA32_ASM_FLAGS  = -arch i386 \r
+      *_XCODE5_IA32_NASM_FLAGS = -f macho32\r
 \r
 \r
   DEBUG_XCODE5_IA32_CC_FLAGS   = -arch i386 -c -g -Os       -Wall -Werror -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)\r
@@ -6497,6 +6500,7 @@ RELEASE_XCODE5_X64_DLINK_FLAGS      = -arch x86_64 -u _$(IMAGE_ENTRY_POINT) -e _
   DEBUG_XCODE5_X64_ASM_FLAGS  = -arch x86_64 -g\r
   NOOPT_XCODE5_X64_ASM_FLAGS  = -arch x86_64 -g\r
 RELEASE_XCODE5_X64_ASM_FLAGS  = -arch x86_64 \r
+      *_XCODE5_X64_NASM_FLAGS = -f macho64\r
 *_XCODE5_*_PP_FLAGS         = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h \r
 *_XCODE5_*_VFRPP_FLAGS      = -x c -E -P -DVFRCOMPILE -include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h \r
 \r