diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 17752a92db5..46bfcc75602 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2004-12-02  Andreas Schwab  <schwab@suse.de>
+
+	* Makefile.in (WERROR_FLAGS): Renamed from WERROR.
+	(STRICT2_WARN): Use $(WERROR_FLAGS) instead of $(WERROR).
+	(STAGE2_FLAGS_TO_PASS): Likewise.
+
+	* config/i386/x-mingw32: Set WERROR_FLAGS instead of WERROR.
+
 2004-12-02  Richard Sandiford  <rsandifo@redhat.com>
 
 	* configure.ac: Use TL_AC_GCC_VERSION to set gcc_version.  Remove
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 9e4b67907bb..880e1c5dbc6 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -167,9 +167,9 @@ coverageexts = .{gcda,gcno}
 # -Wno-variadic-macros.
 LOOSE_WARN = -W -Wall -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes
 STRICT_WARN = @strict1_warn@
-WERROR = @WERROR@
+WERROR_FLAGS = @WERROR@
 STRICT2_WARN = -pedantic -Wno-long-long -Wno-variadic-macros \
-  -Wold-style-definition $(WERROR)
+  -Wold-style-definition $(WERROR_FLAGS)
 
 # This is set by --enable-checking.  The idea is to catch forgotten
 # "extern" tags in header files.
@@ -3643,7 +3643,7 @@ POSTSTAGE1_FLAGS_TO_PASS = \
 
 STAGE2_FLAGS_TO_PASS = \
 	CFLAGS="$(BOOT_CFLAGS)" \
-	WERROR="$(WERROR)" \
+	WERROR="$(WERROR_FLAGS)" \
 
 STAGEPROFILE_FLAGS_TO_PASS = \
 	CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"
diff --git a/gcc/config/i386/x-mingw32 b/gcc/config/i386/x-mingw32
index fe600214588..7ae61522a56 100644
--- a/gcc/config/i386/x-mingw32
+++ b/gcc/config/i386/x-mingw32
@@ -5,7 +5,7 @@ local_includedir=$(libsubdir)/$(unlibsubdir)/..`echo $(exec_prefix) | sed -e 's|
 
 # On MinGW, we use "%IA64d" to print 64-bit integers, and the format-checking
 # code does not handle that, so we have to disable checking here.
-WERROR += -Wno-format
+WERROR_FLAGS += -Wno-format
 
 host-mingw32.o : $(srcdir)/config/i386/host-mingw32.c $(CONFIG_H) $(SYSTEM_H) \
   coretypes.h hosthooks.h hosthooks-def.h toplev.h diagnostic.h $(HOOKS_H)