2 files changed, 42 insertions, 5 deletions
diff --git a/config/companion_libs.in b/config/companion_libs.in
index c95418b..46a2ede 100644
--- a/config/companion_libs.in
+++ b/config/companion_libs.in
@@ -36,20 +36,25 @@ source config/companion_libs/gmp.in
 source config/companion_libs/mpfr.in
 endif
 
-config PPL_CLOOG
+config PPL_CLOOG_MPC
     bool
-    prompt "PPL and GLooG/PPL"
+    prompt "PPL, GLooG/PPL and MPC"
     help
-      gcc-4.4.0 and above requires both PPL and CLooG/PPL to build some
-      parts of the optimiser (GRAPHITE loop optimisation, to be precise).
+      gcc-4.4.0 and above requires PPL and CLooG/PPL to build some parts
+      of the optimiser (GRAPHITE loop optimisation, to be precise).
+      
+      In addition to those, gcc-4.4 also optionally uses MPC to enable
+      additional optimisations on complex numbers. Although MPC is optional,
+      crosstool-NG requires it and uses it to build gcc >= 4.4.0.
       
       These will be automatically selected if you choose gcc>=4.4.0, but you
       can say 'Y' here, although it is unknown yet if any other component
       can use them.
 
-if PPL_CLOOG
+if PPL_CLOOG_MPC
 source config/companion_libs/ppl.in
 source config/companion_libs/cloog.in
+source config/companion_libs/mpc.in
 endif
 
 endmenu
diff --git a/config/companion_libs/mpc.in b/config/companion_libs/mpc.in
new file mode 100644
index 0000000..7ff2c26
--- /dev/null
+++ b/config/companion_libs/mpc.in
@@ -0,0 +1,32 @@
+# MPC options
+
+choice
+    bool
+    prompt "MPC version"
+
+config MPC_V_0_6
+    bool
+    prompt "0.6"
+
+# CT_INSERT_VERSION_ABOVE
+# Don't remove above line!
+endchoice
+
+config MPC_VERSION
+    string
+    default "0.6" if MPC_V_0_6
+# CT_INSERT_VERSION_STRING_ABOVE
+# Don't remove above line!
+
+config MPC_CHECK
+    bool
+    prompt "Check MPC (!!! README !!!)"
+    default n
+    help
+      It is highly recommended to check the newly built MPC library.
+      Unfortunately, this is a very intensive task, and takes a loooong time.
+
+      Checking MPC is thus disabled by default.
+
+      If you suspect that your MPC library is the cause for incorrectly
+      generated code, you should answer 'Y' here.