1 files changed, 4 insertions, 16 deletions

diff --git a/tools/configure b/tools/configure
index 2b34ed4cff..11c8513c92 100755
--- a/tools/configure
+++ b/tools/configure
@@ -8,7 +8,7 @@
 #
 
 # global CC options for all platforms
-CCOPTS="-W -Wall -Wundef -O -nostdlib -ffreestanding -Wstrict-prototypes -pipe -std=gnu99"
+CCOPTS="-W -Wall -Wextra -Wundef -Os -nostdlib -ffreestanding -Wstrict-prototypes -pipe -std=gnu99 -funit-at-a-time"
 
 # LD options for the core
 LDOPTS=""
@@ -136,7 +136,7 @@ app_set_lcd_size () {
 
 findarmgcc() {
   prefixtools arm-elf-eabi-
-  gccchoice="4.4.4"
+  gccchoice="4.9.4"
 }
 
 # scan the $PATH for the given command
@@ -502,6 +502,7 @@ calmrisccc () {
  GCCOPTS="-Wl\,--no-check-sections $CCOPTS"
  GCCOPTIMIZE="-fomit-frame-pointer"
  endian="big"
+ gccchoice="4.9.4"
 }
 
 coldfirecc () {
@@ -509,7 +510,7 @@ coldfirecc () {
  GCCOPTS="$CCOPTS -mcpu=5249 -malign-int -mstrict-align"
  GCCOPTIMIZE="-fomit-frame-pointer"
  endian="big"
- gccchoice="4.5.2"
+ gccchoice="4.9.4"
 }
 
 arm7tdmicc () {
@@ -2588,7 +2589,6 @@ fi
     sysfont="08-Rockfont"
     if [ "$ARG_ARM_THUMB" != 0 ]; then ARG_ARM_THUMB=1; fi
     arm9tdmicc
-    GCCOPTS=`echo $GCCOPTS | sed 's/ -O / -Os /'`
     ;;
 
 
@@ -2631,7 +2631,6 @@ fi
     sysfont="08-Rockfont"
     if [ "$ARG_ARM_THUMB" != 0 ]; then ARG_ARM_THUMB=1; fi
     arm9tdmicc
-    GCCOPTS=`echo $GCCOPTS | sed 's/ -O / -Os /'`
     ;;
 
 
@@ -2676,7 +2675,6 @@ fi
     t_model="sansa-c200v2"
     if [ "$ARG_ARM_THUMB" != 0 ]; then ARG_ARM_THUMB=1; fi
     arm9tdmicc
-    GCCOPTS=`echo $GCCOPTS | sed 's/ -O / -Os /'`
     ;;
 
    60|sansaclipv2)
@@ -4519,16 +4517,6 @@ echo "Using $LD $ldver"
 makever=`make --version | head -1`
 echo "Detected make $makever"
 
-if test "$CC" = "m68k-elf-gcc"; then
-  # convert -O to -Os to get smaller binaries!
-  GCCOPTS=`echo $GCCOPTS | sed 's/ -O / -Os /'`
-fi
-if test "$CC" = "mipsel-elf-gcc"; then
-  # convert -O to -Os to get smaller binaries!
-  GCCOPTS=`echo $GCCOPTS | sed 's/ -O / -Os /'`
-fi
-
-
 if [ "$ARG_CCACHE" = "1" ]; then
   echo "Enable ccache for building"
   ccache="ccache"