aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2004-12-02 12:12:09 +0000
committerAndreas Schwab <schwab@gcc.gnu.org>2004-12-02 12:12:09 +0000
commit1afffb0073735109c8ca6fa2780fb44db169b87a (patch)
tree8588e988470f8d4de1847f16df3f97e035e15968
parent28e42b7eac632e5ad97801687192baa1f76a2e0d (diff)
downloadgcc-1afffb0073735109c8ca6fa2780fb44db169b87a.zip
gcc-1afffb0073735109c8ca6fa2780fb44db169b87a.tar.gz
gcc-1afffb0073735109c8ca6fa2780fb44db169b87a.tar.bz2
Makefile.in (WERROR_FLAGS): Renamed from WERROR.
* 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. From-SVN: r91634
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/Makefile.in6
-rw-r--r--gcc/config/i386/x-mingw322
3 files changed, 12 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 17752a9..46bfcc7 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 9e4b679..880e1c5 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 fe60021..7ae6152 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)