ar7: backport small fixes from linux-mips

[openwrt.git] / toolchain / Config.in

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 79fa857..a6b0683 100644 (file)
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -10,8 +10,38 @@ 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 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
+               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
+               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.
+
 source "toolchain/binutils/Config.in"
 source "toolchain/gcc/Config.in"
+source "toolchain/uClibc/Config.in"
 
 config GDB
        bool
@@ -27,17 +57,17 @@ config LARGEFILE
        help
                Enable large file (files > 2 GB) support
 
-config C99_MATH
+config SHADOW_PASSWORDS
        bool
-       prompt "Enable full C99 math support?" if TOOLCHAINOPTS
-       default n
+       prompt "Enable shadow password support?" if TOOLCHAINOPTS
+       default y
        help
-               Enable if you need full C99 math in libm
+               Enable shadow password support.
 
 config SOFT_FLOAT
        bool
        prompt "Use software floating point by default" if TOOLCHAINOPTS
-       default n
+       default y
        depends on arm || armeb || powerpc
        help
          If your target CPU does not have a Floating Point Unit (FPU) or a
@@ -54,9 +84,11 @@ config TARGET_OPTIMIZATION
        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 armeb
+       default "-Os -pipe -march=armv5te -mtune=xscale -funit-at-a-time" if TARGET_ixp4xx || TARGET_iop32x || TARGET_pxa
+       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.
 
 source "toolchain/gcc/Config.version"
+source "toolchain/uClibc/Config.version"