diff --git a/rtems/config/4.11/rtems-all.bset b/rtems/config/4.11/rtems-all.bset
index e2cda37..d2d9381 100644
--- a/rtems/config/4.11/rtems-all.bset
+++ b/rtems/config/4.11/rtems-all.bset
@@ -7,7 +7,7 @@
 4.11/rtems-avr
 4.11/rtems-bfin
 4.11/rtems-i386
-4.11/rtems-lm32
+# broken 4.11/rtems-lm32
 4.11/rtems-m32c
 4.11/rtems-m32r
 4.11/rtems-m68k
diff --git a/rtems/config/4.11/rtems-arm.bset b/rtems/config/4.11/rtems-arm.bset
index 9d26cfd..6f1d315 100644
--- a/rtems/config/4.11/rtems-arm.bset
+++ b/rtems/config/4.11/rtems-arm.bset
@@ -11,6 +11,11 @@
 #
 %include rtems-4.11-base.bset
 
+#
+# Need to add this option to build.
+#
+%define enable_obsolete 1
+
 #
 # Patch to enable EABI
 #
diff --git a/rtems/config/4.11/rtems-avr.bset b/rtems/config/4.11/rtems-avr.bset
index 3e84d35..8484cb4 100644
--- a/rtems/config/4.11/rtems-avr.bset
+++ b/rtems/config/4.11/rtems-avr.bset
@@ -11,6 +11,12 @@
 #
 %include rtems-4.11-base.bset
 
+#
+# Disable building a C++ compiler.
+#  configure: error: unable to detect exception model
+#
+%define enable_cxx 0
+
 #
 # Tools configuration.
 #
diff --git a/rtems/config/4.11/rtems-m32c.bset b/rtems/config/4.11/rtems-m32c.bset
index 8f532a2..0b4de06 100644
--- a/rtems/config/4.11/rtems-m32c.bset
+++ b/rtems/config/4.11/rtems-m32c.bset
@@ -11,6 +11,13 @@
 #
 %include rtems-4.11-base.bset
 
+#
+# Disable building a C++ compiler.
+#
+#  gcc-4.7.2/libstdc++-v3/src/mt_allocator.cc:76: error: cast from 'void*' to 'size_t' loses precision
+#
+%define enable_cxx 0
+
 #
 # Tools configuration.
 #
diff --git a/rtems/config/tools/rtems-gcc-4.7.2-newlib-2.0.0-1.cfg b/rtems/config/tools/rtems-gcc-4.7.2-newlib-2.0.0-1.cfg
index 8c840b6..4dc2430 100644
--- a/rtems/config/tools/rtems-gcc-4.7.2-newlib-2.0.0-1.cfg
+++ b/rtems/config/tools/rtems-gcc-4.7.2-newlib-2.0.0-1.cfg
@@ -15,32 +15,11 @@
 %define with_plugin  0
 %define with_iconv   1
 
-#
-# AVR C++ does not work.
-#   configure: error: unable to detect exception model
-#
-%if %{_target} == avr-rtems4.11
-%define enable_cxx 0
-%endif
-
-#
-# M32C C++ does not work.
-#   gcc-4.7.2/libstdc++-v3/src/mt_allocator.cc:76: error: cast from 'void*' to 'size_t' loses precision
-#
-%if %{_target} == m32c-rtems4.11
-%define enable_cxx 0
-%endif
-
 %ifn %{defined enable_cxx}
 %define enable_cxx 1
 %endif
 
-#
-# If arm-rtems4.11 add --enable-obsolete.
-#
-%if %{_target} == arm-rtems4.11
-%define enable_obsolete 1
-%else
+%ifn %{defined enable_obsolete}
 %define enable_obsolete 0
 %endif
 
diff --git a/rtems/config/tools/rtems-gcc-4.8-ss-newlib-2.0.0-1.cfg b/rtems/config/tools/rtems-gcc-4.8-ss-newlib-2.0.0-1.cfg
index 58e3109..ae5500a 100644
--- a/rtems/config/tools/rtems-gcc-4.8-ss-newlib-2.0.0-1.cfg
+++ b/rtems/config/tools/rtems-gcc-4.8-ss-newlib-2.0.0-1.cfg
@@ -15,35 +15,10 @@
 %define with_plugin  0
 %define with_iconv   1
 
-#
-# AVR C++ does not work.
-#   configure: error: unable to detect exception model
-#
-%if %{_target} == avr-rtems4.11
-%define enable_cxx 0
-%endif
-
-#
-# M32C C++ does not work.
-#   gcc-4.7.2/libstdc++-v3/src/mt_allocator.cc:76: error: cast from 'void*' to 'size_t' loses precision
-#
-%if %{_target} == m32c-rtems4.11
-%define enable_cxx 0
-%endif
-
 %ifn %{defined enable_cxx}
 %define enable_cxx 1
 %endif
 
-#
-# If arm-rtems4.11 add --enable-obsolete.
-#
-%if %{_target} == arm-rtems4.11
-%define enable_obsolete 1
-%else
-%define enable_obsolete 0
-%endif
-
 #
 # The RTEMS 4.11 patches
 #