2 files changed, 17 insertions, 0 deletions

diff --git a/Makefile.test b/Makefile.test
index 11fec40..209eef3 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -65,41 +65,47 @@ oldconfig :
 randconfig :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf -r ./config.in
  
 allyesconfig :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf -y ./config.in
  
 allnoconfig :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf -n ./config.in
  
 defconfig :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf -d ./config.in
 
 
 export
 
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
 
 export include-config := 1
 
 -include $(TOPDIR)/.config
 -include $(TOPDIR)/.depends
 
 endif
 
 -include $(TOPDIR)/..config.cmd
 
 export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
 
+ifdef CONFIG_OPTIMIZATIONS
+export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
+export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
+$(warning CFLAGS_RELEASE is $(CFLAGS_RELEASE))
+endif
+
 all clean: $(subdir-y)
 
 $(subdir-y) : $(if $(CONFIG_LIBQPE),$(TOPDIR)/stamp-headers) \
         $(if $(CONFIG_LIBQPE-X11),$(TOPDIR)/stamp-headers-x11) \
         $(TOPDIR)/library/custom.h
 
 clean : $(TOPDIR)/.config
 
 include $(TOPDIR)/Rules.make
diff --git a/config.in.in b/config.in.in
index 7af1f17..679292f 100644
--- a/config.in.in
+++ b/config.in.in
@@ -5,58 +5,69 @@ menu "Build Parameters"
 # prompt "Build Processor family"
 #  default BUILD_X86
 #  help
 #    Please select the architecture of the machine you will be
 #    building the OpenZaurus buildroot on.
 #
 #  config BUILD_X86
 #    boolean "X86 Architecture"
 #
 #endchoice
 
 choice
   prompt "Target Machine"
   default TARGET_X86
   help
     Please select the architecture of the machine you will be
     building the OpenZaurus buildroot for.
 
   config TARGET_X86
     boolean "Intel X86"
 
   config TARGET_SHARP
     boolean "Sharp Zaurus SL-5x00 - stock"
 
 #  config TARGET_OZ
 #    boolean "Sharp Zaurus SL-5x00 - OpenZaurus"
 
   config TARGET_IPAQ
     boolean "Ipaq"
 
 endchoice
 
+config OPTIMIZE
+  boolean "Use optimizations"
+  default "y" if ! TARGET_X86
+
 config SPECFILE
   string
   default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
   default "linux-g++" if TARGET_X86 && X11
   default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11)
   default "linux-g++" if TARGET_SHARP && X11
 #  default "linux-oz-g++" if TARGET_OZ
   default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11)
   default "linux-g++" if TARGET_IPAQ && X11
 
 config CUSTOMFILE
   string
   default "custom-ipaq.h" if TARGET_IPAQ
   default "custom-sharp.h" if TARGET_SHARP
   
+
+config OPTIMIZATIONS
+  string "Optimization flags"
+  depends OPTIMIZE
+  default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ
+  default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP
+
 #config CROSS
 #  string "Crosscompilation prefix"
 #  default "arm-linux-"
 #  help
 #    Crosscompilation prefix is the prefix which will be prepended
 #    to all compilation commands. For example, a crosscompilation prefix
 #    of arm-linux-, results in the build calling arm-linux-gcc as its CC.
 
 endmenu
 
 @sources@