diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c1aa2e0943e7b8a270328cb79d7e7713a7608616..6f51361b83068b61f8951b36cacd8ecd560d2270 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-16  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.ac: Don't require ELF binutils to tolerate # 0 "".
+	* configure: Rebuilt.
+
 2007-03-16  Alexandre Oliva  <aoliva@redhat.com>
 
 	PR debug/29906
diff --git a/gcc/configure b/gcc/configure
index de3f6289b9e6991e01fe09422ee8a7fd8cba0845..1425636d8f518aeef4b2931a69c9f9a61973ac5f 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -16045,7 +16045,7 @@ if test "${gcc_cv_as_line_zero+set}" = set; then
 else
   gcc_cv_as_line_zero=no
   if test $in_tree_gas = yes; then
-    if test $gcc_cv_gas_vers -ge `expr \( \( elf,2,16,91 \* 1000 \) + gcc_cv_as_line_zero=yes \) \* 1000 + `
+    if test $gcc_cv_gas_vers -ge `expr \( \( 2,16,91 \* 1000 \) + gcc_cv_as_line_zero=yes \) \* 1000 + `
   then :
 fi
   elif test "x$gcc_cv_as" != x; then
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 18134cae8fbbb0d71cbe17f2bbcfcb5c2f7800e8..7c16f935401f48bedfdf3b2ef6f830dfe887ca21 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -3079,7 +3079,7 @@ AC_CACHE_CHECK([assembler for tolerance to line number 0],
  [gcc_cv_as_line_zero],
  [gcc_cv_as_line_zero=no
   if test $in_tree_gas = yes; then
-    gcc_GAS_VERSION_GTE_IFELSE([elf,2,16,91], [gcc_cv_as_line_zero=yes])
+    gcc_GAS_VERSION_GTE_IFELSE([2,16,91], [gcc_cv_as_line_zero=yes])
   elif test "x$gcc_cv_as" != x; then
     { echo '# 1 "test.s" 1'; echo '# 0 "" 2'; } > conftest.s
     if AC_TRY_COMMAND([$gcc_cv_as -o conftest.o conftest.s >&AS_MESSAGE_LOG_FD 2>conftest.out]) &&