Delete all WARN_CFLAGS references from fixinc.

	* Makefile.in (fixinc.sh): Don't set or export WARN_CFLAGS.  Fix
	comment.
	* fixinc/Makefile.in (FL_LIST): Don't mention WARN_CFLAGS.
	(fixincl.o-warn): Delete.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@80984 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bcb4303..eab618e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-21  James E Wilson  <wilson@specifixinc.com>
+
+       * Makefile.in (fixinc.sh): Don't set or export WARN_CFLAGS.  Fix
+       comment.
+       * fixinc/Makefile.in (FL_LIST): Don't mention WARN_CFLAGS.
+       (fixincl.o-warn): Delete.
+
 2004-04-21  Andrew Pinski  <pinskia@physics.uc.edu>
 
        * config/rs6000/rs6000 (print_operand) ['z']:

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index cf9b415..43a2e33 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2525,8 +2525,8 @@ specs.ready: specs
        fi
 
 # Until someone fixes this recursive make nightmare (please note where
-# BUILD_CFLAGS and WARN_CFLAGS are first expanded below versus which
-# later make invocation has the fine-grain -warn markings for fixinc):
+# BUILD_CFLAGS is first expanded below versus which later make invocation
+# has the fine-grain -warn markings for fixinc):
 fixinc.sh-warn = -Wno-error
 
 FIXINCSRCDIR=$(srcdir)/fixinc
@@ -2535,8 +2535,8 @@ fixinc.sh: $(FIXINCSRCDIR)/mkfixinc.sh $(FIXINCSRCDIR)/fixincl.c \
        $(FIXINCSRCDIR)/server.h $(FIXINCSRCDIR)/inclhack.def specs.ready
        (MAKE="$(MAKE)"; srcdir=`cd $(srcdir)/fixinc && ${PWD_COMMAND}` ; \
        CC="$(CC_FOR_BUILD)"; CFLAGS="$(BUILD_CFLAGS)"; LDFLAGS="$(BUILD_LDFLAGS)"; \
-       WARN_CFLAGS=""; LIBERTY=`${PWD_COMMAND}`/"$(BUILD_LIBIBERTY)"; \
-       export MAKE srcdir CC CFLAGS LDFLAGS WARN_CFLAGS LIBERTY; \
+       LIBERTY=`${PWD_COMMAND}`/"$(BUILD_LIBIBERTY)"; \
+       export MAKE srcdir CC CFLAGS LDFLAGS LIBERTY; \
        cd ./fixinc && \
        $(SHELL) $${srcdir}/mkfixinc.sh $(build) $(target))
 

diff --git a/gcc/fixinc/Makefile.in b/gcc/fixinc/Makefile.in
index 1329e8f..22ea44f 100644 (file)
--- a/gcc/fixinc/Makefile.in
+++ b/gcc/fixinc/Makefile.in
@@ -29,7 +29,7 @@ SHELL=@SHELL@
 # in the kernel.  So, we use `echo' instead. 
 STAMP = echo timestamp >
 
-FL_LIST = $(CFLAGS) $(CPPFLAGS) $(WARN_CFLAGS)
+FL_LIST = $(CFLAGS) $(CPPFLAGS)
 FIXINC_DEFS = -DIN_GCC -DHAVE_CONFIG_H $(FL_LIST) $(INCLUDES)
 
 # Directory where sources are, from where we are.
@@ -94,9 +94,6 @@ test-stamp : $(TESTOBJ) $(LIBERTY)
 $(AF): $(FIXOBJ) $(LIBERTY)
        $(CC) $(FIXINC_DEFS) $(LDFLAGS) -o $@ $(FIXOBJ) $(LIBERTY)
 
-# String length warnings
-fixincl.o-warn = -Wno-error
-
 $(ALLOBJ)   : $(HDR)
 fixincl.o   : fixincl.c  $(srcdir)/fixincl.x
 fixtests.o  : fixtests.c