diff -r 4a32697b5440 -r 1968d150a34f config/cc/gcc.in
--- a/config/cc/gcc.in	Mon Jun 09 16:40:28 2008 +0000
+++ b/config/cc/gcc.in	Fri Jun 20 15:16:43 2008 +0000
@@ -120,7 +120,7 @@
 config CC_GCC_4_3_or_later
     bool
     default n
-    select CC_GCC_GMP_MPFR
+    select GMP_MPFR
 
 config CC_CXA_ATEXIT
     bool
@@ -166,19 +166,3 @@
     default ""
     help
       Specify the URL that users should visit if they wish to report a bug.
-
-menuconfig CC_GCC_GMP_MPFR
-    bool
-    prompt "GMP and MPFR"
-    help
-      Recent gcc needs both GMP and MPFR to build some frontends.
-
-      Say 'Y' here if you want to build those two libraries specifically
-      for crosstool-NG.
-
-      Saying 'Y' is highly recommended if building gcc-4.3 or higher.
-
-if CC_GCC_GMP_MPFR
-source config/cc/gmp.in
-source config/cc/mpfr.in
-endif