gcc: always explicitly link against libstdc++, fixes build errors on some hosts that...

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 943b625..09d3813 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,76 +2,34 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
-       default GCC_VERSION_4_2_4 if avr32
-       default GCC_VERSION_4_3_5 if powerpc64
-       default GCC_VERSION_4_3_5 if (TARGET_coldfire || TARGET_etrax || TARGET_gemini)
-       default GCC_VERSION_4_3_3_CS if (arm || armeb) && !(TARGET_gemini || TARGET_omap35xx)
-       default GCC_VERSION_4_3_3_CS if (mips || mipsel) && !(TARGET_octeon || TARGET_sibyte)
-       default GCC_VERSION_4_4_5 if (powerpc || ubicom32)
-       default GCC_VERSION_4_4_5 if (TARGET_omap35xx || TARGET_octeon || TARGET_sibyte)
-       default GCC_VERSION_4_1_2
+       default GCC_VERSION_4_4_6 if GCC_DEFAULT_VERSION_4_4_6
+       default GCC_VERSION_4_5_LINARO
        help
          Select the version of gcc you wish to use.
 
-       config GCC_VERSION_4_1_2
-               bool "gcc 4.1.2"
+       config GCC_VERSION_4_4_6
+               bool "gcc 4.4.6"
+               depends (avr32 || ubicom32)
 
-       config GCC_VERSION_4_2_4
-               bool "gcc 4.2.4"
+       config GCC_VERSION_4_6_1
+               bool "gcc 4.6.1"
 
-       config GCC_VERSION_4_3_3
-               bool "gcc 4.3.3"
+       config GCC_VERSION_4_5_LINARO
+               bool "gcc 4.5.x with Linaro enhancements"
 
-       config GCC_VERSION_4_3_4
-               bool "gcc 4.3.4"
-
-       config GCC_VERSION_4_3_5
-               bool "gcc 4.3.5"
-
-       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_4_4_3
-               bool "gcc 4.4.3"
-
-       config GCC_VERSION_4_4_4
-               bool "gcc 4.4.4"
-
-       config GCC_VERSION_4_4_5
-               bool "gcc 4.4.5"
-
-       config GCC_VERSION_4_5_0
-               bool "gcc 4.5.0"
-
-       config GCC_VERSION_4_5_1
-               bool "gcc 4.5.1"
-
-       config GCC_VERSION_4_5_1_LINARO
-               bool "gcc 4.5.1 with Linaro enhancements"
+       config GCC_VERSION_4_6_LINARO
+               bool "gcc 4.6.x with Linaro enhancements"
 
        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"
-
-       config GCC_VERSION_4_4_1_CS
-               bool "gcc 4.4.1 with CodeSourcery enhancements"
-
-       config GCC_VERSION_4_4_3_CS
-               bool "gcc 4.4.3 with CodeSourcery enhancements"
-               depends BROKEN
-
 endchoice
 
 config GCC_USE_GRAPHITE
        bool
        prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS
-       depends GCC_VERSION_4_4 || GCC_VERSION_4_5
+       depends !GCC_VERSION_LLVM
 
 config GCC_USE_SYSTEM_PPL_CLOOG
        bool
@@ -95,12 +53,20 @@ config SSP_SUPPORT
 
 config TLS_SUPPORT
        bool
-       depends UCLIBC_VERSION_NPTL
        prompt "Enable Thread-local storage (TLS) support" if TOOLCHAINOPTS
        default n
        help
            Enable Thread-local storage support
 
+config SJLJ_EXCEPTIONS
+       bool
+       prompt "Use setjump()/longjump() exceptions" if TOOLCHAINOPTS
+       default n
+       help
+           Use old setjump()/longjump() exceptions instead of the newer
+           frame unwinding exceptions handling routines.  Warning: increases
+           code size and runtime memory usage.
+
 config INSTALL_LIBSTDCPP
        bool
        prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS
@@ -110,8 +76,16 @@ config INSTALL_LIBSTDCPP
 
 config INSTALL_LIBGCJ
        bool
-       depends on !(GCC_VERSION_4_1||GCC_VERSION_4_2)
+       depends on !GCC_VERSION_LLVM
        prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
        default n
        help
            Build/install java compiler and GNU classpath ?
+
+
+config INSTALL_GFORTRAN
+       bool
+       prompt "Build/install fortran compiler?" if TOOLCHAINOPTS
+       default n
+       help
+           Build/install GNU fortran compiler ?