gcc: port missing patches from 4.6 to 4.8

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 7becaa8a307ae039043a48ede7a71b32c0eb7249..a926295f75bcfe82daca64ee299e40234858df44 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,29 +2,39 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
-       default GCC_VERSION_4_4_7 if GCC_DEFAULT_VERSION_4_4_7
-       default GCC_VERSION_4_6_LINARO
+       default GCC_USE_VERSION_4_4_7 if avr32
+       default GCC_USE_VERSION_4_6_LINARO
        help
          Select the version of gcc you wish to use.
 
-       config GCC_VERSION_4_4_7
+       config GCC_USE_VERSION_4_4_7
+               select GCC_VERSION_4_4_7
                bool "gcc 4.4.7"
                depends on avr32
 
-       config GCC_VERSION_4_6_3
+       config GCC_USE_VERSION_4_6_3
+               select GCC_VERSION_4_6_3
                bool "gcc 4.6.3"
 
-       config GCC_VERSION_4_7_2
+       config GCC_USE_VERSION_4_7_2
+               select GCC_VERSION_4_7_2
                bool "gcc 4.7.2"
 
-       config GCC_VERSION_4_6_LINARO
+       config GCC_USE_VERSION_4_8_0
+               select GCC_VERSION_4_8_0
+               bool "gcc 4.8.0"
+
+       config GCC_USE_VERSION_4_6_LINARO
+               select GCC_VERSION_4_6_LINARO
                bool "gcc 4.6.x with Linaro enhancements"
 
-       config GCC_VERSION_4_7_LINARO
+       config GCC_USE_VERSION_4_7_LINARO
+               select GCC_VERSION_4_7_LINARO
                bool "gcc 4.7.x with Linaro enhancements"
 
-       config GCC_VERSION_4_8_0
-               bool "gcc 4.8.0"
+       config GCC_USE_VERSION_4_8_LINARO
+               select GCC_VERSION_4_8_LINARO
+               bool "gcc 4.8.x with Linaro enhancements"
 
 endchoice
 
@@ -61,13 +71,6 @@ config SJLJ_EXCEPTIONS
            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
-       default y if !USE_MUSL
-       help
-           Build/install c++ compiler and libstdc++?
-
 config INSTALL_LIBGCJ
        bool
        prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS