aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMark Mitchell <mark@codesourcery.com>2004-12-01 22:18:35 +0000
committerMark Mitchell <mmitchel@gcc.gnu.org>2004-12-01 22:18:35 +0000
commit9098b4e6ddf24c4b7cfd42e400bdbac6d658637e (patch)
tree4149eee522387201dd687e060b0b31bdd9990eb3 /gcc
parent78716e864e99c9d3256a1f04a2c0fee3d23c6b60 (diff)
downloadgcc-9098b4e6ddf24c4b7cfd42e400bdbac6d658637e.zip
gcc-9098b4e6ddf24c4b7cfd42e400bdbac6d658637e.tar.gz
gcc-9098b4e6ddf24c4b7cfd42e400bdbac6d658637e.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/Makefile.in5
-rw-r--r--gcc/config/i386/x-mingw324
3 files changed, 14 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0428c68..f217947 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+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
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 13e659a..9e4b679 100644
--- a/gcc/Makefile.in
+++ b/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"
diff --git a/gcc/config/i386/x-mingw32 b/gcc/config/i386/x-mingw32
index fd57464..fe60021 100644
--- a/gcc/config/i386/x-mingw32
+++ b/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) \