From b61184b3fa79870b8e72f2d53111ea1d2dc47c90 Mon Sep 17 00:00:00 2001 From: Mark Seaborn Date: Thu, 28 Jan 2010 12:18:50 +0000 Subject: [PATCH] Support binutils 2.20. Backported to glibc 2.9 to support NaCl's newer binutils. --- configure | 4 ++-- configure.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 71ae623fd0..d118c1196f 100755 --- a/configure +++ b/configure @@ -4493,7 +4493,7 @@ echo $ECHO_N "checking version of $AS... $ECHO_C" >&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[3-9]*) + 2.1[3-9]*|[2-9].[2-9]*) ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; @@ -4556,7 +4556,7 @@ echo $ECHO_N "checking version of $LD... $ECHO_C" >&6; } ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 2.1[3-9]*) + 2.1[3-9]*|[2-9].[2-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.in b/configure.in index a8da9ff537..a6dea63899 100644 --- a/configure.in +++ b/configure.in @@ -844,10 +844,10 @@ AC_SUBST(MIG)dnl Needed by sysdeps/mach/configure.in # Accept binutils 2.13 or newer. AC_CHECK_PROG_VER(AS, $AS, --version, [GNU assembler.* \([0-9]*\.[0-9.]*\)], - [2.1[3-9]*], AS=: critic_missing="$critic_missing as") + [2.1[3-9]*|[2-9].[2-9]*], AS=: critic_missing="$critic_missing as") AC_CHECK_PROG_VER(LD, $LD, --version, [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)], - [2.1[3-9]*], LD=: critic_missing="$critic_missing ld") + [2.1[3-9]*|[2-9].[2-9]*], LD=: critic_missing="$critic_missing ld") # We need the physical current working directory. We cannot use the # "pwd -P" shell builtin since that's not portable. Instead we try to -- 2.11.4.GIT