Makefile.in / c-decl.c patch

Joern Rennecke amylaar@cygnus.co.uk
Mon Aug 2 18:08:00 GMT 1999


I've found that there is a similar problem in java.
While looking at this I also foudn that there are RTL_H and EXPR_H macros
to use for the rtl.h / expr.h dependencies, so forget my last patch
and consider this one instead:

Tue Aug  3 01:23:24 1999  J"orn Rennecke <amylaar@cygnus.co.uk>

	* Makefile.in (c-decl.o): Depends on $(RTL_H) and $(EXPR_H)
	* c-decl.c : Include rtl.h before expr.h.
	* java/Makefile.in (decl.o): Depends on $(RTL_H) and $(EXPR_H)
	* java/decl.c : Include rtl.h before expr.h.

Index: Makefile.in
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/Makefile.in,v
retrieving revision 1.271
diff -p -r1.271 Makefile.in
*** Makefile.in	1999/07/31 12:46:42	1.271
--- Makefile.in	1999/08/03 01:02:34
*************** $(srcdir)/c-gperf.h: c-parse.gperf
*** 1337,1343 ****
  	 $(srcdir)/move-if-change tmp-gperf.h $(srcdir)/c-gperf.h
  
  c-decl.o : c-decl.c $(CONFIG_H) system.h $(TREE_H) c-tree.h c-common.h \
!     c-lex.h flags.h output.h toplev.h
  c-typeck.o : c-typeck.c $(CONFIG_H) system.h $(TREE_H) c-tree.h c-common.h \
      flags.h intl.h output.h $(EXPR_H) $(RTL_H) toplev.h
  c-lang.o : c-lang.c $(CONFIG_H) system.h $(TREE_H) c-tree.h c-common.h \
--- 1337,1343 ----
  	 $(srcdir)/move-if-change tmp-gperf.h $(srcdir)/c-gperf.h
  
  c-decl.o : c-decl.c $(CONFIG_H) system.h $(TREE_H) c-tree.h c-common.h \
!     c-lex.h flags.h output.h toplev.h $(RTL_H) $(EXPR_H)
  c-typeck.o : c-typeck.c $(CONFIG_H) system.h $(TREE_H) c-tree.h c-common.h \
      flags.h intl.h output.h $(EXPR_H) $(RTL_H) toplev.h
  c-lang.o : c-lang.c $(CONFIG_H) system.h $(TREE_H) c-tree.h c-common.h \
Index: c-decl.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/c-decl.c,v
retrieving revision 1.65
diff -p -r1.65 c-decl.c
*** c-decl.c	1999/08/02 23:17:03	1.65
--- c-decl.c	1999/08/03 01:02:36
*************** Boston, MA 02111-1307, USA.  */
*** 34,39 ****
--- 34,40 ----
  #include "c-tree.h"
  #include "c-lex.h"
  #include "toplev.h"
+ #include "rtl.h"
  #include "expr.h"
  
  #if USE_CPPLIB
Index: java/Makefile.in
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/java/Makefile.in,v
retrieving revision 1.37
diff -p -r1.37 Makefile.in
*** Makefile.in	1999/08/01 04:26:47	1.37
--- Makefile.in	1999/08/03 01:02:36
*************** class.o : class.c $(CONFIG_H) $(JAVA_TRE
*** 290,296 ****
  constants.o : constants.c $(CONFIG_H) $(JAVA_TREE_H) jcf.h \
    $(srcdir)/../toplev.h $(srcdir)/../system.h
  decl.o : decl.c $(CONFIG_H) $(JAVA_TREE_H) jcf.h \
!   $(srcdir)/../toplev.h $(srcdir)/../system.h $(srcdir)/../function.h
  except.o : except.c $(CONFIG_H) $(JAVA_TREE_H) jcf.h $(srcdir)/../real.h \
    $(RTL_H) javaop.h java-opcodes.h $(srcdir)/../except.h java-except.h \
    $(srcdir)/../eh-common.h $(srcdir)/../toplev.h $(srcdir)/../system.h \
--- 290,297 ----
  constants.o : constants.c $(CONFIG_H) $(JAVA_TREE_H) jcf.h \
    $(srcdir)/../toplev.h $(srcdir)/../system.h
  decl.o : decl.c $(CONFIG_H) $(JAVA_TREE_H) jcf.h \
!   $(srcdir)/../toplev.h $(srcdir)/../system.h $(srcdir)/../function.h \
!   $(RTL_H) $(EXPR_H)
  except.o : except.c $(CONFIG_H) $(JAVA_TREE_H) jcf.h $(srcdir)/../real.h \
    $(RTL_H) javaop.h java-opcodes.h $(srcdir)/../except.h java-except.h \
    $(srcdir)/../eh-common.h $(srcdir)/../toplev.h $(srcdir)/../system.h \
Index: java/decl.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/java/decl.c,v
retrieving revision 1.35
diff -p -r1.35 decl.c
*** decl.c	1999/08/02 23:14:30	1.35
--- decl.c	1999/08/03 01:02:36
*************** The Free Software Foundation is independ
*** 34,39 ****
--- 34,40 ----
  #include "toplev.h"
  #include "function.h"
  #include "except.h"
+ #include "rtl.h"
  #include "expr.h"
  
  static tree push_jvm_slot PROTO ((int, tree));


More information about the Gcc-patches mailing list