Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From b356816d6e005ecda7adbed9627a4315ad39de39 Mon Sep 17 00:00:00 2001 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 18 Mar 2015 00:25:45 +0000 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 4 | Subject: [PATCH 12/24] Make ld --version output matching grok gold's output |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5 | |
| 6 | adapted from from upstream branch roland/gold-vs-libc |
| 7 | |
| 8 | Upstream-Status: Backport |
| 9 | |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- |
| 12 | configure | 2 +- |
| 13 | configure.ac | 2 +- |
| 14 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 15 | |
| 16 | diff --git a/configure b/configure |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 17 | index aa05d49..6dabd11 100755 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 18 | --- a/configure |
| 19 | +++ b/configure |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 20 | @@ -4486,7 +4486,7 @@ else |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 21 | # Found it, now check the version. |
| 22 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $LD" >&5 |
| 23 | $as_echo_n "checking version of $LD... " >&6; } |
| 24 | - ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` |
| 25 | + ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU [Bbinutilsd][^.]* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` |
| 26 | case $ac_prog_version in |
| 27 | '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; |
| 28 | 2.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*) |
| 29 | diff --git a/configure.ac b/configure.ac |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 30 | index ee7a3f1..b4b95b9 100644 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 31 | --- a/configure.ac |
| 32 | +++ b/configure.ac |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 33 | @@ -948,7 +948,7 @@ AC_CHECK_PROG_VER(AS, $AS, --version, |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 34 | [2.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*], |
| 35 | AS=: critic_missing="$critic_missing as") |
| 36 | AC_CHECK_PROG_VER(LD, $LD, --version, |
| 37 | - [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)], |
| 38 | + [GNU [Bbinutilsd][^.]* \([0-9][0-9]*\.[0-9.]*\)], |
| 39 | [2.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*], |
| 40 | LD=: critic_missing="$critic_missing ld") |
| 41 | |
| 42 | -- |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 43 | 2.6.4 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 44 | |