mirror of
git://git.yoctoproject.org/poky
synced 2026-09-29 17:45:59 +00:00
bff6db6712
(From OE-Core rev: 2a36a02c2444551579b8498468debfaff0faa6d8) (From OE-Core rev: 1e2aa57d621fa816fa7fc652a3b7d2920844c74d) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Conflicts: meta/recipes-core/eglibc/eglibc_2.19.bb
35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
Make ld --version output matching grok gold's output
|
|
|
|
adapted from from upstream branch roland/gold-vs-libc
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
Upstream-Status: Backport
|
|
|
|
|
|
Index: libc/configure
|
|
===================================================================
|
|
--- libc.orig/configure
|
|
+++ libc/configure
|
|
@@ -4654,7 +4654,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-9][0-9]*|[3-9].*|[1-9][0-9]*)
|
|
Index: libc/configure.ac
|
|
===================================================================
|
|
--- libc.orig/configure.ac
|
|
+++ libc/configure.ac
|
|
@@ -990,7 +990,7 @@ AC_CHECK_PROG_VER(AS, $AS, --version,
|
|
[GNU assembler.* \([0-9]*\.[0-9.]*\)],
|
|
[2.1[0-9][0-9]*|2.[2-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-9][0-9]*|[3-9].*|[1-9][0-9]*], LD=: critic_missing="$critic_missing ld")
|
|
|
|
# These programs are version sensitive.
|