1.1 --- a/config/cc/gcc.in Sat Jul 10 14:20:16 2010 +0200
1.2 +++ b/config/cc/gcc.in Sat Jul 10 15:25:10 2010 +0200
1.3 @@ -131,7 +131,7 @@
1.4 default n
1.5 select CC_GCC_4_3_or_later
1.6 select CC_GCC_4_2_or_later
1.7 - select CC_GCC_USE_PPL_CLOOG_MPC
1.8 + select CC_GCC_USE_PPL_CLOOG
1.9
1.10 config CC_GCC_4_5_or_later
1.11 bool
1.12 @@ -139,7 +139,7 @@
1.13 select CC_GCC_4_4_or_later
1.14 select CC_GCC_4_3_or_later
1.15 select CC_GCC_4_2_or_later
1.16 - select CC_GCC_USE_LIBELF
1.17 + select CC_GCC_USE_MPC_LIBELF
1.18
1.19 config CC_GCC_USE_GMP_MPFR
1.20 bool
1.21 @@ -147,16 +147,16 @@
1.22 select GMP
1.23 select MPFR
1.24
1.25 -config CC_GCC_USE_PPL_CLOOG_MPC
1.26 +config CC_GCC_USE_PPL_CLOOG
1.27 bool
1.28 default n
1.29 select PPL
1.30 select CLOOG
1.31 - select MPC
1.32
1.33 -config CC_GCC_USE_LIBELF
1.34 +config CC_GCC_USE_MPC_LIBELF
1.35 bool
1.36 default n
1.37 + select MPC
1.38 select LIBELF
1.39
1.40 config CC_VERSION
2.1 --- a/scripts/build/cc/gcc.sh Sat Jul 10 14:20:16 2010 +0200
2.2 +++ b/scripts/build/cc/gcc.sh Sat Jul 10 15:25:10 2010 +0200
2.3 @@ -166,12 +166,12 @@
2.4 extra_config+=("--with-gmp=${CT_COMPLIBS_DIR}")
2.5 extra_config+=("--with-mpfr=${CT_COMPLIBS_DIR}")
2.6 fi
2.7 - if [ "${CT_CC_GCC_USE_PPL_CLOOG_MPC}" = "y" ]; then
2.8 + if [ "${CT_CC_GCC_USE_PPL_CLOOG}" = "y" ]; then
2.9 extra_config+=("--with-ppl=${CT_COMPLIBS_DIR}")
2.10 extra_config+=("--with-cloog=${CT_COMPLIBS_DIR}")
2.11 + fi
2.12 + if [ "${CT_CC_GCC_USE_MPC_LIBELF}" = "y" ]; then
2.13 extra_config+=("--with-mpc=${CT_COMPLIBS_DIR}")
2.14 - fi
2.15 - if [ "${CT_CC_GCC_USE_LIBELF}" = "y" ]; then
2.16 extra_config+=("--with-libelf=${CT_COMPLIBS_DIR}")
2.17 fi
2.18
2.19 @@ -346,12 +346,12 @@
2.20 extra_config+=("--with-gmp=${CT_COMPLIBS_DIR}")
2.21 extra_config+=("--with-mpfr=${CT_COMPLIBS_DIR}")
2.22 fi
2.23 - if [ "${CT_CC_GCC_USE_PPL_CLOOG_MPC}" = "y" ]; then
2.24 + if [ "${CT_CC_GCC_USE_PPL_CLOOG}" = "y" ]; then
2.25 extra_config+=("--with-ppl=${CT_COMPLIBS_DIR}")
2.26 extra_config+=("--with-cloog=${CT_COMPLIBS_DIR}")
2.27 + fi
2.28 + if [ "${CT_CC_GCC_USE_MPC_LIBELF}" = "y" ]; then
2.29 extra_config+=("--with-mpc=${CT_COMPLIBS_DIR}")
2.30 - fi
2.31 - if [ "${CT_CC_GCC_USE_LIBELF}" = "y" ]; then
2.32 extra_config+=("--with-libelf=${CT_COMPLIBS_DIR}")
2.33 fi
2.34