1.1 --- a/scripts/build/cc_gcc.sh Sun Sep 02 09:26:57 2007 +0000
1.2 +++ b/scripts/build/cc_gcc.sh Sat Sep 15 21:44:18 2007 +0000
1.3 @@ -65,13 +65,7 @@
1.4
1.5 CT_DoLog EXTRA "Configuring static core C compiler"
1.6
1.7 - extra_config=""
1.8 - [ "${CT_ARCH_FLOAT_SW}" = "y" ] && extra_config="${extra_config} --with-float=soft"
1.9 - [ -n "${CT_ARCH_ABI}" ] && extra_config="${extra_config} --with-abi=${CT_ARCH_ABI}"
1.10 - [ -n "${CT_ARCH_ARCH}" ] && extra_config="${extra_config} --with-arch=${CT_ARCH_ARCH}"
1.11 - [ -n "${CT_ARCH_CPU}" ] && extra_config="${extra_config} --with-cpu=${CT_ARCH_CPU}"
1.12 - [ -n "${CT_ARCH_TUNE}" ] && extra_config="${extra_config} --with-tune=${CT_ARCH_TUNE}"
1.13 - [ -n "${CT_ARCH_FPU}" ] && extra_config="${extra_config} --with-fpu=${CT_ARCH_FPU}"
1.14 + extra_config="${CT_ARCH_WITH_ARCH} ${CT_ARCH_WITH_ABI} ${CT_ARCH_WITH_CPU} ${CT_ARCH_WITH_TUNE} ${CT_ARCH_WITH_FPU} ${CT_ARCH_WITH_FLOAT}"
1.15 [ "${CT_CC_CXA_ATEXIT}" = "y" ] && extra_config="${extra_config} --enable-__cxa_atexit"
1.16
1.17 CT_DoLog DEBUG "Extra config passed: \"${extra_config}\""
1.18 @@ -123,13 +117,7 @@
1.19
1.20 CT_DoLog EXTRA "Configuring shared core C compiler"
1.21
1.22 - extra_config=""
1.23 - [ "${CT_ARCH_FLOAT_SW}" = "y" ] && extra_config="${extra_config} --with-float=soft"
1.24 - [ -n "${CT_ARCH_ABI}" ] && extra_config="${extra_config} --with-abi=${CT_ARCH_ABI}"
1.25 - [ -n "${CT_ARCH_ARCH}" ] && extra_config="${extra_config} --with-arch=${CT_ARCH_ARCH}"
1.26 - [ -n "${CT_ARCH_CPU}" ] && extra_config="${extra_config} --with-cpu=${CT_ARCH_CPU}"
1.27 - [ -n "${CT_ARCH_TUNE}" ] && extra_config="${extra_config} --with-tune=${CT_ARCH_TUNE}"
1.28 - [ -n "${CT_ARCH_FPU}" ] && extra_config="${extra_config} --with-fpu=${CT_ARCH_FPU}"
1.29 + extra_config="${CT_ARCH_WITH_ARCH} ${CT_ARCH_WITH_ABI} ${CT_ARCH_WITH_CPU} ${CT_ARCH_WITH_TUNE} ${CT_ARCH_WITH_FPU} ${CT_ARCH_WITH_FLOAT}"
1.30 [ "${CT_CC_CXA_ATEXIT}" = "y" ] && extra_config="${extra_config} --enable-__cxa_atexit"
1.31
1.32 CT_DoLog DEBUG "Extra config passed: \"${extra_config}\""
1.33 @@ -228,18 +216,8 @@
1.34 lang_opt=`echo "${lang_opt},${CT_CC_LANG_OTHERS}" |sed -r -e 's/,+/,/g; s/,*$//;'`
1.35
1.36 extra_config="--enable-languages=${lang_opt}"
1.37 - [ "${CT_ARCH_FLOAT_SW}" = "y" ] && extra_config="${extra_config} --with-float=soft"
1.38 + extra_config="${extra_config} ${CT_ARCH_WITH_ARCH} ${CT_ARCH_WITH_ABI} ${CT_ARCH_WITH_CPU} ${CT_ARCH_WITH_TUNE} ${CT_ARCH_WITH_FPU} ${CT_ARCH_WITH_FLOAT}"
1.39 [ "${CT_SHARED_LIBS}" = "y" ] || extra_config="${extra_config} --disable-shared"
1.40 - [ -n "${CT_ARCH_ABI}" ] && extra_config="${extra_config} --with-abi=${CT_ARCH_ABI}"
1.41 - [ -n "${CT_ARCH_CPU}" ] && extra_config="${extra_config} --with-cpu=${CT_ARCH_CPU}"
1.42 - [ -n "${CT_ARCH_TUNE}" ] && extra_config="${extra_config} --with-tune=${CT_ARCH_TUNE}"
1.43 - [ -n "${CT_ARCH_ARCH}" ] && extra_config="${extra_config} --with-arch=${CT_ARCH_ARCH}"
1.44 - [ -n "${CT_ARCH_FPU}" ] && extra_config="${extra_config} --with-fpu=${CT_ARCH_FPU}"
1.45 - if [ "${CT_TARGET_MULTILIB}" = "y" ]; then
1.46 - extra_config="${extra_config} --enable-multilib"
1.47 - else
1.48 - extra_config="${extra_config} --disable-multilib"
1.49 - fi
1.50 [ "${CT_CC_CXA_ATEXIT}" == "y" ] && extra_config="${extra_config} --enable-__cxa_atexit"
1.51
1.52 CT_DoLog DEBUG "Extra config passed: \"${extra_config}\""
1.53 @@ -268,7 +246,6 @@
1.54 make ${PARALLELMFLAGS} all-build-libiberty 2>&1 |CT_DoLog ALL
1.55 fi
1.56
1.57 -
1.58 # Idea from <cort.dougan at gmail.com>:
1.59 # Fix lib/lib64 confusion for GCC 3.3.3 on PowerPC64 and x86_64.
1.60 # GCC 3.4.0 and up don't suffer from this confusion, and don't need this