[toolchain] gcc: use coherent version selector between binutils & gcc

[openwrt/svn-archive/archive.git] / toolchain / gcc / Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 458c5b2b1488d2c045e546292836e53a9491de4d..9562a02c99c35163824a7fb26835ddb91337c587 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -3,11 +3,16 @@
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
        default GCC_VERSION_3_4_6 if LINUX_2_4
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
        default GCC_VERSION_3_4_6 if LINUX_2_4

-       default GCC_VERSION_4_2_4 if TARGET_avr32
+       default GCC_VERSION_4_2_4 if avr32

        default GCC_VERSION_4_2_4 if TARGET_ppc40x
        default GCC_VERSION_4_2_4 if TARGET_ppc44x
        default GCC_VERSION_4_2_4 if TARGET_ppc40x
        default GCC_VERSION_4_2_4 if TARGET_ppc44x

-       default GCC_VERSION_4_3_3 if TARGET_ps3_petitboot
+       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_etrax

+       default GCC_VERSION_4_3_3 if TARGET_coldfire
+       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.


@@ -25,23 +30,34 @@ if !LINUX_2_4
        config GCC_VERSION_4_3_3
                bool "gcc 4.3.3"
 
        config GCC_VERSION_4_3_3
                bool "gcc 4.3.3"
 

-       config GCC_VERSION_4_4_0
-               bool "gcc 4.4.0"
+       config GCC_VERSION_4_3_4
+               bool "gcc 4.3.4"
+
+       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 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....


@@ -49,10 +65,10 @@ config EXTRA_GCC_CONFIG_OPTIONS
 config SSP_SUPPORT
        bool
        depends !GCC_VERSION_3_4_6
 config SSP_SUPPORT
        bool
        depends !GCC_VERSION_3_4_6

-       prompt "Enable Smash Stacking Protection support" if TOOLCHAINOPTS
+       prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS

        default n
        help
        default n
        help

-           Enable Smash Stacking Protection support
+           Enable Stack-Smashing Protection support

 
 config INSTALL_LIBSTDCPP
        bool
 
 config INSTALL_LIBSTDCPP
        bool