Prevent C++ + locale + uClibc 0.9.31 + gcc 4.2 to be selected

The problem fixed by 60f945e47a15e10f0e777f69b05492b6f7ba918d is in
fact not limited to the AVR32 architecture, as reported by Will Newton
on the list. The issue is the combination uClibc 0.9.31 with gcc 4.2,
C++ support and locales.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index 3c70f9c77858d039c397a4db67b551cb7a5ff139..ea06acefa179ff3321930ca8b1d1c0b5c9874981 100644 (file)
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -157,7 +157,7 @@ config BR2_GCC_CROSS_CXX
 config BR2_INSTALL_LIBSTDCPP
        bool "Build/install c++ compiler and libstdc++?"
        select BR2_GCC_CROSS_CXX
-       depends on !(BR2_avr32 && BR2_ENABLE_LOCALE && BR2_UCLIBC_VERSION_0_9_31)
+       depends on !(! BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE && BR2_ENABLE_LOCALE && BR2_UCLIBC_VERSION_0_9_31)
        help
          If you are building your own toolchain and want to build and install
          the C++ compiler and library then you need to enable this option.
@@ -165,8 +165,8 @@ config BR2_INSTALL_LIBSTDCPP
          support and you want to use the compiler / library then you need 
          to select this option.
 
-comment "C++ support broken in uClibc 0.9.31 with locale enabled"
-       depends on BR2_avr32 && BR2_ENABLE_LOCALE && BR2_UCLIBC_VERSION_0_9_31
+comment "C++ support broken in uClibc 0.9.31 with locale enabled with gcc 4.2"
+       depends on !BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE && BR2_ENABLE_LOCALE && BR2_UCLIBC_VERSION_0_9_31
 
 config BR2_TARGET_OPTIMIZATION
        string "Target Optimizations"