3 files changed, 75 insertions, 0 deletions
diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index 9df1dfc..84d0abf 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -128,3 +128,19 @@ config CC_EXTRA_CONFIG
     default ""
     help
       Extra flags to pass onto ./configure when configuring gcc.
+
+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
diff --git a/config/cc/gmp.in b/config/cc/gmp.in
new file mode 100644
index 0000000..21a8ee4
--- /dev/null
+++ b/config/cc/gmp.in
@@ -0,0 +1,27 @@
+# GMP options
+
+choice
+    bool
+    prompt "GMP version"
+
+config GMP_V_4_2_2
+    bool
+    prompt "4.2.2"
+
+# CT_INSERT_VERSION_ABOVE
+# Don't remove above line!
+endchoice
+
+config GMP_VERSION
+    string
+    default "4.2.2" if GMP_V_4_2_2
+# CT_INSERT_VERSION_STRING_ABOVE
+# Don't remove above line!
+
+config GMP_CHECK
+    bool
+    prompt "Check GMP"
+    default y
+    help
+      It is highly recommended that 'make check' is run against the newly built
+      GMP library. See http://gmplib.org/
diff --git a/config/cc/mpfr.in b/config/cc/mpfr.in
new file mode 100644
index 0000000..d2e2b00
--- /dev/null
+++ b/config/cc/mpfr.in
@@ -0,0 +1,32 @@
+# GMP options
+
+choice
+    bool
+    prompt "MPFR version"
+
+config MPFR_V_2_3_0
+    bool
+    prompt "2.3.0"
+
+config MPFR_V_2_3_1
+    bool
+    prompt "2.3.1"
+
+# CT_INSERT_VERSION_ABOVE
+# Don't remove above line!
+endchoice
+
+config MPFR_VERSION
+    string
+    default "2.3.0" if MPFR_V_2_3_0
+    default "2.3.1" if MPFR_V_2_3_1
+# CT_INSERT_VERSION_STRING_ABOVE
+# Don't remove above line!
+
+config MPFR_CHECK
+    bool
+    prompt "Check MPFR"
+    default y
+    help
+      It is highly recommended that 'make check' is run against the newly built
+      MPFR library. See http://gmplib.org/