From 63b708ccad8afd0b887258888a53fd4945cff682 Mon Sep 17 00:00:00 2001

Message-Id: <63b708ccad8afd0b887258888a53fd4945cff682.1478467625.git.crobinso@redhat.com>

From: Paolo Bonzini <pbonzini@redhat.com>

Date: Sun, 6 Nov 2016 13:50:31 -0500

Subject: [PATCH] Tweak the tools_def to support cross-compiling.

These files are meant for customization, so this is not upstream.

---

 BaseTools/Conf/tools_def.template | 343 ++++++++++++++++++--------------------

 1 file changed, 161 insertions(+), 182 deletions(-)

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template

index 39fda78..97f5557 100755

--- a/BaseTools/Conf/tools_def.template

+++ b/BaseTools/Conf/tools_def.template

@@ -178,27 +178,6 @@ DEFINE CYGWIN_BINIA32          = c:/cygwin/opt/tiano/i386-tiano-pe/i386-tiano-pe

 DEFINE CYGWIN_BINX64           = c:/cygwin/opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin/

 DEFINE CYGWIN_BINIPF           = c:/cygwin/opt/tiano/gcc/ipf/bin/ia64-pc-elf-

-DEFINE GCC44_IA32_PREFIX       = ENV(GCC44_BIN)

-DEFINE GCC44_X64_PREFIX        = ENV(GCC44_BIN)

-

-DEFINE GCC45_IA32_PREFIX       = ENV(GCC45_BIN)

-DEFINE GCC45_X64_PREFIX        = ENV(GCC45_BIN)

-

-DEFINE GCC46_IA32_PREFIX       = ENV(GCC46_BIN)

-DEFINE GCC46_X64_PREFIX        = ENV(GCC46_BIN)

-

-DEFINE GCC47_IA32_PREFIX       = ENV(GCC47_BIN)

-DEFINE GCC47_X64_PREFIX        = ENV(GCC47_BIN)

-

-DEFINE GCC48_IA32_PREFIX       = ENV(GCC48_BIN)

-DEFINE GCC48_X64_PREFIX        = ENV(GCC48_BIN)

-

-DEFINE GCC49_IA32_PREFIX       = ENV(GCC49_BIN)

-DEFINE GCC49_X64_PREFIX        = ENV(GCC49_BIN)

-

-DEFINE GCC5_IA32_PREFIX        = ENV(GCC5_BIN)

-DEFINE GCC5_X64_PREFIX         = ENV(GCC5_BIN)

-

 DEFINE UNIX_IASL_BIN           = ENV(IASL_PREFIX)iasl

 DEFINE WIN_IASL_BIN            = ENV(IASL_PREFIX)iasl.exe

 DEFINE WIN_ASL_BIN             = ENV(IASL_PREFIX)asl.exe

@@ -4590,7 +4569,7 @@ DEFINE GCC5_AARCH64_ASLDLINK_FLAGS   = DEF(GCC49_AARCH64_ASLDLINK_FLAGS)

 ####################################################################################

 *_GCC44_*_*_FAMILY               = GCC

-*_GCC44_*_MAKE_PATH                    = DEF(GCC44_IA32_PREFIX)make

+*_GCC44_*_MAKE_PATH                    = make

 *_GCC44_*_*_DLL                        = ENV(GCC44_DLL)

 *_GCC44_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)

@@ -4605,17 +4584,17 @@ DEFINE GCC5_AARCH64_ASLDLINK_FLAGS   = DEF(GCC49_AARCH64_ASLDLINK_FLAGS)

 ##################

 # GCC44 IA32 definitions

 ##################

-*_GCC44_IA32_OBJCOPY_PATH         = DEF(GCC44_IA32_PREFIX)objcopy

-*_GCC44_IA32_CC_PATH              = DEF(GCC44_IA32_PREFIX)gcc

-*_GCC44_IA32_SLINK_PATH           = DEF(GCC44_IA32_PREFIX)ar

-*_GCC44_IA32_DLINK_PATH           = DEF(GCC44_IA32_PREFIX)gcc

-*_GCC44_IA32_ASLDLINK_PATH        = DEF(GCC44_IA32_PREFIX)gcc

-*_GCC44_IA32_ASM_PATH             = DEF(GCC44_IA32_PREFIX)gcc

-*_GCC44_IA32_PP_PATH              = DEF(GCC44_IA32_PREFIX)gcc

-*_GCC44_IA32_VFRPP_PATH           = DEF(GCC44_IA32_PREFIX)gcc

-*_GCC44_IA32_ASLCC_PATH           = DEF(GCC44_IA32_PREFIX)gcc

-*_GCC44_IA32_ASLPP_PATH           = DEF(GCC44_IA32_PREFIX)gcc

-*_GCC44_IA32_RC_PATH              = DEF(GCC44_IA32_PREFIX)objcopy

+*_GCC44_IA32_OBJCOPY_PATH         = ENV(GCC44_IA32_PREFIX)objcopy

+*_GCC44_IA32_CC_PATH              = ENV(GCC44_IA32_PREFIX)gcc

+*_GCC44_IA32_SLINK_PATH           = ENV(GCC44_IA32_PREFIX)ar

+*_GCC44_IA32_DLINK_PATH           = ENV(GCC44_IA32_PREFIX)gcc

+*_GCC44_IA32_ASLDLINK_PATH        = ENV(GCC44_IA32_PREFIX)gcc

+*_GCC44_IA32_ASM_PATH             = ENV(GCC44_IA32_PREFIX)gcc

+*_GCC44_IA32_PP_PATH              = ENV(GCC44_IA32_PREFIX)gcc

+*_GCC44_IA32_VFRPP_PATH           = ENV(GCC44_IA32_PREFIX)gcc

