1.1 --- a/tools/addToolVersion.sh	Tue May 20 21:32:39 2008 +0000
     1.2 +++ b/tools/addToolVersion.sh	Mon Jun 09 16:14:23 2008 +0000
     1.3 @@ -80,7 +80,12 @@
     1.4  esac
     1.5  
     1.6  for ver in ${VERSION}; do
     1.7 -    unset DEP L1 L2 L3 L4 L5 FILE
     1.8 +    # Split VERSION into MAJOR MINOR PATCHLEVEL EXTRAVERSION 
     1.9 +    VERSION_M=$(echo "${VERSION}...." |cut -d . -f 1)
    1.10 +    VERSION_m=$(echo "${VERSION}...." |cut -d . -f 2)
    1.11 +    VERSION_P=$(echo "${VERSION}...." |cut -d . -f 3)
    1.12 +    VERSION_E=$(echo "${VERSION}...." |cut -d . -f 4)
    1.13 +    unset DEP L1 L2 L3 L4 L5 L6 FILE
    1.14      v=$(echo "${ver}" |sed -r -e 's/-/_/g; s/\./_/g;')
    1.15      if [ "${cat}" = "KERNEL" ]; then
    1.16          TOOL_SUFFIX=$(echo "${tool_suffix}" |tr [[:lower:]] [[:upper:]])
    1.17 @@ -98,7 +103,14 @@
    1.18          L1="config ${cat}_V_${v}\n"
    1.19          L2="    bool\n"
    1.20          L3="    prompt \"${ver}${prompt_suffix}\"\n"
    1.21 -        L5="    default \"${ver}\" if ${cat}_V_${v}"
    1.22 +        L6="    default \"${ver}\" if ${cat}_V_${v}"
    1.23 +        case "${tool}" in
    1.24 +            gcc)
    1.25 +                if [ ${VERSION_M} -gt 4 -o \( ${VERSION_M} -eq 4 -a ${VERSION_m} -gret 3 i\) ]; then
    1.26 +                    L5="    select CC_GCC_4_3_or_later"
    1.27 +                fi
    1.28 +                ;;
    1.29 +        esac
    1.30          FILE="config/${tool_prefix}/${tool}.in"
    1.31      fi
    1.32      [ -n "${EXP}" ] && DEP="${DEP} && EXPERIMENTAL"
    1.33 @@ -107,6 +119,6 @@
    1.34          "") ;;
    1.35          *)  L4="    depends on "$(echo "${DEP}" |sed -r -e 's/^ \\&\\& //; s/\\&/\\\\&/g;')"\n"
    1.36      esac
    1.37 -    sed -r -i -e 's/^(# CT_INSERT_VERSION_ABOVE)$/'"${L1}${L2}${L3}${L4}"'\n\1/;
    1.38 -                  s/^(# CT_INSERT_VERSION_STRING_ABOVE)$/'"${L5}"'\n\1/;' "${FILE}"
    1.39 +    sed -r -i -e 's/^(# CT_INSERT_VERSION_ABOVE)$/'"${L1}${L2}${L3}${L4}${L5}"'\n\1/;
    1.40 +                  s/^(# CT_INSERT_VERSION_STRING_ABOVE)$/'"${L6}"'\n\1/;' "${FILE}"
    1.41  done