From 414484557912b87060488ee69b2ec8bae4a024d7 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sat, 10 Jul 2010 15:25:10 +0200
Subject: cc/gcc: gcc-4.4 does not use MPC

As reported by Johannes Stezenbach, see thread at:
  http://sourceware.org/ml/crossgcc/2010-07/msg00017.html

diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index 085c92e..790380c 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -131,7 +131,7 @@ config CC_GCC_4_4_or_later
     default n
     select CC_GCC_4_3_or_later
     select CC_GCC_4_2_or_later
-    select CC_GCC_USE_PPL_CLOOG_MPC
+    select CC_GCC_USE_PPL_CLOOG
 
 config CC_GCC_4_5_or_later
     bool
@@ -139,7 +139,7 @@ config CC_GCC_4_5_or_later
     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_LIBELF
+    select CC_GCC_USE_MPC_LIBELF
 
 config CC_GCC_USE_GMP_MPFR
     bool
@@ -147,16 +147,16 @@ config CC_GCC_USE_GMP_MPFR
     select GMP
     select MPFR
 
-config CC_GCC_USE_PPL_CLOOG_MPC
+config CC_GCC_USE_PPL_CLOOG
     bool
     default n
     select PPL
     select CLOOG
-    select MPC
 
-config CC_GCC_USE_LIBELF
+config CC_GCC_USE_MPC_LIBELF
     bool
     default n
+    select MPC
     select LIBELF
 
 config CC_VERSION
diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
index 27e496d..c4373c1 100644
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -166,12 +166,12 @@ do_cc_core() {
         extra_config+=("--with-gmp=${CT_COMPLIBS_DIR}")
         extra_config+=("--with-mpfr=${CT_COMPLIBS_DIR}")
     fi
-    if [ "${CT_CC_GCC_USE_PPL_CLOOG_MPC}" = "y" ]; then
+    if [ "${CT_CC_GCC_USE_PPL_CLOOG}" = "y" ]; then
         extra_config+=("--with-ppl=${CT_COMPLIBS_DIR}")
         extra_config+=("--with-cloog=${CT_COMPLIBS_DIR}")
-        extra_config+=("--with-mpc=${CT_COMPLIBS_DIR}")
     fi
-    if [ "${CT_CC_GCC_USE_LIBELF}" = "y" ]; then
+    if [ "${CT_CC_GCC_USE_MPC_LIBELF}" = "y" ]; then
+        extra_config+=("--with-mpc=${CT_COMPLIBS_DIR}")
         extra_config+=("--with-libelf=${CT_COMPLIBS_DIR}")
     fi
 
@@ -346,12 +346,12 @@ do_cc() {
         extra_config+=("--with-gmp=${CT_COMPLIBS_DIR}")
         extra_config+=("--with-mpfr=${CT_COMPLIBS_DIR}")
     fi
-    if [ "${CT_CC_GCC_USE_PPL_CLOOG_MPC}" = "y" ]; then
+    if [ "${CT_CC_GCC_USE_PPL_CLOOG}" = "y" ]; then
         extra_config+=("--with-ppl=${CT_COMPLIBS_DIR}")
         extra_config+=("--with-cloog=${CT_COMPLIBS_DIR}")
-        extra_config+=("--with-mpc=${CT_COMPLIBS_DIR}")
     fi
-    if [ "${CT_CC_GCC_USE_LIBELF}" = "y" ]; then
+    if [ "${CT_CC_GCC_USE_MPC_LIBELF}" = "y" ]; then
+        extra_config+=("--with-mpc=${CT_COMPLIBS_DIR}")
         extra_config+=("--with-libelf=${CT_COMPLIBS_DIR}")
     fi
 
-- 
cgit v0.10.2-6-g49f6