Index: tools/rockboxdev.sh
===================================================================
--- tools/rockboxdev.sh	(revision 24112)
+++ tools/rockboxdev.sh	(arbetskopia)
@@ -166,22 +166,9 @@
     ;;
   [Mm])
     target="m68k-elf"
-    gccver="3.4.6"
-    case $system in
-      CYGWIN* | Darwin | FreeBSD | Interix)
-        gccpatch="gcc-3.4.6.patch"
-        ;;
-      Linux)
-        machine=`uname -m`
-        case $machine in
-          x86_64)
-            gccpatch="gcc-3.4.6-amd64.patch"
-            ;;
-        esac
-        ;;
-      *)
-        ;;
-    esac
+    gccver="4.4.2"
+    gccconfigure="--disable-libssp --with-arch=cf --with-cpu=5249"
+    binutils="2.20"
     ;;
   [Aa])
     target="arm-elf"
Index: tools/configure
===================================================================
--- tools/configure	(revision 24112)
+++ tools/configure	(arbetskopia)
@@ -244,10 +244,10 @@
 
 coldfirecc () {
  prefixtools m68k-elf-
- GCCOPTS="$CCOPTS -m5206e -Wa\,-m5249 -malign-int -mstrict-align"
+ GCCOPTS="$CCOPTS -cpu=5249 -malign-int -mstrict-align"
  GCCOPTIMIZE="-fomit-frame-pointer"
  endian="big"
- gccchoice="3.4.6"
+ gccchoice="4.4.2"
 }
 
 arm7tdmicc () {
Index: apps/codecs/libffmpegFLAC/shndec.c
===================================================================
--- apps/codecs/libffmpegFLAC/shndec.c	(revision 24112)
+++ 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 24112)
+++ apps/codecs/libffmpegFLAC/libffmpegFLAC.make	(arbetskopia)
@@ -16,3 +16,11 @@
 $(FFMPEGFLACLIB): $(FFMPEGFLACLIB_OBJ)
 	$(SILENT)$(shell rm -f $@)
 	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
+
+FFMPEGFLACFLAGS = $(filter-out -O%,$(CODECFLAGS))
+FFMPEGFLACFLAGS += -O2
+
+$(CODECDIR)/libffmpegFLAC/%.o: $(ROOTDIR)/apps/codecs/libffmpegFLAC/%.c
+	$(SILENT)mkdir -p $(dir $@)
+	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(FFMPEGFLACFLAGS) -c $< -o $@
+
Index: apps/codecs/libmad/libmad.make
===================================================================
--- apps/codecs/libmad/libmad.make	(revision 24112)
+++ apps/codecs/libmad/libmad.make	(arbetskopia)
@@ -11,7 +11,7 @@
 # (one for codec, one for mpegplayer)
 # so a little trickery is necessary
 
-MADFLAGS = $(CODECFLAGS) -UDEBUG -DNDEBUG -O2 -I$(APPSDIR)/codecs/libmad
+MADFLAGS = $(CODECFLAGS) -UDEBUG -DNDEBUG -O -I$(APPSDIR)/codecs/libmad
 MPEGMADFLAGS = $(MADFLAGS) -DMPEGPLAYER
 
 # libmad
Index: apps/codecs/libtremor/libtremor.make
===================================================================
--- apps/codecs/libtremor/libtremor.make	(revision 24112)
+++ apps/codecs/libtremor/libtremor.make	(arbetskopia)
@@ -24,14 +24,8 @@
 		$(CODECFLAGS) $(CFLAGS) -c $< -o $@
 
 TREMORFLAGS = -I$(APPSDIR)/codecs/libtremor $(filter-out -O%,$(CODECFLAGS)) 
+TREMORFLAGS += -O2
 
-# 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 $@)
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(TREMORFLAGS) -c $< -o $@