1.1 --- a/patches/glibc/2.9/600-recent-binutils.patch	Sat May 22 22:04:31 2010 +0200
     1.2 +++ b/patches/glibc/2.9/600-recent-binutils.patch	Tue May 18 23:54:55 2010 +0200
     1.3 @@ -1,37 +1,37 @@
     1.4 -diff -r -u glibc-cvs-2.9.orig/configure glibc-cvs-2.9/configure
     1.5 ---- glibc-cvs-2.9.orig/configure	2008-11-11 01:50:11.000000000 -0800
     1.6 -+++ glibc-cvs-2.9/configure	2009-11-24 17:52:27.000000000 -0800
     1.7 -@@ -4531,7 +4531,7 @@
     1.8 +diff -durN glibc-2.9.orig/configure glibc-2.9/configure
     1.9 +--- glibc-2.9.orig/configure	2010-05-18 23:47:23.000000000 +0200
    1.10 ++++ glibc-2.9/configure	2010-05-18 23:50:04.000000000 +0200
    1.11 +@@ -4534,7 +4534,7 @@
    1.12     ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
    1.13     case $ac_prog_version in
    1.14       '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
    1.15  -    2.1[3-9]*)
    1.16 -+    2.1[3-9]*|2.20)
    1.17 ++    2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*)
    1.18          ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
    1.19       *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
    1.20   
    1.21 -@@ -4594,7 +4594,7 @@
    1.22 +@@ -4597,7 +4597,7 @@
    1.23     ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`
    1.24     case $ac_prog_version in
    1.25       '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
    1.26  -    2.1[3-9]*)
    1.27 -+    2.1[3-9]*|2.20)
    1.28 ++    2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*)
    1.29          ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
    1.30       *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
    1.31   
    1.32 -diff -r -u glibc-cvs-2.9.orig/configure.in glibc-cvs-2.9/configure.in
    1.33 ---- glibc-cvs-2.9.orig/configure.in	2008-11-11 01:50:11.000000000 -0800
    1.34 -+++ glibc-cvs-2.9/configure.in	2009-11-24 17:53:35.000000000 -0800
    1.35 +diff -durN glibc-2.9.orig/configure.in glibc-2.9/configure.in
    1.36 +--- glibc-2.9.orig/configure.in	2010-05-18 23:47:23.000000000 +0200
    1.37 ++++ glibc-2.9/configure.in	2010-05-18 23:51:25.000000000 +0200
    1.38  @@ -844,10 +844,10 @@
    1.39   # Accept binutils 2.13 or newer.
    1.40   AC_CHECK_PROG_VER(AS, $AS, --version,
    1.41   		  [GNU assembler.* \([0-9]*\.[0-9.]*\)],
    1.42  -		  [2.1[3-9]*], AS=: critic_missing="$critic_missing as")
    1.43 -+		  [2.1[3-9]*|2.20], AS=: critic_missing="$critic_missing as")
    1.44 ++		  [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")
    1.45   AC_CHECK_PROG_VER(LD, $LD, --version,
    1.46   		  [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],
    1.47  -		  [2.1[3-9]*], LD=: critic_missing="$critic_missing ld")
    1.48 -+		  [2.1[3-9]*|2.20], LD=: critic_missing="$critic_missing ld")
    1.49 ++		  [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")
    1.50   
    1.51   # We need the physical current working directory.  We cannot use the
    1.52   # "pwd -P" shell builtin since that's not portable.  Instead we try to