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 44d3029..09d3813 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,49 +2,70 @@
 
 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 TARGET_ppc40x
-       default GCC_VERSION_4_2_4 if TARGET_ppc44x
-       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_3_4_6
-               bool "gcc 3.4.6"
+       config GCC_VERSION_4_4_6
+               bool "gcc 4.4.6"
+               depends (avr32 || ubicom32)
 
-       config GCC_VERSION_4_1_2
-               depends !LINUX_2_4
-               bool "gcc 4.1.2"
+       config GCC_VERSION_4_6_1
+               bool "gcc 4.6.1"
 
-       config GCC_VERSION_4_2_4
-               depends !LINUX_2_4
-               bool "gcc 4.2.4"
+       config GCC_VERSION_4_5_LINARO
+               bool "gcc 4.5.x 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
 
 endchoice
 
-config EABI_SUPPORT
+config GCC_USE_GRAPHITE
        bool
-       depends arm||armeb
-       prompt "Enable EABI support" if TOOLCHAINOPTS
+       prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS
+       depends !GCC_VERSION_LLVM
+
+config GCC_USE_SYSTEM_PPL_CLOOG
+       bool
+       prompt "Use the system versions of PPL and CLooG"
+       depends GCC_USE_GRAPHITE
        default n
-       help
-         Enable ARM EABI support
 
 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....
 
 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
+           Enable Stack-Smashing Protection support
+
+config TLS_SUPPORT
+       bool
+       prompt "Enable Thread-local storage (TLS) support" if TOOLCHAINOPTS
        default n
        help
-           Enable Smash Stacking Protection support
+           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
@@ -55,7 +76,16 @@ config INSTALL_LIBSTDCPP
 
 config INSTALL_LIBGCJ
        bool
+       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 ?