--- glibc-configure.in.bad	2009-10-28 23:21:25.000000000 +0100
+++ glibc-configure.in.bad	2009-10-28 22:54:40.000000000 +0100
@@ -899,7 +899,7 @@ 
 		  [GNU assembler.* \([0-9]*\.[0-9.]*\)],
 		  [2.1[3-9]*|[2-9].[2-9]*], AS=: critic_missing="$critic_missing as")
 AC_CHECK_PROG_VER(LD, $LD, --version,
-		  [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],
+		  [GNU.*ld.*Binutils.\([0-9][0-9]*\.[0-9.]*\)\(.*\)],
 		  [2.1[3-9]*|[2-9].[2-9]*], LD=: critic_missing="$critic_missing ld")
 
 # We need the physical current working directory.  We cannot use the
@@ -1527,7 +1527,7 @@ 
   libc_cv_z_relro=no
   if AC_TRY_COMMAND([${CC-cc} -v --help 2>&1|grep "z relro" 1>&AS_MESSAGE_LOG_FD])
   then
-    if AC_TRY_COMMAND([${CC-cc} -Wl,--verbose 2>&1|grep DATA_SEGMENT_RELRO_END 1>&AS_MESSAGE_LOG_FD])
+    if AC_TRY_COMMAND([${CC-cc} -Wl,--help 2>&1|grep "z relro" 1>&AS_MESSAGE_LOG_FD])
     then
       libc_cv_z_relro=yes
     fi