1.1 --- a/config/binutils/binutils.in	Tue May 31 20:12:35 2011 +0200
     1.2 +++ b/config/binutils/binutils.in	Tue May 31 20:39:42 2011 +0200
     1.3 @@ -17,22 +17,27 @@
     1.4  config BINUTILS_V_2_20_1
     1.5      bool
     1.6      prompt "2.20.1"
     1.7 +    select BINUTILS_2_20_or_later
     1.8  
     1.9  config BINUTILS_V_2_20
    1.10      bool
    1.11      prompt "2.20"
    1.12 +    select BINUTILS_2_20_or_later
    1.13  
    1.14  config BINUTILS_V_2_19_1
    1.15      bool
    1.16      prompt "2.19.1"
    1.17 +    select BINUTILS_2_19_or_later
    1.18  
    1.19  config BINUTILS_V_2_19
    1.20      bool
    1.21      prompt "2.19"
    1.22 +    select BINUTILS_2_19_or_later
    1.23  
    1.24  config BINUTILS_V_2_18
    1.25      bool
    1.26      prompt "2.18"
    1.27 +    select BINUTILS_2_18_or_later
    1.28  
    1.29  config BINUTILS_V_2_17
    1.30      bool
    1.31 @@ -61,9 +66,22 @@
    1.32  
    1.33  config BINUTILS_2_21_or_later
    1.34      bool
    1.35 +    select BINUTILS_2_20_or_later
    1.36      select BINUTILS_HAS_GOLD
    1.37      select BINUTILS_HAS_PLUGINS
    1.38  
    1.39 +config BINUTILS_2_20_or_later
    1.40 +    bool
    1.41 +    select BINUTILS_2_19_or_later
    1.42 +
    1.43 +config BINUTILS_2_19_or_later
    1.44 +    bool
    1.45 +    select BINUTILS_2_18_or_later
    1.46 +
    1.47 +config BINUTILS_2_18_or_later
    1.48 +    bool
    1.49 +    select BINUTILS_HAS_PKGVERSION_BUGURL
    1.50 +
    1.51  config BINUTILS_HAS_GOLD
    1.52      bool
    1.53  
    1.54 @@ -73,6 +91,9 @@
    1.55  config BINUTILS_HAS_PLUGINS
    1.56      bool
    1.57  
    1.58 +config BINUTILS_HAS_PKGVERSION_BUGURL
    1.59 +    bool
    1.60 +
    1.61  # Only these architectures have support in gold
    1.62  config ARCH_arm
    1.63      select BINUTILS_GOLD_SUPPORTS_ARCH

     2.1 --- a/config/toolchain.in	Tue May 31 20:12:35 2011 +0200
     2.2 +++ b/config/toolchain.in	Tue May 31 20:39:42 2011 +0200
     2.3 @@ -73,7 +73,7 @@
     2.4      help
     2.5        Specify a string that identifies your package. You may wish to include
     2.6        a build number or build date. This version string will be included in
     2.7 -      the output of gcc --version.
     2.8 +      the output of gcc --version, and also in binutils.
     2.9  
    2.10        This is passed to the configure flag --with-pkgversion.
    2.11  

     3.1 --- a/scripts/addToolVersion.sh	Tue May 31 20:12:35 2011 +0200
     3.2 +++ b/scripts/addToolVersion.sh	Tue May 31 20:39:42 2011 +0200
     3.3 @@ -123,6 +123,20 @@
     3.4                  SedExpr1="${SedExpr1}\n    select CC_GCC_4_2"
     3.5              fi
     3.6              ;;
     3.7 +        binutils)
     3.8 +            # Extract 'M'ajor and 'm'inor from version string
     3.9 +            ver_M=$(getVersionField "${version}" . 1)
    3.10 +            ver_m=$(getVersionField "${version}" . 2)
    3.11 +            if [   \( ${ver_M} -eq 2 -a ${ver_m} -eq 21 \)  ]; then
    3.12 +                SedExpr1="${SedExpr1}\n    select BINUTILS_2_21_or_later"
    3.13 +            elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 20 \)  ]; then
    3.14 +                SedExpr1="${SedExpr1}\n    select BINUTILS_2_20_or_later"
    3.15 +            elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 19 \)  ]; then
    3.16 +                SedExpr1="${SedExpr1}\n    select BINUTILS_2_19_or_later"
    3.17 +            elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 18 \)  ]; then
    3.18 +                SedExpr1="${SedExpr1}\n    select BINUTILS_2_18_or_later"
    3.19 +            fi
    3.20 +            ;;
    3.21          uClibc)
    3.22              # uClibc-0.9.30 and above need some love
    3.23              ver_M=$(getVersionField "${version}" . 1)

     4.1 --- a/scripts/build/binutils/binutils.sh	Tue May 31 20:12:35 2011 +0200
     4.2 +++ b/scripts/build/binutils/binutils.sh	Tue May 31 20:39:42 2011 +0200
     4.3 @@ -55,6 +55,10 @@
     4.4      if [ "${CT_BINUTILS_PLUGINS}" = "y" ]; then
     4.5          extra_config+=( --enable-plugins )
     4.6      fi
     4.7 +    if [ "${CT_BINUTILS_HAS_PKGVERSION_BUGURL}" = "y" ]; then
     4.8 +        [ -n "${CT_TOOLCHAIN_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_TOOLCHAIN_PKGVERSION}")
     4.9 +        [ -n "${CT_TOOLCHAIN_BUGURL}" ]     && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
    4.10 +    fi
    4.11  
    4.12      CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
    4.13  
    4.14 @@ -141,6 +145,12 @@
    4.15          CT_Pushd "${CT_BUILD_DIR}/build-binutils-for-target"
    4.16  
    4.17          CT_DoLog EXTRA "Configuring binutils for target"
    4.18 +
    4.19 +        if [ "${CT_BINUTILS_HAS_PKGVERSION_BUGURL}" = "y" ]; then
    4.20 +            [ -n "${CT_TOOLCHAIN_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_TOOLCHAIN_PKGVERSION}")
    4.21 +            [ -n "${CT_TOOLCHAIN_BUGURL}" ]     && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
    4.22 +        fi
    4.23 +
    4.24          CT_DoExecLog CFG                                            \
    4.25          "${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}/configure"   \
    4.26              --build=${CT_BUILD}                                     \