diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 75873edfd4d..68570eb2f5a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-19  Joel Brobecker  <brobecker@adacore.com>
+
+	* configure.ac: Disable -Werror by default.
+	* configure: Regenerate.
+
 2010-02-19  Joel Brobecker  <brobecker@adacore.com>
 
 	GDB 7.1 branch created (branch timestamp: 2010-02-18 20:00 UTC)
diff --git a/gdb/configure b/gdb/configure
index d444b08f54c..1983d04f001 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -13418,11 +13418,6 @@ if test "${enable_werror+set}" = set; then :
 fi
 
 
-# Enable -Werror by default when using gcc
-if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
-    ERROR_ON_WARNING=yes
-fi
-
 WERROR_CFLAGS=""
 if test "${ERROR_ON_WARNING}" = yes ; then
     WERROR_CFLAGS="-Werror"
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 8da6867a6a1..6f873b5839c 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -1527,11 +1527,6 @@ AC_ARG_ENABLE(werror,
      *) AC_MSG_ERROR(bad value ${enableval} for --enable-werror) ;;
    esac])
 
-# Enable -Werror by default when using gcc
-if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
-    ERROR_ON_WARNING=yes
-fi
-
 WERROR_CFLAGS=""
 if test "${ERROR_ON_WARNING}" = yes ; then
     WERROR_CFLAGS="-Werror"