Makefile.in (WERROR): New variable.

	* Makefile.in (WERROR): New variable.
	(STRICT2_WARN): Use it.
	(STAGE2_FLAGS_TO_PASS): Likewise.
	* config/i386/x-mingw32 (WERROR): Add -Wno-format.

From-SVN: r91584

gcc/ChangeLog

+2004-12-01  Mark Mitchell  <mark@codesourcery.com>
+
+	* Makefile.in (WERROR): New variable.
+	(STRICT2_WARN): Use it.
+	(STAGE2_FLAGS_TO_PASS): Likewise.
+	* config/i386/x-mingw32 (WERROR): Add -Wno-format.
+
 2004-12-01  Richard Henderson  <rth@redhat.com>
 
 	* expr.c (get_inner_reference): Fix thinko in REAL/IMAGPART_EXPR

gcc/Makefile.in

@@ -167,8 +167,9 @@ coverageexts = .{gcda,gcno}
 # -Wno-variadic-macros.
 LOOSE_WARN = -W -Wall -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes
 STRICT_WARN = @strict1_warn@
+WERROR = @WERROR@
 STRICT2_WARN = -pedantic -Wno-long-long -Wno-variadic-macros \
-  -Wold-style-definition @WERROR@
+  -Wold-style-definition $(WERROR)
 
 # This is set by --enable-checking.  The idea is to catch forgotten
 # "extern" tags in header files.
@@ -3642,7 +3643,7 @@ POSTSTAGE1_FLAGS_TO_PASS = \
 
 STAGE2_FLAGS_TO_PASS = \
 	CFLAGS="$(BOOT_CFLAGS)" \
-	WERROR="@WERROR@" \
+	WERROR="$(WERROR)" \
 
 STAGEPROFILE_FLAGS_TO_PASS = \
 	CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"

gcc/config/i386/x-mingw32

@@ -3,6 +3,10 @@
 #
 local_includedir=$(libsubdir)/$(unlibsubdir)/..`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include
 
+# 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
+
 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)
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \