diff -r cd9322b076d7 -r db17513ee7bf config/cc/gcc.in
--- a/config/cc/gcc.in	Sat Jul 10 15:25:10 2010 +0200
+++ b/config/cc/gcc.in	Wed Jul 28 21:28:54 2010 +0200
@@ -130,15 +130,12 @@
     bool
     default n
     select CC_GCC_4_3_or_later
-    select CC_GCC_4_2_or_later
     select CC_GCC_USE_PPL_CLOOG
 
 config CC_GCC_4_5_or_later
     bool
     default n
     select CC_GCC_4_4_or_later
-    select CC_GCC_4_3_or_later
-    select CC_GCC_4_2_or_later
     select CC_GCC_USE_MPC_LIBELF
 
 config CC_GCC_USE_GMP_MPFR
@@ -183,52 +180,31 @@
     default "4.0.4" if CC_V_4_0_4
     default "3.4.6" if CC_V_3_4_6
 
-config CC_CXA_ATEXIT
+config CC_LANG_JAVA_USE_ECJ
     bool
-    prompt "Use __cxa_atexit"
     default y
-    depends on ! BARE_METAL
+    depends on CC_LANG_JAVA
+    depends on CC_GCC_4_3_or_later
+
+config CC_PKGVERSION
+    string
+    prompt "gcc ID string"
+    depends on CC_GCC_4_3_or_later
+    default "crosstool-NG-${CT_VERSION}"
     help
-      If you get the missing symbol "__cxa_atexit" when building C++ programs,
-      you might want to try disabling this option.
+      Specify a string that identifies your package. You may wish to include
+      a build number or build date. This version string will be included in
+      the output of gcc --version.
 
-choice
-    bool
-    prompt "Use sjlj for exceptions"
-    default CC_SJLJ_EXCEPTIONS_CONFIGURE
-    depends on ! BARE_METAL
+      This is passed to the configure flag --with-pkgversion.
 
-# This config option is used nowhere in the code on purpose.
-# It only serves as a choice entry to force neither using nor not using sjlj
-config CC_SJLJ_EXCEPTIONS_CONFIGURE
-    bool
-    prompt "Let configure decide"
+config CC_BUGURL
+    string
+    prompt "gcc bug URL"
+    depends on CC_GCC_4_3_or_later
+    default ""
     help
-      Let configure decide if setjmp/longjmp should be used to handle
-      exceptions.
-      
-      Choose that if you trust configure to detect the correct settings.
-      This is the default choice.
-
-config CC_SJLJ_EXCEPTIONS_USE
-    bool
-    prompt "Force using sjlj"
-    help
-      Do use setjmp/longjmp for exceptions.
-      This is gcc's --enable-sjlj-exceptions configure switch.
-      
-      Choose that if you want to use setjmp/longjmp to handle exceptions.
-
-config CC_SJLJ_EXCEPTIONS_DONT_USE
-    bool
-    prompt "Force not using sjlj"
-    help
-      Do not use setjmp/longjmp for exceptions.
-      This is gcc's --disable-sjlj-exceptions configure switch.
-      
-      Choose that if you want to not use setjmp/longjmp to handle exceptions.
-
-endchoice
+      Specify the URL that users should visit if they wish to report a bug.
 
 config CC_ENABLE_CXX_FLAGS
     string
@@ -258,50 +234,3 @@
     depends on ! BARE_METAL
     help
       Extra flags to pass onto ./configure when configuring gcc.
-
-config CC_GCC_ENABLE_TARGET_OPTSPACE
-    bool
-    prompt "Optimize gcc libs for size"
-    default y
-    help
-      Pass --enable-target-optspace to crossgcc's configure.
-
-      This will compile crossgcc's libs with -Os.
-
-config CC_GCC_DISABLE_PCH
-    bool
-    prompt "Do not build PCH"
-    default n
-    help
-      Say 'y' here to not use Pre-Compiled Headers in the resulting toolchain.
-      at the expense of speed when compiling C++ code.
-      
-      For some configurations (most notably canadian?), PCH are broken, and
-      need to be disabled.  Please see:
-        http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40974
-
-config CC_PKGVERSION
-    string
-    prompt "gcc ID string"
-    depends on CC_GCC_4_3_or_later
-    default "crosstool-NG-${CT_VERSION}"
-    help
-      Specify a string that identifies your package. You may wish to include
-      a build number or build date. This version string will be included in
-      the output of gcc --version.
-
-      This is passed to the configure flag --with-pkgversion.
-
-config CC_BUGURL
-    string
-    prompt "gcc bug URL"
-    depends on CC_GCC_4_3_or_later
-    default ""
-    help
-      Specify the URL that users should visit if they wish to report a bug.
-
-config CC_LANG_JAVA_USE_ECJ
-    bool
-    default y
-    depends on CC_LANG_JAVA
-    depends on CC_GCC_4_3_or_later