| From b356816d6e005ecda7adbed9627a4315ad39de39 Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Wed, 18 Mar 2015 00:25:45 +0000 |
| Subject: [PATCH 12/24] Make ld --version output matching grok gold's output |
| |
| adapted from from upstream branch roland/gold-vs-libc |
| |
| Upstream-Status: Backport |
| |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| --- |
| configure | 2 +- |
| configure.ac | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/configure b/configure |
| index aa05d49..6dabd11 100755 |
| --- a/configure |
| +++ b/configure |
| @@ -4486,7 +4486,7 @@ else |
| # Found it, now check the version. |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $LD" >&5 |
| $as_echo_n "checking version of $LD... " >&6; } |
| - ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` |
| + ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU [Bbinutilsd][^.]* \([0-9][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]*) |
| diff --git a/configure.ac b/configure.ac |
| index ee7a3f1..b4b95b9 100644 |
| --- a/configure.ac |
| +++ b/configure.ac |
| @@ -948,7 +948,7 @@ AC_CHECK_PROG_VER(AS, $AS, --version, |
| [2.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*], |
| AS=: critic_missing="$critic_missing as") |
| AC_CHECK_PROG_VER(LD, $LD, --version, |
| - [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)], |
| + [GNU [Bbinutilsd][^.]* \([0-9][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]*], |
| LD=: critic_missing="$critic_missing ld") |
| |
| -- |
| 2.6.4 |
| |