# HG changeset patch # User mikek # Date 1278337798 -3600 # Node ID af1ed19cc0e44893d3053ec436a8014c9257a655 # Parent e69da846291659aea46c74688448ef6e03348699 1) Fix for Bug 3166 - [GCCE] -symdefs GCCE linker option is obselete in bootstrap.mk 2) Fix for Bug 3165 - [GCCE] assembler include path is incomplete for GCCE in bootstrap.mk diff -r e69da8462916 -r af1ed19cc0e4 toolsandutils/buildsystem/extension/base/bootstrap.mk --- a/toolsandutils/buildsystem/extension/base/bootstrap.mk Thu Jul 01 13:49:10 2010 +0100 +++ b/toolsandutils/buildsystem/extension/base/bootstrap.mk Mon Jul 05 14:49:58 2010 +0100 @@ -104,6 +104,7 @@ ifdef GCCE TOOLVER := GCCE +ASMINCPATH := . $(EPOCBLDABS) $(ASMINCPATH) $(EXTENSION_ROOT) $(EPOCCPUINC) ifeq (linux,$(HOST_PLATFORM)) EXE_SUFFIX := else @@ -283,8 +284,7 @@ ASMINCPATHCMD := $(foreach dir,$(ASMINCPATH),$(join -I ,$(dir))) ASM_MACRO_CMD := $(foreach macro,$(ASM_MACROS),--defsym $(macro)=1 ) AFLAGS := -g --keep-locals $(ASM_MACRO_CMD) $(ASMINCPATHCMD) - LFLAGS := --Ttext $(LINKBASE) --entry $(LINKBASE) --print-map - SYMOPT := -symdefs + LFLAGS := -Ttext $(LINKBASE) --entry $(LINKBASE) --print-map ASMTYP := AS PROCESS_INCLUDES := 1 ifndef LINKFILE @@ -297,7 +297,7 @@ define do_link $(call ifexistf,$(join $(basename $@),.lnk),$(ERASE) $(call slash2generic,$(join $(basename $@),.lnk)) ) $(COPY) $(call normalise_path,$(filter %.lnk,$^)) $(join $(basename $@),.lnk) - $(LINK) $(LFLAGS) $(SYMOPT)=$(join $(basename $@),.sym) -o $@ $(filter %.$(OBJEXT),$^) + $(LINK) $(LFLAGS) -o $@ $(filter %.$(OBJEXT),$^) $(COPY) $@ $(join $(basename $(TRG)),.sym) endef define do_strip