1.1 --- a/config/libc/eglibc.in Tue May 31 20:39:42 2011 +0200
1.2 +++ b/config/libc/eglibc.in Tue May 31 20:55:30 2011 +0200
1.3 @@ -22,22 +22,27 @@
1.4 bool
1.5 prompt "2_13"
1.6 depends on EXPERIMENTAL
1.7 + select LIBC_EGLIBC_2_13_or_later
1.8
1.9 config LIBC_EGLIBC_V_2_12
1.10 bool
1.11 prompt "2_12"
1.12 + select LIBC_EGLIBC_2_12_or_later
1.13
1.14 config LIBC_EGLIBC_V_2_11
1.15 bool
1.16 prompt "2_11"
1.17 + select LIBC_EGLIBC_2_11_or_later
1.18
1.19 config LIBC_EGLIBC_V_2_10
1.20 bool
1.21 prompt "2_10"
1.22 + select LIBC_EGLIBC_2_10_or_later
1.23
1.24 config LIBC_EGLIBC_V_2_9
1.25 bool
1.26 prompt "2_9"
1.27 + select LIBC_EGLIBC_2_9_or_later
1.28
1.29 config LIBC_EGLIBC_V_2_8
1.30 bool
1.31 @@ -62,6 +67,7 @@
1.32 config LIBC_EGLIBC_V_TRUNK
1.33 bool
1.34 prompt "'trunk'"
1.35 + select LIBC_EGLIBC_2_13_or_later
1.36 help
1.37 Selecting this will export the trunk of the eglibc subversion repository.
1.38
1.39 @@ -82,6 +88,29 @@
1.40 default "2_5" if LIBC_EGLIBC_V_2_5
1.41 default "trunk" if LIBC_EGLIBC_V_TRUNK
1.42
1.43 +config LIBC_EGLIBC_2_13_or_later
1.44 + bool
1.45 + select LIBC_EGLIBC_2_12_or_later
1.46 +
1.47 +config LIBC_EGLIBC_2_12_or_later
1.48 + bool
1.49 + select LIBC_EGLIBC_2_11_or_later
1.50 +
1.51 +config LIBC_EGLIBC_2_11_or_later
1.52 + bool
1.53 + select LIBC_EGLIBC_2_10_or_later
1.54 +
1.55 +config LIBC_EGLIBC_2_10_or_later
1.56 + bool
1.57 + select LIBC_EGLIBC_2_9_or_later
1.58 +
1.59 +config LIBC_EGLIBC_2_9_or_later
1.60 + bool
1.61 + select LIBC_EGLIBC_HAS_PKGVERSION_BUGURL
1.62 +
1.63 +config LIBC_EGLIBC_HAS_PKGVERSION_BUGURL
1.64 + bool
1.65 +
1.66 config EGLIBC_REVISION
1.67 string
1.68 prompt "Revision to use"
2.1 --- a/config/toolchain.in Tue May 31 20:39:42 2011 +0200
2.2 +++ b/config/toolchain.in Tue May 31 20:55:30 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, and also in binutils.
2.8 + the output of gcc --version, and also in binutils, eglibc.
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:39:42 2011 +0200
3.2 +++ b/scripts/addToolVersion.sh Tue May 31 20:55:30 2011 +0200
3.3 @@ -137,6 +137,22 @@
3.4 SedExpr1="${SedExpr1}\n select BINUTILS_2_18_or_later"
3.5 fi
3.6 ;;
3.7 + eglibc)
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 13 \) ]; then
3.12 + SedExpr1="${SedExpr1}\n select LIBC_EGLIBC_2_13_or_later"
3.13 + elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 12 \) ]; then
3.14 + SedExpr1="${SedExpr1}\n select LIBC_EGLIBC_2_12_or_later"
3.15 + elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 11 \) ]; then
3.16 + SedExpr1="${SedExpr1}\n select LIBC_EGLIBC_2_11_or_later"
3.17 + elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 10 \) ]; then
3.18 + SedExpr1="${SedExpr1}\n select LIBC_EGLIBC_2_10_or_later"
3.19 + elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 9 \) ]; then
3.20 + SedExpr1="${SedExpr1}\n select LIBC_EGLIBC_2_9_or_later"
3.21 + fi
3.22 + ;;
3.23 uClibc)
3.24 # uClibc-0.9.30 and above need some love
3.25 ver_M=$(getVersionField "${version}" . 1)
4.1 --- a/scripts/build/libc/glibc-eglibc.sh-common Tue May 31 20:39:42 2011 +0200
4.2 +++ b/scripts/build/libc/glibc-eglibc.sh-common Tue May 31 20:55:30 2011 +0200
4.3 @@ -234,6 +234,11 @@
4.4 *) extra_config+=("--enable-add-ons=$(do_libc_add_ons_list ,)");;
4.5 esac
4.6
4.7 + if [ "${CT_LIBC_EGLIBC_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 extra_cc_args="${extra_cc_args} ${CT_ARCH_ENDIAN_OPT}"
4.13
4.14 touch config.cache
4.15 @@ -245,7 +250,7 @@
4.16 # Pre-seed the configparms file with values from the config option
4.17 printf "${CT_LIBC_GLIBC_CONFIGPARMS}\n" > configparms
4.18
4.19 - cross_cc=$(CT_Which "${CT_TARGET}-gcc")
4.20 + cross_cc=$(CT_Which "${CT_TARGET}-gcc")
4.21
4.22 CT_DoLog DEBUG "Using gcc for target: '${cross_cc}'"
4.23 CT_DoLog DEBUG "Configuring with addons : '$(do_libc_add_ons_list ,)'"
4.24 @@ -296,7 +301,7 @@
4.25 --with-headers="${CT_HEADERS_DIR}" \
4.26 "${extra_config[@]}" \
4.27 "${CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY[@]}"
4.28 -
4.29 +
4.30 # build hacks
4.31 case "${CT_ARCH},${CT_ARCH_CPU}" in
4.32 powerpc,8??)