do not start multiple subshells for applying /etc/uci-defaults. use sh -x for hush...

[openwrt.git] / toolchain / gcc / Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index ab41924..ccaccaf 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -9,7 +9,10 @@ choice
        default GCC_VERSION_4_3_3 if powerpc64
        default GCC_VERSION_4_3_3 if TARGET_etrax
        default GCC_VERSION_4_3_3 if TARGET_coldfire
        default GCC_VERSION_4_3_3 if powerpc64
        default GCC_VERSION_4_3_3 if TARGET_etrax
        default GCC_VERSION_4_3_3 if TARGET_coldfire

-       default GCC_VERSION_4_4_0 if ubicom32
+       default GCC_VERSION_4_4_1 if ubicom32
+       default GCC_VERSION_4_4_1 if TARGET_octeon
+       default GCC_VERSION_4_3_3_CS if (mips || mipsel) && !TARGET_octeon
+       default GCC_VERSION_4_3_3_CS if arm || armeb

        default GCC_VERSION_4_1_2
        help
          Select the version of gcc you wish to use.
        default GCC_VERSION_4_1_2
        help
          Select the version of gcc you wish to use.


@@ -30,27 +33,31 @@ if !LINUX_2_4
        config GCC_VERSION_4_3_4
                bool "gcc 4.3.4"
 
        config GCC_VERSION_4_3_4
                bool "gcc 4.3.4"
 

-       config GCC_VERSION_4_4_0
-               bool "gcc 4.4.0"
-

        config GCC_VERSION_4_4_1
                bool "gcc 4.4.1"
        config GCC_VERSION_4_4_1
                bool "gcc 4.4.1"

+
+       config GCC_VERSION_4_4_2
+               bool "gcc 4.4.2"
+
+       config GCC_VERSION_LLVM
+               bool "llvm-gcc 4.2"
+               depends BROKEN
+
+       config GCC_VERSION_4_3_3_CS
+               bool "gcc 4.3.3 with CodeSourcery enhancements"
+

 endif
 
 endchoice
 
 endif
 
 endchoice
 

-config EABI_SUPPORT
+config GCC_USE_GRAPHITE

        bool
        bool

-       depends arm||armeb
-       prompt "Enable EABI support" if TOOLCHAINOPTS
-       default n if TARGET_gemini
-       default y
-       help
-         Enable ARM EABI support
+       prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS
+       depends GCC_VERSION_4_4_1 || GCC_VERSION_4_4_2

 
 config EXTRA_GCC_CONFIG_OPTIONS
        string
 
 config EXTRA_GCC_CONFIG_OPTIONS
        string

-       prompt "Additional gcc options" if TOOLCHAINOPTS
+       prompt "Additional gcc configure options" if TOOLCHAINOPTS

        default ""
        help
            Any additional gcc options you may want to include....
        default ""
        help
            Any additional gcc options you may want to include....