diff mbox series

Update configure.ac for binutils 2.25

Message ID 20170925234727.GA10561@gmail.com
State New
Headers show
Series Update configure.ac for binutils 2.25 | expand

Commit Message

H.J. Lu Sept. 25, 2017, 11:47 p.m. UTC 
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.

I will check it in shortly.

H.J.
---
	* configure.ac (AS): Require binutils 2.25 or later.
	* configure: Regenerated.
---
 configure    | 4 ++--
 configure.ac | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
diff mbox series

Patch

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