when using -O2 instead of -Os, get rid of the two optimizations that are causing...

[openwrt.git] / toolchain / Config.in

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 1a465f5..cf08ae9 100644 (file)
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -13,6 +13,7 @@ menuconfig TOOLCHAINOPTS
 menuconfig EXTRA_TARGET_ARCH
        bool
        prompt "Enable an extra toolchain target architecture" if TOOLCHAINOPTS
+       default y       if powerpc64
        default n
        help
          Some builds may require a 'biarch' toolchain. This option
@@ -22,6 +23,7 @@ menuconfig EXTRA_TARGET_ARCH
 
        config EXTRA_TARGET_ARCH_NAME
                string
+               default "powerpc64"     if powerpc64
                prompt "Extra architecture name" if EXTRA_TARGET_ARCH
                help
                  Specify the cpu name (eg powerpc64 or x86_64) of the
@@ -29,6 +31,7 @@ menuconfig EXTRA_TARGET_ARCH
 
        config EXTRA_TARGET_ARCH_OPTS
                string
+               default "-m64"          if powerpc64
                prompt "Extra architecture compiler options" if EXTRA_TARGET_ARCH
                help
                  If you're specifying an addition target architecture,
@@ -39,10 +42,45 @@ menuconfig EXTRA_TARGET_ARCH
                  both powerpc and powerpc64 binaries, you'll need to
                  specify -m64 here.
 
+comment "Binary tools"
+       depends TOOLCHAINOPTS
+
 source "toolchain/binutils/Config.in"
+
+comment "Compiler"
+       depends TOOLCHAINOPTS
+
 source "toolchain/gcc/Config.in"
+
+comment "C Library"
+       depends TOOLCHAINOPTS
+
+choice
+       prompt "C Library implementation" if TOOLCHAINOPTS
+       default USE_UCLIBC
+       help
+         Select the C library implementation.
+
+       config USE_EGLIBC
+               bool "Use eglibc"
+               depends !avr32
+       
+       config USE_GLIBC
+               bool "Use glibc"
+               depends !avr32
+       
+       config USE_UCLIBC
+               bool "Use uClibc"
+
+endchoice
+
+source "toolchain/eglibc/Config.in"
+source "toolchain/glibc/Config.in"
 source "toolchain/uClibc/Config.in"
 
+comment "Debuggers"
+       depends TOOLCHAINOPTS
+
 config GDB
        bool
        prompt "Build gdb" if TOOLCHAINOPTS
@@ -50,45 +88,40 @@ config GDB
        help
                Enable if you want to build the gdb
 
-config LARGEFILE
+config INSIGHT
        bool
-       prompt "Enable large file (files > 2 GB) support?" if TOOLCHAINOPTS
-       default y
+       prompt "Build insight-gdb" if TOOLCHAINOPTS
+       select GDB
+       default n
        help
-               Enable large file (files > 2 GB) support
+               Enable if you want to build insight-gdb
 
-config SHADOW_PASSWORDS
+config USE_UCLIBC
        bool
-       prompt "Enable shadow password support?" if TOOLCHAINOPTS
-       default y
-       help
-               Enable shadow password support.
+       default y if !TOOLCHAINOPTS
 
-config SOFT_FLOAT
-       bool
-       prompt "Use software floating point by default" if TOOLCHAINOPTS
-       default y
-       depends on (arm || armeb || powerpc) && !HAS_FPU
-       help
-         If your target CPU does not have a Floating Point Unit (FPU) or a
-         kernel FPU emulator, but you still wish to support floating point
-         functions, then everything will need to be compiled with soft floating
-         point support (-msoft-float).
+source "toolchain/gcc/Config.version"
 
-         Most people will answer N.
+source "toolchain/eglibc/Config.version"
+source "toolchain/glibc/Config.version"
+source "toolchain/uClibc/Config.version"
 
-config TARGET_OPTIMIZATION
+config LIBC
        string
-       prompt "Target Optimizations" if TOOLCHAINOPTS
-       default "-O2 -pipe -march=i686 -funit-at-a-time" if TARGET_x86_mediacenter
-       default "-O2 -pipe -march=i486 -funit-at-a-time" if TARGET_x86
-       default "-Os -pipe -march=i486 -funit-at-a-time" if TARGET_rdc
-       default "-Os -pipe -mips32 -mtune=mips32 -funit-at-a-time" if mipsel || mips
-       default "-Os -pipe -march=armv5te -mtune=xscale -funit-at-a-time" if TARGET_ixp4xx || TARGET_iop32x || TARGET_pxa || TARGET_orion
-       default "-Os -pipe -march=armv4t -mtune=arm9tdmi -funit-at-a-time" if TARGET_storm
-       default "-Os -pipe -funit-at-a-time"
-       help
-         Optimizations to use when building for the target host.
+       default "eglibc"  if USE_EGLIBC
+       default "glibc"   if USE_GLIBC
+       default "uClibc"  if USE_UCLIBC
+
+config LIBC_VERSION
+       string
+       default EGLIBC_VERSION  if USE_EGLIBC
+       default GLIBC_VERSION   if USE_GLIBC
+       default UCLIBC_VERSION  if USE_UCLIBC
+
+config TARGET_SUFFIX
+       string
+       default "gnueabi"         if (USE_EGLIBC || USE_GLIBC) && EABI_SUPPORT
+       default "gnu"             if (USE_EGLIBC || USE_GLIBC) && !EABI_SUPPORT
+       default "uclibcgnueabi"   if USE_UCLIBC && EABI_SUPPORT
+       default "uclibc"          if USE_UCLIBC && !EABI_SUPPORT
 
-source "toolchain/gcc/Config.version"
-source "toolchain/uClibc/Config.version"