1
0
Fork 0
forked from len0rd/rockbox

Switch coldfire builds over to new toolchain using gcc 4.5.2 and binutils 2.20.1

Retune codec compiler optimizations with new compiler. Overall speedup with aac and flac getting big speedups.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29042 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nils Wallménius 2011-01-12 22:28:43 +00:00
parent 4ca7c9c2c6
commit c8535f27d1
11 changed files with 28 additions and 29 deletions

View file

@ -27,7 +27,12 @@ $(DEMACLIB): $(DEMACLIB_OBJ)
$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
DEMACFLAGS = $(filter-out -O%,$(CODECFLAGS)) DEMACFLAGS = $(filter-out -O%,$(CODECFLAGS))
ifeq ($(CPU),coldfire)
DEMACFLAGS += -O2
else
DEMACFLAGS += -O3 DEMACFLAGS += -O3
endif
$(CODECDIR)/ape_free_iram.h: $(CODECDIR)/ape-pre.map $(CODECDIR)/ape_free_iram.h: $(CODECDIR)/ape-pre.map
$(call PRINTS,GEN $(@F))perl -an \ $(call PRINTS,GEN $(@F))perl -an \

View file

@ -22,7 +22,7 @@ ALACFLAGS = $(filter-out -O%,$(CODECFLAGS))
ifeq ($(CPU),arm) ifeq ($(CPU),arm)
ALACFLAGS += -O2 ALACFLAGS += -O2
else else
ALACFLAGS += -O3 ALACFLAGS += -O1
endif endif
$(CODECDIR)/libalac/%.o: $(ROOTDIR)/apps/codecs/libalac/%.c $(CODECDIR)/libalac/%.o: $(ROOTDIR)/apps/codecs/libalac/%.c

View file

@ -16,3 +16,16 @@ OTHER_SRC += $(ATRACLIB_SRC)
$(ATRACLIB): $(ATRACLIB_OBJ) $(ATRACLIB): $(ATRACLIB_OBJ)
$(SILENT)$(shell rm -f $@) $(SILENT)$(shell rm -f $@)
$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
ATRACFLAGS = -I$(APPSDIR)/codecs/libatrac $(filter-out -O%,$(CODECFLAGS))
# not tuned for arm
ifeq ($(CPU),coldfire)
ATRACFLAGS += -O2
else
ATRACFLAGS += -O1
endif
$(CODECDIR)/libatrac/%.o: $(ROOTDIR)/apps/codecs/libatrac/%.c
$(SILENT)mkdir -p $(dir $@)
$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(ATRACFLAGS) -c $< -o $@

View file

@ -20,11 +20,7 @@ $(FAADLIB): $(FAADLIB_OBJ)
# libfaad is faster on ARM with -O2, use -O1 for other CPUs # libfaad is faster on ARM with -O2, use -O1 for other CPUs
FAADFLAGS = -I$(APPSDIR)/codecs/libfaad $(filter-out -O%,$(CODECFLAGS)) FAADFLAGS = -I$(APPSDIR)/codecs/libfaad $(filter-out -O%,$(CODECFLAGS))
ifeq ($(CPU),arm)
FAADFLAGS += -O2 FAADFLAGS += -O2
else
FAADFLAGS += -O1
endif
$(CODECDIR)/libfaad/%.o: $(ROOTDIR)/apps/codecs/libfaad/%.c $(CODECDIR)/libfaad/%.o: $(ROOTDIR)/apps/codecs/libfaad/%.c
$(SILENT)mkdir -p $(dir $@) $(SILENT)mkdir -p $(dir $@)

View file

@ -15,11 +15,7 @@ OTHER_SRC += $(FFMPEGFLACLIB_SRC)
# libffmpegFLAC is faster on ARM-targets with -O2 than -O1 # libffmpegFLAC is faster on ARM-targets with -O2 than -O1
FFMPEGFLACFLAGS = -I$(APPSDIR)/codecs/libffmpegFLAC $(filter-out -O%,$(CODECFLAGS)) FFMPEGFLACFLAGS = -I$(APPSDIR)/codecs/libffmpegFLAC $(filter-out -O%,$(CODECFLAGS))
ifeq ($(CPU),arm)
FFMPEGFLACFLAGS += -O2 FFMPEGFLACFLAGS += -O2
else
FFMPEGFLACFLAGS += -O1
endif
$(FFMPEGFLACLIB): $(FFMPEGFLACLIB_OBJ) $(FFMPEGFLACLIB): $(FFMPEGFLACLIB_OBJ)
$(SILENT)$(shell rm -f $@) $(SILENT)$(shell rm -f $@)