+*_GCC44_IA32_ASLCC_PATH           = ENV(GCC44_IA32_PREFIX)gcc

+*_GCC44_IA32_ASLPP_PATH           = ENV(GCC44_IA32_PREFIX)gcc

+*_GCC44_IA32_RC_PATH              = ENV(GCC44_IA32_PREFIX)objcopy

 *_GCC44_IA32_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m32

 *_GCC44_IA32_ASLDLINK_FLAGS       = DEF(GCC44_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386

@@ -4633,17 +4612,17 @@ RELEASE_GCC44_IA32_CC_FLAGS       = DEF(GCC44_IA32_CC_FLAGS) -Os

 ##################

 # GCC44 X64 definitions

 ##################

-*_GCC44_X64_OBJCOPY_PATH         = DEF(GCC44_X64_PREFIX)objcopy

-*_GCC44_X64_CC_PATH              = DEF(GCC44_X64_PREFIX)gcc

-*_GCC44_X64_SLINK_PATH           = DEF(GCC44_X64_PREFIX)ar

-*_GCC44_X64_DLINK_PATH           = DEF(GCC44_X64_PREFIX)gcc

-*_GCC44_X64_ASLDLINK_PATH        = DEF(GCC44_X64_PREFIX)gcc

-*_GCC44_X64_ASM_PATH             = DEF(GCC44_X64_PREFIX)gcc

-*_GCC44_X64_PP_PATH              = DEF(GCC44_X64_PREFIX)gcc

-*_GCC44_X64_VFRPP_PATH           = DEF(GCC44_X64_PREFIX)gcc

-*_GCC44_X64_ASLCC_PATH           = DEF(GCC44_X64_PREFIX)gcc

-*_GCC44_X64_ASLPP_PATH           = DEF(GCC44_X64_PREFIX)gcc

-*_GCC44_X64_RC_PATH              = DEF(GCC44_X64_PREFIX)objcopy

+*_GCC44_X64_OBJCOPY_PATH         = ENV(GCC44_X64_PREFIX)objcopy

+*_GCC44_X64_CC_PATH              = ENV(GCC44_X64_PREFIX)gcc

+*_GCC44_X64_SLINK_PATH           = ENV(GCC44_X64_PREFIX)ar

+*_GCC44_X64_DLINK_PATH           = ENV(GCC44_X64_PREFIX)gcc

+*_GCC44_X64_ASLDLINK_PATH        = ENV(GCC44_X64_PREFIX)gcc

+*_GCC44_X64_ASM_PATH             = ENV(GCC44_X64_PREFIX)gcc

+*_GCC44_X64_PP_PATH              = ENV(GCC44_X64_PREFIX)gcc

+*_GCC44_X64_VFRPP_PATH           = ENV(GCC44_X64_PREFIX)gcc

+*_GCC44_X64_ASLCC_PATH           = ENV(GCC44_X64_PREFIX)gcc

+*_GCC44_X64_ASLPP_PATH           = ENV(GCC44_X64_PREFIX)gcc

+*_GCC44_X64_RC_PATH              = ENV(GCC44_X64_PREFIX)objcopy

 *_GCC44_X64_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m64

 *_GCC44_X64_ASLDLINK_FLAGS       = DEF(GCC44_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64

@@ -4666,7 +4645,7 @@ RELEASE_GCC44_X64_CC_FLAGS       = DEF(GCC44_X64_CC_FLAGS) -Os

 ####################################################################################

 *_GCC45_*_*_FAMILY               = GCC

-*_GCC45_*_MAKE_PATH                    = DEF(GCC45_IA32_PREFIX)make

+*_GCC45_*_MAKE_PATH                    = make

 *_GCC45_*_*_DLL                        = ENV(GCC45_DLL)

 *_GCC45_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)

@@ -4681,17 +4660,17 @@ RELEASE_GCC44_X64_CC_FLAGS       = DEF(GCC44_X64_CC_FLAGS) -Os

 ##################

 # GCC45 IA32 definitions

 ##################

-*_GCC45_IA32_OBJCOPY_PATH         = DEF(GCC45_IA32_PREFIX)objcopy

-*_GCC45_IA32_CC_PATH              = DEF(GCC45_IA32_PREFIX)gcc

-*_GCC45_IA32_SLINK_PATH           = DEF(GCC45_IA32_PREFIX)ar

-*_GCC45_IA32_DLINK_PATH           = DEF(GCC45_IA32_PREFIX)gcc

-*_GCC45_IA32_ASLDLINK_PATH        = DEF(GCC45_IA32_PREFIX)gcc

-*_GCC45_IA32_ASM_PATH             = DEF(GCC45_IA32_PREFIX)gcc

-*_GCC45_IA32_PP_PATH              = DEF(GCC45_IA32_PREFIX)gcc

-*_GCC45_IA32_VFRPP_PATH           = DEF(GCC45_IA32_PREFIX)gcc

-*_GCC45_IA32_ASLCC_PATH           = DEF(GCC45_IA32_PREFIX)gcc

-*_GCC45_IA32_ASLPP_PATH           = DEF(GCC45_IA32_PREFIX)gcc

-*_GCC45_IA32_RC_PATH              = DEF(GCC45_IA32_PREFIX)objcopy

+*_GCC45_IA32_OBJCOPY_PATH         = ENV(GCC45_IA32_PREFIX)objcopy

+*_GCC45_IA32_CC_PATH              = ENV(GCC45_IA32_PREFIX)gcc

+*_GCC45_IA32_SLINK_PATH           = ENV(GCC45_IA32_PREFIX)ar

+*_GCC45_IA32_DLINK_PATH           = ENV(GCC45_IA32_PREFIX)gcc

+*_GCC45_IA32_ASLDLINK_PATH        = ENV(GCC45_IA32_PREFIX)gcc

+*_GCC45_IA32_ASM_PATH             = ENV(GCC45_IA32_PREFIX)gcc

+*_GCC45_IA32_PP_PATH              = ENV(GCC45_IA32_PREFIX)gcc

+*_GCC45_IA32_VFRPP_PATH           = ENV(GCC45_IA32_PREFIX)gcc

+*_GCC45_IA32_ASLCC_PATH           = ENV(GCC45_IA32_PREFIX)gcc

+*_GCC45_IA32_ASLPP_PATH           = ENV(GCC45_IA32_PREFIX)gcc

+*_GCC45_IA32_RC_PATH              = ENV(GCC45_IA32_PREFIX)objcopy

 *_GCC45_IA32_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m32

 *_GCC45_IA32_ASLDLINK_FLAGS       = DEF(GCC45_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386

@@ -4709,17 +4688,17 @@ RELEASE_GCC45_IA32_CC_FLAGS       = DEF(GCC45_IA32_CC_FLAGS) -Os

 ##################

 # GCC45 X64 definitions

 ##################

-*_GCC45_X64_OBJCOPY_PATH         = DEF(GCC45_X64_PREFIX)objcopy

-*_GCC45_X64_CC_PATH              = DEF(GCC45_X64_PREFIX)gcc

-*_GCC45_X64_SLINK_PATH           = DEF(GCC45_X64_PREFIX)ar

-*_GCC45_X64_DLINK_PATH           = DEF(GCC45_X64_PREFIX)gcc

-*_GCC45_X64_ASLDLINK_PATH        = DEF(GCC45_X64_PREFIX)gcc

-*_GCC45_X64_ASM_PATH             = DEF(GCC45_X64_PREFIX)gcc

-*_GCC45_X64_PP_PATH              = DEF(GCC45_X64_PREFIX)gcc

-*_GCC45_X64_VFRPP_PATH           = DEF(GCC45_X64_PREFIX)gcc

-*_GCC45_X64_ASLCC_PATH           = DEF(GCC45_X64_PREFIX)gcc

-*_GCC45_X64_ASLPP_PATH           = DEF(GCC45_X64_PREFIX)gcc

-*_GCC45_X64_RC_PATH              = DEF(GCC45_X64_PREFIX)objcopy

+*_GCC45_X64_OBJCOPY_PATH         = ENV(GCC45_X64_PREFIX)objcopy

+*_GCC45_X64_CC_PATH              = ENV(GCC45_X64_PREFIX)gcc

+*_GCC45_X64_SLINK_PATH           = ENV(GCC45_X64_PREFIX)ar

+*_GCC45_X64_DLINK_PATH           = ENV(GCC45_X64_PREFIX)gcc

+*_GCC45_X64_ASLDLINK_PATH        = ENV(GCC45_X64_PREFIX)gcc

+*_GCC45_X64_ASM_PATH             = ENV(GCC45_X64_PREFIX)gcc

+*_GCC45_X64_PP_PATH              = ENV(GCC45_X64_PREFIX)gcc

+*_GCC45_X64_VFRPP_PATH           = ENV(GCC45_X64_PREFIX)gcc

+*_GCC45_X64_ASLCC_PATH           = ENV(GCC45_X64_PREFIX)gcc

+*_GCC45_X64_ASLPP_PATH           = ENV(GCC45_X64_PREFIX)gcc

+*_GCC45_X64_RC_PATH              = ENV(GCC45_X64_PREFIX)objcopy

 *_GCC45_X64_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m64

 *_GCC45_X64_ASLDLINK_FLAGS       = DEF(GCC45_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64

@@ -4742,7 +4721,7 @@ RELEASE_GCC45_X64_CC_FLAGS       = DEF(GCC45_X64_CC_FLAGS) -Os

 ####################################################################################

 *_GCC46_*_*_FAMILY               = GCC

-*_GCC46_*_MAKE_PATH                    = DEF(GCC46_IA32_PREFIX)make

+*_GCC46_*_MAKE_PATH                    = make

 *_GCC46_*_*_DLL                        = ENV(GCC46_DLL)

 *_GCC46_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)

@@ -4757,17 +4736,17 @@ RELEASE_GCC45_X64_CC_FLAGS       = DEF(GCC45_X64_CC_FLAGS) -Os

 ##################

 # GCC46 IA32 definitions

 ##################

-*_GCC46_IA32_OBJCOPY_PATH         = DEF(GCC46_IA32_PREFIX)objcopy

-*_GCC46_IA32_CC_PATH              = DEF(GCC46_IA32_PREFIX)gcc

-*_GCC46_IA32_SLINK_PATH           = DEF(GCC46_IA32_PREFIX)ar

-*_GCC46_IA32_DLINK_PATH           = DEF(GCC46_IA32_PREFIX)gcc

-*_GCC46_IA32_ASLDLINK_PATH        = DEF(GCC46_IA32_PREFIX)gcc

-*_GCC46_IA32_ASM_PATH             = DEF(GCC46_IA32_PREFIX)gcc

-*_GCC46_IA32_PP_PATH              = DEF(GCC46_IA32_PREFIX)gcc

-*_GCC46_IA32_VFRPP_PATH           = DEF(GCC46_IA32_PREFIX)gcc

-*_GCC46_IA32_ASLCC_PATH           = DEF(GCC46_IA32_PREFIX)gcc

-*_GCC46_IA32_ASLPP_PATH           = DEF(GCC46_IA32_PREFIX)gcc

-*_GCC46_IA32_RC_PATH              = DEF(GCC46_IA32_PREFIX)objcopy

+*_GCC46_IA32_OBJCOPY_PATH         = ENV(GCC46_IA32_PREFIX)objcopy

+*_GCC46_IA32_CC_PATH              = ENV(GCC46_IA32_PREFIX)gcc

+*_GCC46_IA32_SLINK_PATH           = ENV(GCC46_IA32_PREFIX)ar

+*_GCC46_IA32_DLINK_PATH           = ENV(GCC46_IA32_PREFIX)gcc

+*_GCC46_IA32_ASLDLINK_PATH        = ENV(GCC46_IA32_PREFIX)gcc

+*_GCC46_IA32_ASM_PATH             = ENV(GCC46_IA32_PREFIX)gcc

+*_GCC46_IA32_PP_PATH              = ENV(GCC46_IA32_PREFIX)gcc

+*_GCC46_IA32_VFRPP_PATH           = ENV(GCC46_IA32_PREFIX)gcc

+*_GCC46_IA32_ASLCC_PATH           = ENV(GCC46_IA32_PREFIX)gcc

+*_GCC46_IA32_ASLPP_PATH           = ENV(GCC46_IA32_PREFIX)gcc

+*_GCC46_IA32_RC_PATH              = ENV(GCC46_IA32_PREFIX)objcopy

 *_GCC46_IA32_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m32

 *_GCC46_IA32_ASLDLINK_FLAGS       = DEF(GCC46_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386

@@ -4785,17 +4764,17 @@ RELEASE_GCC46_IA32_CC_FLAGS       = DEF(GCC46_IA32_CC_FLAGS) -Os -Wno-unused-but

 ##################

 # GCC46 X64 definitions

 ##################

-*_GCC46_X64_OBJCOPY_PATH         = DEF(GCC46_X64_PREFIX)objcopy

-*_GCC46_X64_CC_PATH              = DEF(GCC46_X64_PREFIX)gcc

-*_GCC46_X64_SLINK_PATH           = DEF(GCC46_X64_PREFIX)ar

-*_GCC46_X64_DLINK_PATH           = DEF(GCC46_X64_PREFIX)gcc

-*_GCC46_X64_ASLDLINK_PATH        = DEF(GCC46_X64_PREFIX)gcc

-*_GCC46_X64_ASM_PATH             = DEF(GCC46_X64_PREFIX)gcc

-*_GCC46_X64_PP_PATH              = DEF(GCC46_X64_PREFIX)gcc

-*_GCC46_X64_VFRPP_PATH           = DEF(GCC46_X64_PREFIX)gcc

-*_GCC46_X64_ASLCC_PATH           = DEF(GCC46_X64_PREFIX)gcc

-*_GCC46_X64_ASLPP_PATH           = DEF(GCC46_X64_PREFIX)gcc

-*_GCC46_X64_RC_PATH              = DEF(GCC46_X64_PREFIX)objcopy

+*_GCC46_X64_OBJCOPY_PATH         = ENV(GCC46_X64_PREFIX)objcopy

+*_GCC46_X64_CC_PATH              = ENV(GCC46_X64_PREFIX)gcc

+*_GCC46_X64_SLINK_PATH           = ENV(GCC46_X64_PREFIX)ar

+*_GCC46_X64_DLINK_PATH           = ENV(GCC46_X64_PREFIX)gcc

+*_GCC46_X64_ASLDLINK_PATH        = ENV(GCC46_X64_PREFIX)gcc

+*_GCC46_X64_ASM_PATH             = ENV(GCC46_X64_PREFIX)gcc

+*_GCC46_X64_PP_PATH              = ENV(GCC46_X64_PREFIX)gcc

+*_GCC46_X64_VFRPP_PATH           = ENV(GCC46_X64_PREFIX)gcc

+*_GCC46_X64_ASLCC_PATH           = ENV(GCC46_X64_PREFIX)gcc

+*_GCC46_X64_ASLPP_PATH           = ENV(GCC46_X64_PREFIX)gcc

+*_GCC46_X64_RC_PATH              = ENV(GCC46_X64_PREFIX)objcopy

 *_GCC46_X64_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m64

 *_GCC46_X64_ASLDLINK_FLAGS       = DEF(GCC46_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64

@@ -4851,7 +4830,7 @@ RELEASE_GCC46_ARM_CC_FLAGS       = DEF(GCC46_ARM_CC_FLAGS) -Wno-unused-but-set-v

 ####################################################################################

 *_GCC47_*_*_FAMILY               = GCC

-*_GCC47_*_MAKE_PATH                    = DEF(GCC47_IA32_PREFIX)make

+*_GCC47_*_MAKE_PATH                    = make

 *_GCC47_*_*_DLL                        = ENV(GCC47_DLL)

 *_GCC47_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)

@@ -4866,17 +4845,17 @@ RELEASE_GCC46_ARM_CC_FLAGS       = DEF(GCC46_ARM_CC_FLAGS) -Wno-unused-but-set-v

 ##################

 # GCC47 IA32 definitions

 ##################

-*_GCC47_IA32_OBJCOPY_PATH         = DEF(GCC47_IA32_PREFIX)objcopy

-*_GCC47_IA32_CC_PATH              = DEF(GCC47_IA32_PREFIX)gcc

-*_GCC47_IA32_SLINK_PATH           = DEF(GCC47_IA32_PREFIX)ar

-*_GCC47_IA32_DLINK_PATH           = DEF(GCC47_IA32_PREFIX)gcc

-*_GCC47_IA32_ASLDLINK_PATH        = DEF(GCC47_IA32_PREFIX)gcc

-*_GCC47_IA32_ASM_PATH             = DEF(GCC47_IA32_PREFIX)gcc

-*_GCC47_IA32_PP_PATH              = DEF(GCC47_IA32_PREFIX)gcc

-*_GCC47_IA32_VFRPP_PATH           = DEF(GCC47_IA32_PREFIX)gcc

-*_GCC47_IA32_ASLCC_PATH           = DEF(GCC47_IA32_PREFIX)gcc

-*_GCC47_IA32_ASLPP_PATH           = DEF(GCC47_IA32_PREFIX)gcc

-*_GCC47_IA32_RC_PATH              = DEF(GCC47_IA32_PREFIX)objcopy

+*_GCC47_IA32_OBJCOPY_PATH         = ENV(GCC47_IA32_PREFIX)objcopy

+*_GCC47_IA32_CC_PATH              = ENV(GCC47_IA32_PREFIX)gcc

+*_GCC47_IA32_SLINK_PATH           = ENV(GCC47_IA32_PREFIX)ar

+*_GCC47_IA32_DLINK_PATH           = ENV(GCC47_IA32_PREFIX)gcc

+*_GCC47_IA32_ASLDLINK_PATH        = ENV(GCC47_IA32_PREFIX)gcc

+*_GCC47_IA32_ASM_PATH             = ENV(GCC47_IA32_PREFIX)gcc

+*_GCC47_IA32_PP_PATH              = ENV(GCC47_IA32_PREFIX)gcc

+*_GCC47_IA32_VFRPP_PATH           = ENV(GCC47_IA32_PREFIX)gcc

+*_GCC47_IA32_ASLCC_PATH           = ENV(GCC47_IA32_PREFIX)gcc

+*_GCC47_IA32_ASLPP_PATH           = ENV(GCC47_IA32_PREFIX)gcc

+*_GCC47_IA32_RC_PATH              = ENV(GCC47_IA32_PREFIX)objcopy

 *_GCC47_IA32_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m32

 *_GCC47_IA32_ASLDLINK_FLAGS       = DEF(GCC47_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386

@@ -4894,17 +4873,17 @@ RELEASE_GCC47_IA32_CC_FLAGS       = DEF(GCC47_IA32_CC_FLAGS) -Os -Wno-unused-but

 ##################

 # GCC47 X64 definitions

 ##################

-*_GCC47_X64_OBJCOPY_PATH         = DEF(GCC47_X64_PREFIX)objcopy

-*_GCC47_X64_CC_PATH              = DEF(GCC47_X64_PREFIX)gcc

-*_GCC47_X64_SLINK_PATH           = DEF(GCC47_X64_PREFIX)ar

-*_GCC47_X64_DLINK_PATH           = DEF(GCC47_X64_PREFIX)gcc

-*_GCC47_X64_ASLDLINK_PATH        = DEF(GCC47_X64_PREFIX)gcc

-*_GCC47_X64_ASM_PATH             = DEF(GCC47_X64_PREFIX)gcc

-*_GCC47_X64_PP_PATH              = DEF(GCC47_X64_PREFIX)gcc

-*_GCC47_X64_VFRPP_PATH           = DEF(GCC47_X64_PREFIX)gcc

-*_GCC47_X64_ASLCC_PATH           = DEF(GCC47_X64_PREFIX)gcc

-*_GCC47_X64_ASLPP_PATH           = DEF(GCC47_X64_PREFIX)gcc

-*_GCC47_X64_RC_PATH              = DEF(GCC47_X64_PREFIX)objcopy

+*_GCC47_X64_OBJCOPY_PATH         = ENV(GCC47_X64_PREFIX)objcopy

+*_GCC47_X64_CC_PATH              = ENV(GCC47_X64_PREFIX)gcc

+*_GCC47_X64_SLINK_PATH           = ENV(GCC47_X64_PREFIX)ar

+*_GCC47_X64_DLINK_PATH           = ENV(GCC47_X64_PREFIX)gcc

+*_GCC47_X64_ASLDLINK_PATH        = ENV(GCC47_X64_PREFIX)gcc

+*_GCC47_X64_ASM_PATH             = ENV(GCC47_X64_PREFIX)gcc

+*_GCC47_X64_PP_PATH              = ENV(GCC47_X64_PREFIX)gcc

+*_GCC47_X64_VFRPP_PATH           = ENV(GCC47_X64_PREFIX)gcc

+*_GCC47_X64_ASLCC_PATH           = ENV(GCC47_X64_PREFIX)gcc

+*_GCC47_X64_ASLPP_PATH           = ENV(GCC47_X64_PREFIX)gcc

+*_GCC47_X64_RC_PATH              = ENV(GCC47_X64_PREFIX)objcopy

 *_GCC47_X64_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m64

 *_GCC47_X64_ASLDLINK_FLAGS       = DEF(GCC47_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64

@@ -4988,7 +4967,7 @@ RELEASE_GCC47_AARCH64_CC_FLAGS   = DEF(GCC47_AARCH64_CC_FLAGS) -Wno-unused-but-s

 ####################################################################################

 *_GCC48_*_*_FAMILY               = GCC

-*_GCC48_*_MAKE_PATH                    = DEF(GCC48_IA32_PREFIX)make

+*_GCC48_*_MAKE_PATH                    = make

 *_GCC48_*_*_DLL                        = ENV(GCC48_DLL)

 *_GCC48_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)

@@ -5003,17 +4982,17 @@ RELEASE_GCC47_AARCH64_CC_FLAGS   = DEF(GCC47_AARCH64_CC_FLAGS) -Wno-unused-but-s

 ##################

 # GCC48 IA32 definitions

 ##################

-*_GCC48_IA32_OBJCOPY_PATH         = DEF(GCC48_IA32_PREFIX)objcopy

-*_GCC48_IA32_CC_PATH              = DEF(GCC48_IA32_PREFIX)gcc

-*_GCC48_IA32_SLINK_PATH           = DEF(GCC48_IA32_PREFIX)ar

-*_GCC48_IA32_DLINK_PATH           = DEF(GCC48_IA32_PREFIX)gcc

-*_GCC48_IA32_ASLDLINK_PATH        = DEF(GCC48_IA32_PREFIX)gcc

-*_GCC48_IA32_ASM_PATH             = DEF(GCC48_IA32_PREFIX)gcc

-*_GCC48_IA32_PP_PATH              = DEF(GCC48_IA32_PREFIX)gcc

-*_GCC48_IA32_VFRPP_PATH           = DEF(GCC48_IA32_PREFIX)gcc

-*_GCC48_IA32_ASLCC_PATH           = DEF(GCC48_IA32_PREFIX)gcc

-*_GCC48_IA32_ASLPP_PATH           = DEF(GCC48_IA32_PREFIX)gcc

-*_GCC48_IA32_RC_PATH              = DEF(GCC48_IA32_PREFIX)objcopy

+*_GCC48_IA32_OBJCOPY_PATH         = ENV(GCC48_IA32_PREFIX)objcopy

+*_GCC48_IA32_CC_PATH              = ENV(GCC48_IA32_PREFIX)gcc

+*_GCC48_IA32_SLINK_PATH           = ENV(GCC48_IA32_PREFIX)ar

+*_GCC48_IA32_DLINK_PATH           = ENV(GCC48_IA32_PREFIX)gcc

+*_GCC48_IA32_ASLDLINK_PATH        = ENV(GCC48_IA32_PREFIX)gcc

+*_GCC48_IA32_ASM_PATH             = ENV(GCC48_IA32_PREFIX)gcc

+*_GCC48_IA32_PP_PATH              = ENV(GCC48_IA32_PREFIX)gcc

+*_GCC48_IA32_VFRPP_PATH           = ENV(GCC48_IA32_PREFIX)gcc

+*_GCC48_IA32_ASLCC_PATH           = ENV(GCC48_IA32_PREFIX)gcc

+*_GCC48_IA32_ASLPP_PATH           = ENV(GCC48_IA32_PREFIX)gcc

+*_GCC48_IA32_RC_PATH              = ENV(GCC48_IA32_PREFIX)objcopy

 *_GCC48_IA32_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m32

 *_GCC48_IA32_ASLDLINK_FLAGS       = DEF(GCC48_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386

@@ -5031,17 +5010,17 @@ RELEASE_GCC48_IA32_CC_FLAGS       = DEF(GCC48_IA32_CC_FLAGS) -Os -Wno-unused-but

 ##################

 # GCC48 X64 definitions

 ##################

-*_GCC48_X64_OBJCOPY_PATH         = DEF(GCC48_X64_PREFIX)objcopy

-*_GCC48_X64_CC_PATH              = DEF(GCC48_X64_PREFIX)gcc

-*_GCC48_X64_SLINK_PATH           = DEF(GCC48_X64_PREFIX)ar

-*_GCC48_X64_DLINK_PATH           = DEF(GCC48_X64_PREFIX)gcc

-*_GCC48_X64_ASLDLINK_PATH        = DEF(GCC48_X64_PREFIX)gcc

-*_GCC48_X64_ASM_PATH             = DEF(GCC48_X64_PREFIX)gcc

-*_GCC48_X64_PP_PATH              = DEF(GCC48_X64_PREFIX)gcc

-*_GCC48_X64_VFRPP_PATH           = DEF(GCC48_X64_PREFIX)gcc

-*_GCC48_X64_ASLCC_PATH           = DEF(GCC48_X64_PREFIX)gcc

-*_GCC48_X64_ASLPP_PATH           = DEF(GCC48_X64_PREFIX)gcc

-*_GCC48_X64_RC_PATH              = DEF(GCC48_X64_PREFIX)objcopy

+*_GCC48_X64_OBJCOPY_PATH         = ENV(GCC48_X64_PREFIX)objcopy

+*_GCC48_X64_CC_PATH              = ENV(GCC48_X64_PREFIX)gcc

+*_GCC48_X64_SLINK_PATH           = ENV(GCC48_X64_PREFIX)ar

+*_GCC48_X64_DLINK_PATH           = ENV(GCC48_X64_PREFIX)gcc

+*_GCC48_X64_ASLDLINK_PATH        = ENV(GCC48_X64_PREFIX)gcc

+*_GCC48_X64_ASM_PATH             = ENV(GCC48_X64_PREFIX)gcc

+*_GCC48_X64_PP_PATH              = ENV(GCC48_X64_PREFIX)gcc

+*_GCC48_X64_VFRPP_PATH           = ENV(GCC48_X64_PREFIX)gcc

+*_GCC48_X64_ASLCC_PATH           = ENV(GCC48_X64_PREFIX)gcc

+*_GCC48_X64_ASLPP_PATH           = ENV(GCC48_X64_PREFIX)gcc

+*_GCC48_X64_RC_PATH              = ENV(GCC48_X64_PREFIX)objcopy

 *_GCC48_X64_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m64

 *_GCC48_X64_ASLDLINK_FLAGS       = DEF(GCC48_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64

@@ -5125,7 +5104,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS   = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s

 ####################################################################################

 *_GCC49_*_*_FAMILY               = GCC

-*_GCC49_*_MAKE_PATH                    = DEF(GCC49_IA32_PREFIX)make

+*_GCC49_*_MAKE_PATH                    = make

 *_GCC49_*_*_DLL                        = ENV(GCC49_DLL)

 *_GCC49_*_ASL_PATH                     = DEF(UNIX_IASL_BIN)

@@ -5140,17 +5119,17 @@ RELEASE_GCC48_AARCH64_CC_FLAGS   = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s

 ##################

 # GCC49 IA32 definitions

 ##################

-*_GCC49_IA32_OBJCOPY_PATH         = DEF(GCC49_IA32_PREFIX)objcopy

-*_GCC49_IA32_CC_PATH              = DEF(GCC49_IA32_PREFIX)gcc

-*_GCC49_IA32_SLINK_PATH           = DEF(GCC49_IA32_PREFIX)ar

-*_GCC49_IA32_DLINK_PATH           = DEF(GCC49_IA32_PREFIX)gcc

-*_GCC49_IA32_ASLDLINK_PATH        = DEF(GCC49_IA32_PREFIX)gcc

-*_GCC49_IA32_ASM_PATH             = DEF(GCC49_IA32_PREFIX)gcc

-*_GCC49_IA32_PP_PATH              = DEF(GCC49_IA32_PREFIX)gcc

-*_GCC49_IA32_VFRPP_PATH           = DEF(GCC49_IA32_PREFIX)gcc

-*_GCC49_IA32_ASLCC_PATH           = DEF(GCC49_IA32_PREFIX)gcc

-*_GCC49_IA32_ASLPP_PATH           = DEF(GCC49_IA32_PREFIX)gcc

-*_GCC49_IA32_RC_PATH              = DEF(GCC49_IA32_PREFIX)objcopy

+*_GCC49_IA32_OBJCOPY_PATH         = ENV(GCC49_IA32_PREFIX)objcopy

+*_GCC49_IA32_CC_PATH              = ENV(GCC49_IA32_PREFIX)gcc

+*_GCC49_IA32_SLINK_PATH           = ENV(GCC49_IA32_PREFIX)ar

+*_GCC49_IA32_DLINK_PATH           = ENV(GCC49_IA32_PREFIX)gcc

+*_GCC49_IA32_ASLDLINK_PATH        = ENV(GCC49_IA32_PREFIX)gcc

+*_GCC49_IA32_ASM_PATH             = ENV(GCC49_IA32_PREFIX)gcc

+*_GCC49_IA32_PP_PATH              = ENV(GCC49_IA32_PREFIX)gcc

+*_GCC49_IA32_VFRPP_PATH           = ENV(GCC49_IA32_PREFIX)gcc

+*_GCC49_IA32_ASLCC_PATH           = ENV(GCC49_IA32_PREFIX)gcc

+*_GCC49_IA32_ASLPP_PATH           = ENV(GCC49_IA32_PREFIX)gcc

+*_GCC49_IA32_RC_PATH              = ENV(GCC49_IA32_PREFIX)objcopy

 *_GCC49_IA32_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m32

 *_GCC49_IA32_ASLDLINK_FLAGS       = DEF(GCC49_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386

@@ -5168,17 +5147,17 @@ RELEASE_GCC49_IA32_CC_FLAGS       = DEF(GCC49_IA32_CC_FLAGS) -Os -Wno-unused-but

 ##################

 # GCC49 X64 definitions

 ##################

-*_GCC49_X64_OBJCOPY_PATH         = DEF(GCC49_X64_PREFIX)objcopy

-*_GCC49_X64_CC_PATH              = DEF(GCC49_X64_PREFIX)gcc

-*_GCC49_X64_SLINK_PATH           = DEF(GCC49_X64_PREFIX)ar

-*_GCC49_X64_DLINK_PATH           = DEF(GCC49_X64_PREFIX)gcc

-*_GCC49_X64_ASLDLINK_PATH        = DEF(GCC49_X64_PREFIX)gcc

-*_GCC49_X64_ASM_PATH             = DEF(GCC49_X64_PREFIX)gcc

-*_GCC49_X64_PP_PATH              = DEF(GCC49_X64_PREFIX)gcc

-*_GCC49_X64_VFRPP_PATH           = DEF(GCC49_X64_PREFIX)gcc

-*_GCC49_X64_ASLCC_PATH           = DEF(GCC49_X64_PREFIX)gcc

-*_GCC49_X64_ASLPP_PATH           = DEF(GCC49_X64_PREFIX)gcc

-*_GCC49_X64_RC_PATH              = DEF(GCC49_X64_PREFIX)objcopy

+*_GCC49_X64_OBJCOPY_PATH         = ENV(GCC49_X64_PREFIX)objcopy

+*_GCC49_X64_CC_PATH              = ENV(GCC49_X64_PREFIX)gcc

+*_GCC49_X64_SLINK_PATH           = ENV(GCC49_X64_PREFIX)ar

+*_GCC49_X64_DLINK_PATH           = ENV(GCC49_X64_PREFIX)gcc

+*_GCC49_X64_ASLDLINK_PATH        = ENV(GCC49_X64_PREFIX)gcc

+*_GCC49_X64_ASM_PATH             = ENV(GCC49_X64_PREFIX)gcc

+*_GCC49_X64_PP_PATH              = ENV(GCC49_X64_PREFIX)gcc

+*_GCC49_X64_VFRPP_PATH           = ENV(GCC49_X64_PREFIX)gcc

+*_GCC49_X64_ASLCC_PATH           = ENV(GCC49_X64_PREFIX)gcc

+*_GCC49_X64_ASLPP_PATH           = ENV(GCC49_X64_PREFIX)gcc

+*_GCC49_X64_RC_PATH              = ENV(GCC49_X64_PREFIX)objcopy

 *_GCC49_X64_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m64

 *_GCC49_X64_ASLDLINK_FLAGS       = DEF(GCC49_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64

@@ -5268,7 +5247,7 @@ RELEASE_GCC49_AARCH64_DLINK_FLAGS  = DEF(GCC49_AARCH64_DLINK_FLAGS)

 ####################################################################################

 *_GCC5_*_*_FAMILY                = GCC

-*_GCC5_*_MAKE_PATH               = DEF(GCC5_IA32_PREFIX)make

+*_GCC5_*_MAKE_PATH               = make

 *_GCC5_*_*_DLL                   = ENV(GCC5_DLL)

 *_GCC5_*_ASL_PATH                = DEF(UNIX_IASL_BIN)

@@ -5283,17 +5262,17 @@ RELEASE_GCC49_AARCH64_DLINK_FLAGS  = DEF(GCC49_AARCH64_DLINK_FLAGS)

 ##################

 # GCC5 IA32 definitions

 ##################

-*_GCC5_IA32_OBJCOPY_PATH         = DEF(GCC5_IA32_PREFIX)objcopy

-*_GCC5_IA32_CC_PATH              = DEF(GCC5_IA32_PREFIX)gcc

-*_GCC5_IA32_SLINK_PATH           = DEF(GCC5_IA32_PREFIX)gcc-ar

-*_GCC5_IA32_DLINK_PATH           = DEF(GCC5_IA32_PREFIX)gcc

-*_GCC5_IA32_ASLDLINK_PATH        = DEF(GCC5_IA32_PREFIX)gcc

-*_GCC5_IA32_ASM_PATH             = DEF(GCC5_IA32_PREFIX)gcc

-*_GCC5_IA32_PP_PATH              = DEF(GCC5_IA32_PREFIX)gcc

-*_GCC5_IA32_VFRPP_PATH           = DEF(GCC5_IA32_PREFIX)gcc

-*_GCC5_IA32_ASLCC_PATH           = DEF(GCC5_IA32_PREFIX)gcc

-*_GCC5_IA32_ASLPP_PATH           = DEF(GCC5_IA32_PREFIX)gcc

-*_GCC5_IA32_RC_PATH              = DEF(GCC5_IA32_PREFIX)objcopy

+*_GCC5_IA32_OBJCOPY_PATH         = ENV(GCC5_IA32_PREFIX)objcopy

+*_GCC5_IA32_CC_PATH              = ENV(GCC5_IA32_PREFIX)gcc

+*_GCC5_IA32_SLINK_PATH           = ENV(GCC5_IA32_PREFIX)gcc-ar

+*_GCC5_IA32_DLINK_PATH           = ENV(GCC5_IA32_PREFIX)gcc

+*_GCC5_IA32_ASLDLINK_PATH        = ENV(GCC5_IA32_PREFIX)gcc

+*_GCC5_IA32_ASM_PATH             = ENV(GCC5_IA32_PREFIX)gcc

+*_GCC5_IA32_PP_PATH              = ENV(GCC5_IA32_PREFIX)gcc

+*_GCC5_IA32_VFRPP_PATH           = ENV(GCC5_IA32_PREFIX)gcc

+*_GCC5_IA32_ASLCC_PATH           = ENV(GCC5_IA32_PREFIX)gcc

+*_GCC5_IA32_ASLPP_PATH           = ENV(GCC5_IA32_PREFIX)gcc

+*_GCC5_IA32_RC_PATH              = ENV(GCC5_IA32_PREFIX)objcopy

 *_GCC5_IA32_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m32 -fno-lto

 *_GCC5_IA32_ASLDLINK_FLAGS       = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386

@@ -5315,17 +5294,17 @@ RELEASE_GCC5_IA32_DLINK_FLAGS    = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,

 ##################

 # GCC5 X64 definitions

 ##################

-*_GCC5_X64_OBJCOPY_PATH          = DEF(GCC5_X64_PREFIX)objcopy

-*_GCC5_X64_CC_PATH               = DEF(GCC5_X64_PREFIX)gcc

-*_GCC5_X64_SLINK_PATH            = DEF(GCC5_X64_PREFIX)gcc-ar

-*_GCC5_X64_DLINK_PATH            = DEF(GCC5_X64_PREFIX)gcc

-*_GCC5_X64_ASLDLINK_PATH         = DEF(GCC5_X64_PREFIX)gcc

-*_GCC5_X64_ASM_PATH              = DEF(GCC5_X64_PREFIX)gcc

-*_GCC5_X64_PP_PATH               = DEF(GCC5_X64_PREFIX)gcc

-*_GCC5_X64_VFRPP_PATH            = DEF(GCC5_X64_PREFIX)gcc

-*_GCC5_X64_ASLCC_PATH            = DEF(GCC5_X64_PREFIX)gcc

-*_GCC5_X64_ASLPP_PATH            = DEF(GCC5_X64_PREFIX)gcc

-*_GCC5_X64_RC_PATH               = DEF(GCC5_X64_PREFIX)objcopy

+*_GCC5_X64_OBJCOPY_PATH          = ENV(GCC5_X64_PREFIX)objcopy

+*_GCC5_X64_CC_PATH               = ENV(GCC5_X64_PREFIX)gcc

+*_GCC5_X64_SLINK_PATH            = ENV(GCC5_X64_PREFIX)gcc-ar

+*_GCC5_X64_DLINK_PATH            = ENV(GCC5_X64_PREFIX)gcc

+*_GCC5_X64_ASLDLINK_PATH         = ENV(GCC5_X64_PREFIX)gcc

+*_GCC5_X64_ASM_PATH              = ENV(GCC5_X64_PREFIX)gcc

+*_GCC5_X64_PP_PATH               = ENV(GCC5_X64_PREFIX)gcc

+*_GCC5_X64_VFRPP_PATH            = ENV(GCC5_X64_PREFIX)gcc

+*_GCC5_X64_ASLCC_PATH            = ENV(GCC5_X64_PREFIX)gcc

+*_GCC5_X64_ASLPP_PATH            = ENV(GCC5_X64_PREFIX)gcc

+*_GCC5_X64_RC_PATH               = ENV(GCC5_X64_PREFIX)objcopy

 *_GCC5_X64_ASLCC_FLAGS           = DEF(GCC_ASLCC_FLAGS) -m64 -fno-lto

 *_GCC5_X64_ASLDLINK_FLAGS        = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64

-- 

2.9.3