--- a/BaseTools/Conf/tools_def.template	2016-04-18 10:18:14.000000000 +0200

+++ b/BaseTools/Conf/tools_def.template	2016-07-08 13:48:01.394134576 +0200

@@ -179,24 +179,6 @@

 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 UNIX_IASL_BIN           = ENV(IASL_PREFIX)iasl

 DEFINE WIN_ASL_BIN_DIR         = C:\ASL

 DEFINE WIN_IASL_BIN            = DEF(WIN_ASL_BIN_DIR)\iasl.exe

@@ -4546,7 +4528,7 @@

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

 *_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)

@@ -4561,17 +4543,17 @@

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

 # 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)ld

-*_GCC44_IA32_ASLDLINK_PATH        = DEF(GCC44_IA32_PREFIX)ld

-*_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)ld

+*_GCC44_IA32_ASLDLINK_PATH        = ENV(GCC44_IA32_PREFIX)ld

+*_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) -m elf_i386

@@ -4586,17 +4568,17 @@

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

 # 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)ld

-*_GCC44_X64_ASLDLINK_PATH        = DEF(GCC44_X64_PREFIX)ld

-*_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)ld

+*_GCC44_X64_ASLDLINK_PATH        = ENV(GCC44_X64_PREFIX)ld

+*_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) -m elf_x86_64

@@ -4616,7 +4598,7 @@

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

 *_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)

@@ -4631,17 +4613,17 @@

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

 # 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)ld

-*_GCC45_IA32_ASLDLINK_PATH        = DEF(GCC45_IA32_PREFIX)ld

-*_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)ld

+*_GCC45_IA32_ASLDLINK_PATH        = ENV(GCC45_IA32_PREFIX)ld

+*_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) -m elf_i386

@@ -4656,17 +4638,17 @@

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

 # 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)ld

-*_GCC45_X64_ASLDLINK_PATH        = DEF(GCC45_X64_PREFIX)ld

-*_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)ld

+*_GCC45_X64_ASLDLINK_PATH        = ENV(GCC45_X64_PREFIX)ld

+*_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) -m elf_x86_64

@@ -4686,7 +4668,7 @@

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

 *_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)

@@ -4701,17 +4683,17 @@

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

 # 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)ld

-*_GCC46_IA32_ASLDLINK_PATH        = DEF(GCC46_IA32_PREFIX)ld

-*_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)ld

+*_GCC46_IA32_ASLDLINK_PATH        = ENV(GCC46_IA32_PREFIX)ld

+*_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) -m elf_i386

@@ -4728,17 +4710,17 @@

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

 # 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)ld

-*_GCC46_X64_ASLDLINK_PATH        = DEF(GCC46_X64_PREFIX)ld

-*_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)ld

+*_GCC46_X64_ASLDLINK_PATH        = ENV(GCC46_X64_PREFIX)ld

+*_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) -m elf_x86_64

@@ -4791,7 +4773,7 @@

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

 *_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)

@@ -4806,17 +4788,17 @@

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

 # 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)ld

-*_GCC47_IA32_ASLDLINK_PATH        = DEF(GCC47_IA32_PREFIX)ld

-*_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)ld

+*_GCC47_IA32_ASLDLINK_PATH        = ENV(GCC47_IA32_PREFIX)ld

+*_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) -m elf_i386

@@ -4833,17 +4815,17 @@

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

 # 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)ld

-*_GCC47_X64_ASLDLINK_PATH        = DEF(GCC47_X64_PREFIX)ld

-*_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)ld

+*_GCC47_X64_ASLDLINK_PATH        = ENV(GCC47_X64_PREFIX)ld

+*_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) -m elf_x86_64

@@ -4923,7 +4905,7 @@

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

 *_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)

@@ -4938,17 +4920,17 @@

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

 # 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)ld

-*_GCC48_IA32_ASLDLINK_PATH        = DEF(GCC48_IA32_PREFIX)ld

-*_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)ld

+*_GCC48_IA32_ASLDLINK_PATH        = ENV(GCC48_IA32_PREFIX)ld

+*_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) -m elf_i386

@@ -4965,17 +4947,17 @@

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

 # 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)ld

-*_GCC48_X64_ASLDLINK_PATH        = DEF(GCC48_X64_PREFIX)ld

-*_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)ld

+*_GCC48_X64_ASLDLINK_PATH        = ENV(GCC48_X64_PREFIX)ld

+*_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) -m elf_x86_64

@@ -5055,7 +5037,7 @@

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

 *_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)

@@ -5070,17 +5052,17 @@

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

 # 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)ld

-*_GCC49_IA32_ASLDLINK_PATH        = DEF(GCC49_IA32_PREFIX)ld

-*_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)ld

+*_GCC49_IA32_ASLDLINK_PATH        = ENV(GCC49_IA32_PREFIX)ld

+*_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) -m elf_i386

@@ -5097,17 +5079,17 @@

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

 # 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)ld

-*_GCC49_X64_ASLDLINK_PATH        = DEF(GCC49_X64_PREFIX)ld

-*_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)ld

+*_GCC49_X64_ASLDLINK_PATH        = ENV(GCC49_X64_PREFIX)ld

+*_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) -m elf_x86_64