Index: apps/codecs/libtta/libtta.make
===================================================================
--- apps/codecs/libtta/libtta.make	(revision 27255)
+++ apps/codecs/libtta/libtta.make	(arbetskopia)
@@ -17,8 +17,8 @@
 	$(SILENT)$(shell rm -f $@)
 	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
 
-TTAFLAGS = $(filter-out -O%,$(CODECFLAGS))
-TTAFLAGS += -O3 -funroll-loops
+TTAFLAGS = $(CODECFLAGS)
+TTAFLAGS += -funroll-loops
 
 $(CODECDIR)/libtta/%.o: $(ROOTDIR)/apps/codecs/libtta/%.c
 	$(SILENT)mkdir -p $(dir $@)
Index: apps/codecs/libffmpegFLAC/shndec.c
===================================================================
--- apps/codecs/libffmpegFLAC/shndec.c	(revision 27237)
+++ apps/codecs/libffmpegFLAC/shndec.c	(arbetskopia)
@@ -91,7 +91,7 @@
     for (i = 0; i < n; i++)
         samples[i] =<< shift;
 */
-    asm volatile (
+    asm(
             "move.l %[n], %%d0              \n" /* d0 = loop counter */
             "asr.l  #2, %%d0                \n"
             "beq l1_shift                   \n"
Index: apps/codecs/libffmpegFLAC/libffmpegFLAC.make
===================================================================
--- apps/codecs/libffmpegFLAC/libffmpegFLAC.make	(revision 27237)
+++ apps/codecs/libffmpegFLAC/libffmpegFLAC.make	(arbetskopia)
@@ -14,12 +14,7 @@
 OTHER_SRC += $(FFMPEGFLACLIB_SRC)
 
 # libffmpegFLAC is faster on ARM-targets with -O2 than -O1
-FFMPEGFLACFLAGS = -I$(APPSDIR)/codecs/libffmpegFLAC $(filter-out -O%,$(CODECFLAGS))
-ifeq ($(CPU),arm)
-   FFMPEGFLACFLAGS += -O2
-else
-   FFMPEGFLACFLAGS += -O1
-endif
+FFMPEGFLACFLAGS = -I$(APPSDIR)/codecs/libffmpegFLAC $(CODECFLAGS)
 
 $(FFMPEGFLACLIB): $(FFMPEGFLACLIB_OBJ)
 	$(SILENT)$(shell rm -f $@)
Index: apps/codecs/libmad/libmad.make
===================================================================
--- apps/codecs/libmad/libmad.make	(revision 27237)
+++ apps/codecs/libmad/libmad.make	(arbetskopia)
@@ -12,15 +12,10 @@
 # so a little trickery is necessary
 
 # Extract optimization level ('-O') from compile flags. Will be set later.
-MADFLAGS = $(filter-out -O%,$(CODECFLAGS)) -I$(APPSDIR)/codecs/libmad
+MADFLAGS = $(CODECFLAGS) -I$(APPSDIR)/codecs/libmad
 MADFLAGS += -UDEBUG -DNDEBUG -DHAVE_LIMITS_H
 
 # libmad is faster on ARM-targets with -O1 than -O2
-ifeq ($(CPU),arm)
-   MADFLAGS += -O1
-else
-   MADFLAGS += -O2
-endif
 
 # MPEGplayer
 MPEGMADFLAGS = $(MADFLAGS) -DMPEGPLAYER
Index: apps/codecs/libmusepack/libmusepack.make
===================================================================
--- apps/codecs/libmusepack/libmusepack.make	(revision 27237)
+++ apps/codecs/libmusepack/libmusepack.make	(arbetskopia)
@@ -18,12 +18,7 @@
 	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
 
 # libmusepack is faster on ARM-targets with -O1 than -O2
-MUSEPACKFLAGS = $(filter-out -O%,$(CODECFLAGS)) -I$(APPSDIR)/codecs/libmusepack
-ifeq ($(CPU),arm)
-   MUSEPACKFLAGS += -O1
-else
-   MUSEPACKFLAGS += -O2
-endif
+MUSEPACKFLAGS = $(CODECFLAGS) -I$(APPSDIR)/codecs/libmusepack
 
 $(CODECDIR)/libmusepack/%.o: $(ROOTDIR)/apps/codecs/libmusepack/%.c
 	$(SILENT)mkdir -p $(dir $@)
Index: apps/codecs/libpcm/libpcm.make
===================================================================
--- apps/codecs/libpcm/libpcm.make	(revision 27237)
+++ apps/codecs/libpcm/libpcm.make	(arbetskopia)
@@ -17,8 +17,7 @@
 	$(SILENT)$(shell rm -f $@)
 	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
 
-PCMSFLAGS = $(filter-out -O%,$(CODECFLAGS))
-PCMSFLAGS += -O1
+PCMSFLAGS = $(CODECFLAGS)
 
 $(CODECDIR)/libpcm/%.o: $(ROOTDIR)/apps/codecs/libpcm/%.c
 	$(SILENT)mkdir -p $(dir $@)
Index: apps/codecs/codecs.make
===================================================================
--- apps/codecs/codecs.make	(revision 27237)
+++ apps/codecs/codecs.make	(arbetskopia)
@@ -44,7 +44,7 @@
 include $(APPSDIR)/codecs/libtta/libtta.make
 
 # compile flags for codecs
-CODECFLAGS = $(CFLAGS) -fstrict-aliasing -I$(APPSDIR)/codecs \
+CODECFLAGS = $(CFLAGS) -O3 -fstrict-aliasing -I$(APPSDIR)/codecs \
 	-I$(APPSDIR)/codecs/lib -DCODEC
 
 ifndef SIMVER
Index: apps/codecs/libwavpack/libwavpack.make
===================================================================
--- apps/codecs/libwavpack/libwavpack.make	(revision 27237)
+++ apps/codecs/libwavpack/libwavpack.make	(arbetskopia)
@@ -13,9 +13,9 @@
 WAVPACKLIB_OBJ := $(call c2obj, $(WAVPACKLIB_SRC))
 OTHER_SRC += $(WAVPACKLIB_SRC)
 
-WAVPACKFLAGS = -I$(APPSDIR)/codecs/libwavpack $(filter-out -O%,$(CODECFLAGS)) 
-WAVPACKFLAGS += -O2
+WAVPACKFLAGS = -I$(APPSDIR)/codecs/libwavpack $(CODECFLAGS)
 
+
 $(WAVPACKLIB): $(WAVPACKLIB_OBJ)
 	$(SILENT)$(shell rm -f $@)
 	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
Index: apps/codecs/SOURCES
===================================================================
--- apps/codecs/SOURCES	(revision 27237)
+++ apps/codecs/SOURCES	(arbetskopia)
@@ -18,7 +18,7 @@
 wma.c
 sid.c
 ape.c
-nsf.c
+//nsf.c
 asap.c
 aac.c
 spc.c
Index: apps/codecs/libalac/libalac.make
===================================================================
--- apps/codecs/libalac/libalac.make	(revision 27237)
+++ apps/codecs/libalac/libalac.make	(arbetskopia)
@@ -17,8 +17,7 @@
 	$(SILENT)$(shell rm -f $@)
 	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
 
-ALACFLAGS = $(filter-out -O%,$(CODECFLAGS))
-ALACFLAGS += -O3
+ALACFLAGS = $(CODECFLAGS)
 
 $(CODECDIR)/libalac/%.o: $(ROOTDIR)/apps/codecs/libalac/%.c
 	$(SILENT)mkdir -p $(dir $@)
Index: apps/codecs/libtremor/libtremor.make
===================================================================
--- apps/codecs/libtremor/libtremor.make	(revision 27237)
+++ apps/codecs/libtremor/libtremor.make	(arbetskopia)
@@ -17,14 +17,8 @@
 	$(SILENT)$(shell rm -f $@)
 	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
 
-TREMORFLAGS = -I$(APPSDIR)/codecs/libtremor $(filter-out -O%,$(CODECFLAGS)) 
+TREMORFLAGS = -I$(APPSDIR)/codecs/libtremor $(CODECFLAGS) 
 
-# Tremor is slightly faster on coldfire with -O3
-ifeq ($(CPU),coldfire)
-    TREMORFLAGS += -O3
-else
-    TREMORFLAGS += -O2
-endif
 
 $(CODECDIR)/libtremor/%.o: $(ROOTDIR)/apps/codecs/libtremor/%.c
 	$(SILENT)mkdir -p $(dir $@)
Index: apps/codecs/librm/librm.make
===================================================================
--- apps/codecs/librm/librm.make	(revision 27237)
+++ apps/codecs/librm/librm.make	(arbetskopia)
@@ -17,8 +17,7 @@
 	$(SILENT)$(shell rm -f $@)
 	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
 
-RMFLAGS = $(filter-out -O%,$(CODECFLAGS))
-RMFLAGS += -O3
+RMFLAGS = $(CODECFLAGS)
 
 $(CODECDIR)/librm/%.o: $(ROOTDIR)/apps/codecs/librm/%.c
 	$(SILENT)mkdir -p $(dir $@)
Index: apps/codecs/libm4a/libm4a.make
===================================================================
--- apps/codecs/libm4a/libm4a.make	(revision 27237)
+++ apps/codecs/libm4a/libm4a.make	(arbetskopia)
@@ -17,8 +17,7 @@
 	$(SILENT)$(shell rm -f $@)
 	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
 
-M4AFLAGS = $(filter-out -O%,$(CODECFLAGS))
-M4AFLAGS += -O3
+M4AFLAGS = $(CODECFLAGS)
 
 $(CODECDIR)/libm4a/%.o: $(ROOTDIR)/apps/codecs/libm4a/%.c
 	$(SILENT)mkdir -p $(dir $@)
Index: apps/codecs/demac/libdemac.make
===================================================================
--- apps/codecs/demac/libdemac.make	(revision 27237)
+++ apps/codecs/demac/libdemac.make	(arbetskopia)
@@ -26,8 +26,7 @@
 	$(SILENT)$(shell rm -f $@)
 	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
 
-DEMACFLAGS = $(filter-out -O%,$(CODECFLAGS))
-DEMACFLAGS += -O3
+DEMACFLAGS = $(CODECFLAGS)
 
 $(CODECDIR)/ape_free_iram.h: $(CODECDIR)/ape-pre.map
 	$(call PRINTS,GEN $(@F))perl -an \
Index: apps/codecs/libspeex/libspeex.make
===================================================================
--- apps/codecs/libspeex/libspeex.make	(revision 27237)
+++ apps/codecs/libspeex/libspeex.make	(arbetskopia)
@@ -13,17 +13,10 @@
 
 # disable strict aliasing optimizations for now, it gives warnings due to
 # some horrid typecasting
-SPEEXFLAGS = $(filter-out -O%, $(filter-out -fstrict-aliasing, $(CODECFLAGS))) \
+SPEEXFLAGS = $(filter-out -fstrict-aliasing, $(CODECFLAGS)) \
 		-fno-strict-aliasing -DHAVE_CONFIG_H -DSPEEX_DISABLE_ENCODER \
 		-I$(APPSDIR)/codecs/libspeex
 
-# libspeex is faster on ARM-targets with -O1 instead of -O2
-ifeq ($(CPU),arm)
-   SPEEXFLAGS += -O1
-else
-   SPEEXFLAGS += -O2
-endif
-
 VOICESPEEXFLAGS = $(filter-out -ffunction-sections, $(filter-out -DCODEC,$(SPEEXFLAGS))) -DROCKBOX_VOICE_CODEC
 
 # libspeex
Index: apps/codecs/libasap/libasap.make
===================================================================
--- apps/codecs/libasap/libasap.make	(revision 27237)
+++ apps/codecs/libasap/libasap.make	(arbetskopia)
@@ -17,8 +17,7 @@
 	$(SILENT)$(shell rm -f $@)
 	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
 
-ASAPFLAGS = $(filter-out -O%,$(CODECFLAGS))
-ASAPFLAGS += -O1
+ASAPFLAGS = $(CODECFLAGS)
 
 $(CODECDIR)/libasap/%.o: $(ROOTDIR)/apps/codecs/libasap/%.c
 	$(SILENT)mkdir -p $(dir $@)
Index: apps/codecs/libspc/libspc.make
===================================================================
--- apps/codecs/libspc/libspc.make	(revision 27237)
+++ apps/codecs/libspc/libspc.make	(arbetskopia)
@@ -17,8 +17,7 @@
 	$(SILENT)$(shell rm -f $@)
 	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
 
-SPCFLAGS = $(filter-out -O%,$(CODECFLAGS)) -fno-strict-aliasing
-SPCFLAGS += -O1
+SPCFLAGS = $(CODECFLAGS) -fno-strict-aliasing
 
 $(CODECDIR)/libspc/%.o: $(ROOTDIR)/apps/codecs/libspc/%.c
 	$(SILENT)mkdir -p $(dir $@)