diff options
author | Stefan Liebler <stli@linux.vnet.ibm.com> | 2014-04-16 12:58:02 +0200 |
---|---|---|
committer | Andreas Krebbel <krebbel@linux.vnet.ibm.com> | 2014-04-16 13:04:33 +0200 |
commit | 4fa8bc3b357150b1977f7701f96cef2590a400a7 (patch) | |
tree | 9a0fba214d7ba56451779f5223f67a660c10d91f | |
parent | 8ea587db2b0bb5cd3e527982f7a1499748a987c3 (diff) | |
download | glibc-4fa8bc3b357150b1977f7701f96cef2590a400a7.tar.gz glibc-4fa8bc3b357150b1977f7701f96cef2590a400a7.tar.xz glibc-4fa8bc3b357150b1977f7701f96cef2590a400a7.zip |
[BZ #14770] S/390: Require Binutils >= 2.24 for target S/390.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | NEWS | 13 | ||||
-rw-r--r-- | sysdeps/s390/configure | 68 | ||||
-rw-r--r-- | sysdeps/s390/configure.ac | 8 |
4 files changed, 89 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index a4eba04b7c..c523d9bcf3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2014-04-16 Stefan Liebler <stli@linux.vnet.ibm.com> + [BZ #14770] + * sysdeps/s390/configure.ac: Check for Binutils >= 2.24. + * sysdeps/s390/configure: Regenerate. + +2014-04-16 Stefan Liebler <stli@linux.vnet.ibm.com> + [BZ #16824] * sysdeps/ieee754/ldbl-128/e_j1l.c (__ieee754_y1l): Set round-to-nearest internally to reduce error accumulation. diff --git a/NEWS b/NEWS index 6a6580997e..ee59d33732 100644 --- a/NEWS +++ b/NEWS @@ -9,12 +9,13 @@ Version 2.20 * The following bugs are resolved with this release: - 6804, 13347, 15347, 15514, 15804, 15894, 16002, 16198, 16284, 16348, - 16349, 16357, 16362, 16447, 16532, 16545, 16574, 16599, 16600, 16609, - 16610, 16611, 16613, 16619, 16623, 16632, 16634, 16639, 16642, 16648, - 16649, 16670, 16674, 16677, 16680, 16683, 16689, 16695, 16701, 16706, - 16707, 16712, 16713, 16714, 16731, 16739, 16740, 16743, 16758, 16759, - 16760, 16770, 16786, 16789, 16799, 16800, 16815, 16824, 16831, 16838. + 6804, 13347, 14770, 15347, 15514, 15804, 15894, 16002, 16198, 16284, + 16348, 16349, 16357, 16362, 16447, 16532, 16545, 16574, 16599, 16600, + 16609, 16610, 16611, 16613, 16619, 16623, 16632, 16634, 16639, 16642, + 16648, 16649, 16670, 16674, 16677, 16680, 16683, 16689, 16695, 16701, + 16706, 16707, 16712, 16713, 16714, 16731, 16739, 16740, 16743, 16758, + 16759, 16760, 16770, 16786, 16789, 16799, 16800, 16815, 16824, 16831, + 16838. * Running the testsuite no longer terminates as soon as a test fails. Instead, a file tests.sum (xtests.sum from "make xcheck") is generated, diff --git a/sysdeps/s390/configure b/sysdeps/s390/configure index 0550c455ea..c2d05f7b4a 100644 --- a/sysdeps/s390/configure +++ b/sysdeps/s390/configure @@ -2,3 +2,71 @@ # Local configure fragment for sysdeps/s390. $as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h + + +for ac_prog in $AS +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AS+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AS"; then + ac_cv_prog_AS="$AS" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AS="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AS=$ac_cv_prog_AS +if test -n "$AS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 +$as_echo "$AS" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AS" && break +done + +if test -z "$AS"; then + ac_verc_fail=yes +else + # Found it, now check the version. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $AS" >&5 +$as_echo_n "checking version of $AS... " >&6; } + ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; + 2.2[4-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_prog_version" >&5 +$as_echo "$ac_prog_version" >&6; } +fi +if test $ac_verc_fail = yes; then + critic_missing="$critic_missing The program AS is required in version >= 2.24 for target S390." +fi + + +test -n "$critic_missing" && as_fn_error $? " +*** $critic_missing" "$LINENO" 5 diff --git a/sysdeps/s390/configure.ac b/sysdeps/s390/configure.ac index b5af4e12fc..59cfdd132a 100644 --- a/sysdeps/s390/configure.ac +++ b/sysdeps/s390/configure.ac @@ -4,3 +4,11 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. dnl It is always possible to access static and hidden symbols in an dnl position independent way. AC_DEFINE(PI_STATIC_AND_HIDDEN) + +dnl Accept as 2.24 or newer. +AC_CHECK_PROG_VER(AS, $AS, --version, + [GNU assembler.* \([0-9]*\.[0-9.]*\)], + [2.2[4-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*], critic_missing="$critic_missing The program AS is required in version >= 2.24 for target S390.") + +test -n "$critic_missing" && AC_MSG_ERROR([ +*** $critic_missing]) |