View file

@ -19,11 +19,7 @@ $(MUSEPACKLIB): $(MUSEPACKLIB_OBJ)
# libmusepack is faster on ARM-targets with -O1 than -O2 # libmusepack is faster on ARM-targets with -O1 than -O2
MUSEPACKFLAGS = $(filter-out -O%,$(CODECFLAGS)) -I$(APPSDIR)/codecs/libmusepack MUSEPACKFLAGS = $(filter-out -O%,$(CODECFLAGS)) -I$(APPSDIR)/codecs/libmusepack
ifeq ($(CPU),arm)
MUSEPACKFLAGS += -O1 MUSEPACKFLAGS += -O1
else
MUSEPACKFLAGS += -O2
endif
$(CODECDIR)/libmusepack/%.o: $(ROOTDIR)/apps/codecs/libmusepack/%.c $(CODECDIR)/libmusepack/%.o: $(ROOTDIR)/apps/codecs/libmusepack/%.c
$(SILENT)mkdir -p $(dir $@) $(SILENT)mkdir -p $(dir $@)

View file

@ -18,12 +18,7 @@ $(TTALIB): $(TTALIB_OBJ)
$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
TTAFLAGS = $(filter-out -O%,$(CODECFLAGS)) TTAFLAGS = $(filter-out -O%,$(CODECFLAGS))
ifeq ($(CPU),coldfire)
TTAFLAGS += -O3
else
TTAFLAGS += -O2 TTAFLAGS += -O2
endif
$(CODECDIR)/libtta/%.o: $(ROOTDIR)/apps/codecs/libtta/%.c $(CODECDIR)/libtta/%.o: $(ROOTDIR)/apps/codecs/libtta/%.c
$(SILENT)mkdir -p $(dir $@) $(SILENT)mkdir -p $(dir $@)

View file

@ -18,7 +18,7 @@ WAVPACKFLAGS = -I$(APPSDIR)/codecs/libwavpack $(filter-out -O%,$(CODECFLAGS))
ifeq ($(CPU),arm) ifeq ($(CPU),arm)
WAVPACKFLAGS += -O3 WAVPACKFLAGS += -O3
else else
WAVPACKFLAGS += -O2 WAVPACKFLAGS += -O1
endif endif

View file

@ -21,8 +21,6 @@ WMAFLAGS = -I$(APPSDIR)/codecs/libwma $(filter-out -O%,$(CODECFLAGS))
ifeq ($(MEMORYSIZE),2) ifeq ($(MEMORYSIZE),2)
WMAFLAGS += -Os WMAFLAGS += -Os
else ifeq ($(CPU),coldfire)
WMAFLAGS += -O3
else else
WMAFLAGS += -O2 WMAFLAGS += -O2
endif endif

View file

@ -20,7 +20,7 @@ $(WMAPROLIB): $(WMAPROLIB_OBJ)
WMAPROFLAGS = -I$(APPSDIR)/codecs/libwmapro $(filter-out -O%,$(CODECFLAGS)) WMAPROFLAGS = -I$(APPSDIR)/codecs/libwmapro $(filter-out -O%,$(CODECFLAGS))
ifeq ($(CPU),coldfire) ifeq ($(CPU),coldfire)
WMAPROFLAGS += -O2 WMAPROFLAGS += -O3
else else
WMAPROFLAGS += -O1 WMAPROFLAGS += -O1
endif endif

4
tools/configure vendored
View file

@ -381,10 +381,10 @@ calmrisccc () {
coldfirecc () { coldfirecc () {
prefixtools m68k-elf- prefixtools m68k-elf-
GCCOPTS="$CCOPTS -m5206e -Wa\,-m5249 -malign-int -mstrict-align" GCCOPTS="$CCOPTS -mcpu=5249 -malign-int -mstrict-align"
GCCOPTIMIZE="-fomit-frame-pointer" GCCOPTIMIZE="-fomit-frame-pointer"
endian="big" endian="big"
gccchoice="3.4.6" gccchoice="4.5.2"
} }
arm7tdmicc () { arm7tdmicc () {