fix typo in squashfs-lzma patch (thx, hauke)

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index e5ee5bd..b5642ec 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,41 +2,44 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS

-       default GCC_VERSION_4_1_1

        default GCC_VERSION_3_4_6 if LINUX_2_4
        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 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 TARGET_etrax
+       default GCC_VERSION_4_1_2

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

-
-       config GCC_VERSION_3_4_4
-               bool "gcc 3.4.4"
-
-       config GCC_VERSION_3_4_5
-               bool "gcc 3.4.5"
-

        config GCC_VERSION_3_4_6
                bool "gcc 3.4.6"
 
        config GCC_VERSION_3_4_6
                bool "gcc 3.4.6"
 

-       config GCC_VERSION_3_4_6_nonmips
-               bool "gcc 3.4.6-nonmips"
-
-       config GCC_VERSION_4_0_2
-               bool "gcc 4.0.2"
+if !LINUX_2_4
+       config GCC_VERSION_4_1_2
+               bool "gcc 4.1.2"

 
 

-       config GCC_VERSION_4_0_3
-               bool "gcc 4.0.3"
+       config GCC_VERSION_4_2_4
+               bool "gcc 4.2.4"

 
 

-       config GCC_VERSION_4_1_0
-               bool "gcc 4.1.0"
+       config GCC_VERSION_4_3_3
+               bool "gcc 4.3.3"

 
 

-       config GCC_VERSION_4_1_1
-               bool "gcc 4.1.1"
-
-       config GCC_VERSION_4_2
-               bool "gcc 4.2 (20060709)"
+       config GCC_VERSION_4_4_0
+               bool "gcc 4.4.0"
+endif

 
 endchoice
 
 
 endchoice
 

+config EABI_SUPPORT
+       bool
+       depends arm||armeb
+       prompt "Enable EABI support" if TOOLCHAINOPTS
+       default n if (TARGET_gemini || TARGET_storm)
+       default y
+       help
+         Enable ARM EABI support
+

 config EXTRA_GCC_CONFIG_OPTIONS
        string
        prompt "Additional gcc options" if TOOLCHAINOPTS
 config EXTRA_GCC_CONFIG_OPTIONS
        string
        prompt "Additional gcc options" if TOOLCHAINOPTS


@@ -44,6 +47,14 @@ config EXTRA_GCC_CONFIG_OPTIONS
        help
            Any additional gcc options you may want to include....
 
        help
            Any additional gcc options you may want to include....
 

+config SSP_SUPPORT
+       bool
+       depends !GCC_VERSION_3_4_6
+       prompt "Enable Smash Stacking Protection support" if TOOLCHAINOPTS
+       default n
+       help
+           Enable Smash Stacking Protection support
+

 config INSTALL_LIBSTDCPP
        bool
        prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS
 config INSTALL_LIBSTDCPP
        bool
        prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS


@@ -51,4 +62,9 @@ config INSTALL_LIBSTDCPP
        help
            Build/install c++ compiler and libstdc++?
 
        help
            Build/install c++ compiler and libstdc++?
 

-
+config INSTALL_LIBGCJ
+       bool
+       prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
+       default n
+       help
+           Build/install java compiler and GNU classpath ?