diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-09-25 18:01:23 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-09-25 18:01:34 -0700 |
| commit | b4396163aa8666f970aaf43eaca25f3a92b18c1b (patch) | |
| tree | 66238b62ad94ac60a3e86c9138a532a44d319ce6 | |
| parent | 8f8349870fbcd822b0bdbd3200bc0245f812dae4 (diff) | |
| download | glibc-b4396163aa8666f970aaf43eaca25f3a92b18c1b.tar.gz glibc-b4396163aa8666f970aaf43eaca25f3a92b18c1b.tar.xz glibc-b4396163aa8666f970aaf43eaca25f3a92b18c1b.zip | |
Update configure.ac for binutils 2.25
Commit 073e8fa7739ed453d6854b834f290c263a6cdb9f requires binutils 2.25 or later to build glibc: * configure.ac (AS): Require binutils 2.25 or later. (LD): Likewise. But it only updated LD version check in configure.ac. This patch adds the missing AS version check. * configure.ac (AS): Require binutils 2.25 or later. * configure: Regenerated.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index a92b23961d..c2cebf1c91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-09-25 H.J. Lu <hongjiu.lu@intel.com> + + * configure.ac (AS): Require binutils 2.25 or later. + * configure: Regenerated. + 2017-09-25 Paul Pluzhnikov <ppluzhnikov@google.com> [BZ #22207] diff --git a/configure b/configure index 5cb5210107..067d92d2ba 100755 --- a/configure +++ b/configure @@ -4615,7 +4615,7 @@ $as_echo "$libc_cv_prog_ld_gnu" >&6; } gnu_ld=$libc_cv_prog_ld_gnu -# Accept binutils 2.22 or newer. +# Accept binutils 2.25 or newer. for ac_prog in $AS do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -4667,7 +4667,7 @@ $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.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) + 2.1[0-9][0-9]*|2.2[5-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;; diff --git a/configure.ac b/configure.ac index 2c6308883c..d412104d8c 100644 --- a/configure.ac +++ b/configure.ac @@ -1078,10 +1078,10 @@ AC_PROG_LN_S LIBC_PROG_BINUTILS -# Accept binutils 2.22 or newer. +# Accept binutils 2.25 or newer. AC_CHECK_PROG_VER(AS, $AS, --version, [GNU assembler.* \([0-9]*\.[0-9.]*\)], - [2.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*], + [2.1[0-9][0-9]*|2.2[5-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*], AS=: critic_missing="$critic_missing as") if test -n "`$LD --version | sed -n 's/^GNU \(gold\).*$/\1/p'`"; then |