2 files changed, 2 insertions, 8 deletions

diff --git a/tools/configure b/tools/configure
index 4059a95a68..08d07b7797 100755
--- a/tools/configure
+++ b/tools/configure
@@ -3707,12 +3707,6 @@ if test "$CC" = "sh-elf-gcc"; then
       echo "WARNING: You use an unpatched gcc compiler: $gccver"
       echo "WARNING: http://www.rockbox.org/twiki/bin/view/Main/CrossCompiler"
     fi
-
-    if test "$gccnum" -ge "406"; then
-        echo "Enabling link-time optimization"
-        GCCOPTS="$GCCOPTS -flto"
-    fi
-
   fi
 fi
 
diff --git a/tools/rockboxdev.sh b/tools/rockboxdev.sh
index 78641b5b23..996aa86aea 100755
--- a/tools/rockboxdev.sh
+++ b/tools/rockboxdev.sh
@@ -361,8 +361,8 @@ do
             # default rule for Objective C. Disable the builtin make rules. See
             # http://sourceware.org/ml/binutils/2005-12/msg00259.html
             export MAKEFLAGS="-r $MAKEFLAGS"
-            build "binutils" "sh-elf" "2.22" "" "--disable-werror"
-            build "gcc" "sh-elf" "4.6.3" "" "" "gmp mpfr mpc"
+            build "binutils" "sh-elf" "2.16.1" "" "--disable-werror"
+            build "gcc" "sh-elf" "4.0.3" "gcc-4.0.3-rockbox-1.diff"
             ;;
 
         [Ii])