From b99b2e59c2a54a7b0685508121789a243c68ef29 Mon Sep 17 00:00:00 2001 From: Ryan Harkin Date: Fri, 27 Jul 2012 15:37:01 +0100 Subject: [PATCH] BaseTools: removed '-combine' from tools_def.template This option is not supported any more by the latest version of GCC (v4.6). Note from the GCC mailing-list: The -combine option has been removed, it has been very buggy and has been superceeded by -flto. Either drop it, or build with -flto. --- BaseTools/Conf/tools_def.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -4813,8 +4813,8 @@ RELEASE_ARMGCC_ARM_ASM_FLAGS = $(ARCHA *_ARMGCC_ARM_SLINK_FLAGS = -rc *_ARMGCC_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) -Ttext=0x0 --oformat=elf32-littlearm --emit-relocs -nostdlib -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map - DEBUG_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -combine -O0 -RELEASE_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -combine -Wno-unused + DEBUG_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -O0 +RELEASE_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ARMGCC_CC_FLAGS) -Wno-unused #################################################################################### #