ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-02-20 17:12:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libc/glibc: fix as/ld checks against recent binutils

Browse Source 
Backported from:
  http://sourceware.org/ml/libc-alpha/2009-09/msg00024.html

Thanks to Khem RAJ for pointing to this fix:
  http://sourceware.org/ml/crossgcc/2010-05/msg00033.html
This commit is contained in:
Yann E. MORIN" 2010-05-18 23:54:55 +02:00
parent dbd5e50583
commit c0927b7ac6
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
patches/glibc/2.9/600-recent-binutils.patch
View File

@ -1,37 +1,37 @@
diff -r -u glibc-cvs-2.9.orig/configure glibc-cvs-2.9/configure
--- glibc-cvs-2.9.orig/configure 2008-11-11 01:50:11.000000000 -0800
+++ glibc-cvs-2.9/configure 2009-11-24 17:52:27.000000000 -0800
@@ -4531,7 +4531,7 @@
diff -durN glibc-2.9.orig/configure glibc-2.9/configure
--- glibc-2.9.orig/configure 2010-05-18 23:47:23.000000000 +0200
+++ glibc-2.9/configure 2010-05-18 23:50:04.000000000 +0200
@@ -4534,7 +4534,7 @@
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.20)
+ 2.1[3-9]*|2.1[0-9][0-9]*|2.[2-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;;
@@ -4594,7 +4594,7 @@
@@ -4597,7 +4597,7 @@
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.20)
+ 2.1[3-9]*|2.1[0-9][0-9]*|2.[2-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 -r -u glibc-cvs-2.9.orig/configure.in glibc-cvs-2.9/configure.in
--- glibc-cvs-2.9.orig/configure.in 2008-11-11 01:50:11.000000000 -0800
+++ glibc-cvs-2.9/configure.in 2009-11-24 17:53:35.000000000 -0800
diff -durN glibc-2.9.orig/configure.in glibc-2.9/configure.in
--- glibc-2.9.orig/configure.in 2010-05-18 23:47:23.000000000 +0200
+++ glibc-2.9/configure.in 2010-05-18 23:51:25.000000000 +0200
@@ -844,10 +844,10 @@
# 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.20], AS=: critic_missing="$critic_missing as")
+ [2.1[3-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.]*\)],
- [2.1[3-9]*], LD=: critic_missing="$critic_missing ld")
+ [2.1[3-9]*|2.20], LD=: critic_missing="$critic_missing ld")
+ [2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-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