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 d376c14..cf08ae9 100644 (file)
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -1,45 +1,127 @@
 #
 #

+config NATIVE_TOOLCHAIN
+       bool
+       prompt "Use host's toolchain" if DEVEL && BROKEN
+       default n
+       help
+               If enabled, OpenWrt will compile using your existing toolchain instead of compiling one

 
 menuconfig TOOLCHAINOPTS
        bool "Toolchain Options" if DEVEL
 
 menuconfig TOOLCHAINOPTS
        bool "Toolchain Options" if DEVEL

+       depends !NATIVE_TOOLCHAIN
+
+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
+         allows you to specify an additional target arch.
+
+         Most people will answer N here.
+
+       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
+                 additional target architecture.
+
+       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,
+                 you'll probably need to also provide options to make
+                 the compiler use this alternate arch.
+
+                 For example, if you're building a compiler that can build
+                 both powerpc and powerpc64 binaries, you'll need to
+                 specify -m64 here.
+
+comment "Binary tools"
+       depends TOOLCHAINOPTS

 
 source "toolchain/binutils/Config.in"
 
 source "toolchain/binutils/Config.in"

+
+comment "Compiler"
+       depends TOOLCHAINOPTS
+

 source "toolchain/gcc/Config.in"
 
 source "toolchain/gcc/Config.in"
 

-config ENABLE_MULTILIB
-       bool
-       prompt "Enable multilib support?" if TOOLCHAINOPTS
-       default n
+comment "C Library"
+       depends TOOLCHAINOPTS
+
+choice
+       prompt "C Library implementation" if TOOLCHAINOPTS
+       default USE_UCLIBC

        help
        help

-           If you want multilib enabled, enable this...
+         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

 
 

-config LARGEFILE
+source "toolchain/eglibc/Config.in"
+source "toolchain/glibc/Config.in"
+source "toolchain/uClibc/Config.in"
+
+comment "Debuggers"
+       depends TOOLCHAINOPTS
+
+config GDB

        bool
        bool

-       prompt "Enable large file (files > 2 GB) support?" if TOOLCHAINOPTS
-       depends on !cris
-       default y
+       prompt "Build gdb" if TOOLCHAINOPTS
+       default n

        help
        help

-           Enable large file (files > 2 GB) support
+               Enable if you want to build the gdb

 
 

-config SOFT_FLOAT
+config INSIGHT

        bool
        bool

-       prompt "Use software floating point by default" if TOOLCHAINOPTS
+       prompt "Build insight-gdb" if TOOLCHAINOPTS
+       select GDB

        default n
        default n

-       depends on arm || mips || powerpc

        help
        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).
+               Enable if you want to build insight-gdb

 
 

-         Most people will answer N.
+config USE_UCLIBC
+       bool
+       default y if !TOOLCHAINOPTS

 
 

-config TARGET_OPTIMIZATION
+source "toolchain/gcc/Config.version"
+
+source "toolchain/eglibc/Config.version"
+source "toolchain/glibc/Config.version"
+source "toolchain/uClibc/Config.version"
+
+config LIBC

        string
        string

-       prompt "Target Optimizations" if TOOLCHAINOPTS
-       default "-Os -pipe -march=i486 -funit-at-a-time" if i386
-       default "-Os -pipe -mips32 -mtune=mips32 -funit-at-a-time" if mipsel || mips
-       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