PATCH for F77 info files (was: Re: Fortran files missing)

Craig Burley burley@gnu.org
Fri Jun 19 14:39:00 GMT 1998


> Craig> Be aware I submitted a patch to do this to Dave Love on Monday, though
> Craig> whether/when he installed it, 
>
>The two tarballs I installed don't cover what I think the problem is.
>I haven't had time to do anything about it, sorry.

I'll enclose the original patches from the dl7.tar.gz file I sent...
maybe somebody can point out for me why the parts I assumed would
take care of the problem don't?  The new files system.j and toplev.j
are certainly represented, so I can't imagine how I could have gotten
those wrong (but can certainly imagine how the business of actually
adding them via CVS might be complicated).  But the second patch
(delimited with "-------"), at the very end of this email, shows
my attempt at fixing $(INCLUDES) this past Monday.

>I'm sure (some) new .j files were added, but intdoc won't build at
>present for lack of include path.

That's strange, since, with my patches, it did for me.  But sometimes
different systems have different configurations.  (I do build outside
the source dir, nowadays, FWIW.)

        tq vm, (burley)


-------- patch file P0
Mon Jun 15 22:21:57 1998  Craig Burley  <burley@gnu.org>

	Cutover to system.h:
	* Make-lang.in:
	* Makefile.in:
	* ansify.c:
	* bad.c:
	* bld.c:
	* com.c:
	* com.h:
	* expr.c:
	* fini.c:
	* g77spec.c:
	* implic.c:
	* intdoc.c:
	* intrin.c:
	* lex.c:
	* lex.h:
	* parse.c:
	* proj.c:
	* proj.h:
	* src.c:
	* src.h:
	* stb.c:
	* ste.c:
	* target.c:
	* top.c:
	* system.j: New file.

	Use toplev.h where appropriate:
	* Make-lang.in:
	* Makefile.in:
	* bad.c:
	* bld.c:
	* com.c:
	* lex.c:
	* ste.c:
	* top.c:
	* toplev.j: New file.
	
	Conditionalize all dumping/reporting routines so they don't
	get built for gcc/egcs:
	* bld.c:
	* bld.h:
	* com.c:
	* equiv.c:
	* equiv.h:
	* sta.c:
	* stt.c:
	* stt.h:
	* symbol.c:
	* symbol.h:

	Use hconfig.h instead of config.h where appropriate:
	* Makefile.in (proj-h.o): Compile with -DUSE_HCONFIG.
	* fini.c: Define USE_HCONFIG before including proj.h.

	* Makefile.in (deps-kinda): Redirect stderr to stdout,
	to eliminate diagnostics vis-a-vis g77spec.c.

	* Makefile.in: Regenerate dependencies via deps-kinda.

	* lex.c (ffelex_file_fixed, ffelex_file_free): Eliminate
	apparently spurious warnings about uninitialized variables
	`c', `column', and so on.


*** g77-e/gcc/f/Make-lang.in.~1~	Fri Jun 12 18:15:23 1998
--- g77-e/gcc/f/Make-lang.in	Mon Jun 15 21:50:55 1998
*************** F77_SRCS = \
*** 205,208 ****
--- 205,209 ----
   $(srcdir)/f/symbol.def \
   $(srcdir)/f/symbol.h \
+  $(srcdir)/f/system.j \
   $(srcdir)/f/target.c \
   $(srcdir)/f/target.h \
*************** F77_SRCS = \
*** 211,214 ****
--- 212,216 ----
   $(srcdir)/f/top.c \
   $(srcdir)/f/top.h \
+  $(srcdir)/f/toplev.j \
   $(srcdir)/f/tree.j \
   $(srcdir)/f/type.c \
*** g77-e/gcc/f/Makefile.in.~1~	Fri Jun 12 18:15:23 1998
--- g77-e/gcc/f/Makefile.in	Mon Jun 15 21:52:15 1998
*************** OUTPUT_H = $(srcdir)/output.j $(srcdir)/
*** 246,251 ****
--- 246,253 ----
  RTL_H = $(srcdir)/rtl.j $(srcdir)/../rtl.h $(srcdir)/../rtl.def \
  	$(srcdir)/../machmode.h $(srcdir)/../machmode.def
+ SYSTEM_H = $(srcdir)/system.j $(srcdir)/../system.h
  TCONFIG_H = $(srcdir)/tconfig.j ../tconfig.h
  TM_H = $(srcdir)/tm.j ../tm.h
+ TOPLEV_H = $(srcdir)/toplev.j $(srcdir)/../toplev.h
  TREE_H = $(srcdir)/tree.j $(srcdir)/../tree.h $(srcdir)/../real.h \
  	$(srcdir)/../tree.def $(srcdir)/../machmode.h $(srcdir)/../machmode.def
*************** TREE_H = $(srcdir)/tree.j $(srcdir)/../t
*** 256,429 ****
  # use HOST_CC="./xgcc -B./" to use GCC in the build directory, for example.
  #Also note that this particular build file seems to want to use
! # substitions: $(CONFIG_H) for config.h; $(TREE_H) for tree.h; and
! # $(RTL_H) for rtl.h.  deps-kinda uses a sed script to do those
  # substitutions, plus others for elegance.
  
! ansify.o: ansify.c $(ASSERT_H)
! bad.o: bad.c proj.h $(CONFIG_H) $(ASSERT_H) bad.h bad.def where.h $(GLIMITS_H) \
!  top.h malloc.h $(FLAGS_H) com.h com-rt.def $(TREE_H) bld.h bld-op.def bit.h \
!  info.h info-b.def info-k.def info-w.def target.h lex.h type.h \
!  intrin.h intrin.def lab.h symbol.h symbol.def equiv.h storag.h \
!  global.h name.h $(RTL_H)
! bit.o: bit.c proj.h $(CONFIG_H) $(ASSERT_H) $(GLIMITS_H) bit.h malloc.h
! bld.o: bld.c proj.h $(CONFIG_H) $(ASSERT_H) bld.h bld-op.def bit.h malloc.h \
!  com.h com-rt.def $(TREE_H) info.h info-b.def info-k.def info-w.def \
!  target.h bad.h bad.def where.h $(GLIMITS_H) top.h lex.h type.h lab.h \
!  storag.h symbol.h symbol.def equiv.h global.h name.h intrin.h \
!  intrin.def $(RTL_H)
! com.o: com.c proj.h $(CONFIG_H) $(ASSERT_H) $(FLAGS_H) $(RTL_H) $(TREE_H) $(OUTPUT_H) \
!  $(CONVERT_H) com.h com-rt.def bld.h bld-op.def bit.h malloc.h info.h \
!  info-b.def info-k.def info-w.def target.h bad.h bad.def where.h \
!  $(GLIMITS_H) top.h lex.h type.h intrin.h intrin.def lab.h symbol.h \
!  symbol.def equiv.h storag.h global.h name.h expr.h implic.h src.h \
!  st.h
! data.o: data.c proj.h $(CONFIG_H) $(ASSERT_H) data.h bld.h bld-op.def bit.h \
   malloc.h com.h com-rt.def $(TREE_H) info.h info-b.def info-k.def \
   info-w.def target.h bad.h bad.def where.h $(GLIMITS_H) top.h lex.h \
   type.h lab.h storag.h symbol.h symbol.def equiv.h global.h name.h \
!  intrin.h intrin.def $(RTL_H) expr.h st.h
! equiv.o: equiv.c proj.h $(CONFIG_H) $(ASSERT_H) equiv.h bld.h bld-op.def \
!  bit.h malloc.h com.h com-rt.def $(TREE_H) info.h info-b.def info-k.def \
!  info-w.def target.h bad.h bad.def where.h $(GLIMITS_H) top.h lex.h \
!  type.h lab.h storag.h symbol.h symbol.def global.h name.h intrin.h \
!  intrin.def $(RTL_H) data.h
! expr.o: expr.c proj.h $(CONFIG_H) $(ASSERT_H) expr.h bld.h bld-op.def bit.h \
!  malloc.h com.h com-rt.def $(TREE_H) info.h info-b.def info-k.def \
!  info-w.def target.h bad.h bad.def where.h $(GLIMITS_H) top.h lex.h \
!  type.h lab.h storag.h symbol.h symbol.def equiv.h global.h name.h \
!  intrin.h intrin.def $(RTL_H) implic.h src.h st.h stamp-str
! fini.o: fini.c proj.h $(CONFIG_H) $(ASSERT_H) malloc.h
! global.o: global.c proj.h $(CONFIG_H) $(ASSERT_H) global.h info.h info-b.def \
!  info-k.def info-w.def target.h $(TREE_H) bad.h bad.def where.h $(GLIMITS_H) \
!  top.h malloc.h lex.h type.h name.h symbol.h symbol.def bld.h \
!  bld-op.def bit.h com.h com-rt.def lab.h storag.h $(RTL_H) intrin.h \
!  intrin.def equiv.h
! implic.o: implic.c proj.h $(CONFIG_H) $(ASSERT_H) implic.h info.h info-b.def \
!  info-k.def info-w.def target.h $(TREE_H) bad.h bad.def where.h $(GLIMITS_H) \
!  top.h malloc.h lex.h type.h symbol.h symbol.def bld.h bld-op.def \
!  bit.h com.h com-rt.def lab.h storag.h $(RTL_H) intrin.h intrin.def \
!  equiv.h global.h name.h src.h
! info.o: info.c proj.h $(CONFIG_H) $(ASSERT_H) info.h info-b.def info-k.def \
!  info-w.def target.h $(TREE_H) bad.h bad.def where.h $(GLIMITS_H) top.h \
!  malloc.h lex.h type.h
! intdoc.o: intdoc.c $(ASSERT_H) intrin.h intrin.def intdoc.h0 intdoc.h0
! intrin.o: intrin.c proj.h $(CONFIG_H) $(ASSERT_H) intrin.h intrin.def bld.h \
   bld-op.def bit.h malloc.h com.h com-rt.def $(TREE_H) info.h info-b.def \
   info-k.def info-w.def target.h bad.h bad.def where.h $(GLIMITS_H) top.h \
   lex.h type.h lab.h storag.h symbol.h symbol.def equiv.h global.h \
!  name.h $(RTL_H) expr.h src.h
! lab.o: lab.c proj.h $(CONFIG_H) $(ASSERT_H) lab.h com.h com-rt.def $(TREE_H) \
!  bld.h bld-op.def bit.h malloc.h info.h info-b.def info-k.def \
   info-w.def target.h bad.h bad.def where.h $(GLIMITS_H) top.h lex.h \
   type.h intrin.h intrin.def symbol.h symbol.def equiv.h storag.h \
!  global.h name.h $(RTL_H)
! lex.o: lex.c proj.h $(CONFIG_H) $(ASSERT_H) top.h malloc.h where.h $(GLIMITS_H) \
!  bad.h bad.def com.h com-rt.def $(TREE_H) bld.h bld-op.def bit.h info.h \
!  info-b.def info-k.def info-w.def target.h lex.h type.h intrin.h \
!  intrin.def lab.h symbol.h symbol.def equiv.h storag.h global.h name.h \
!  $(RTL_H) src.h $(FLAGS_H) $(INPUT_H) $(OUTPUT_H)
! malloc.o: malloc.c proj.h $(CONFIG_H) $(ASSERT_H) malloc.h
! name.o: name.c proj.h $(CONFIG_H) $(ASSERT_H) bad.h bad.def where.h \
   $(GLIMITS_H) top.h malloc.h name.h global.h info.h info-b.def info-k.def \
   info-w.def target.h $(TREE_H) lex.h type.h symbol.h symbol.def bld.h \
!  bld-op.def bit.h com.h com-rt.def lab.h storag.h $(RTL_H) intrin.h \
!  intrin.def equiv.h src.h
! parse.o: parse.c proj.h $(CONFIG_H) $(ASSERT_H) top.h malloc.h where.h \
!  $(GLIMITS_H) com.h com-rt.def $(TREE_H) bld.h bld-op.def bit.h info.h \
!  info-b.def info-k.def info-w.def target.h bad.h bad.def lex.h type.h \
!  intrin.h intrin.def lab.h symbol.h symbol.def equiv.h storag.h \
!  global.h name.h $(RTL_H) version.h $(FLAGS_H)
! proj.o: proj.c proj.h $(CONFIG_H) $(ASSERT_H) $(GLIMITS_H)
! src.o: src.c proj.h $(CONFIG_H) $(ASSERT_H) src.h bad.h bad.def where.h \
!  $(GLIMITS_H) top.h malloc.h
! st.o: st.c proj.h $(CONFIG_H) $(ASSERT_H) st.h bad.h bad.def where.h \
!  $(GLIMITS_H) top.h malloc.h lex.h symbol.h symbol.def bld.h bld-op.def \
!  bit.h com.h com-rt.def $(TREE_H) info.h info-b.def info-k.def info-w.def \
!  target.h type.h lab.h storag.h $(RTL_H) intrin.h intrin.def equiv.h \
   global.h name.h sta.h stamp-str stb.h expr.h stp.h stt.h stc.h std.h \
   stv.h stw.h ste.h sts.h stu.h
! sta.o: sta.c proj.h $(CONFIG_H) $(ASSERT_H) sta.h bad.h bad.def where.h \
!  $(GLIMITS_H) top.h malloc.h lex.h stamp-str symbol.h symbol.def bld.h \
!  bld-op.def bit.h com.h com-rt.def $(TREE_H) info.h info-b.def info-k.def \
!  info-w.def target.h type.h lab.h storag.h $(RTL_H) intrin.h intrin.def \
!  equiv.h global.h name.h implic.h stb.h expr.h stp.h stt.h stc.h std.h \
!  stv.h stw.h
! stb.o: stb.c proj.h $(CONFIG_H) $(ASSERT_H) stb.h bad.h bad.def where.h \
!  $(GLIMITS_H) top.h malloc.h expr.h bld.h bld-op.def bit.h com.h \
   com-rt.def $(TREE_H) info.h info-b.def info-k.def info-w.def target.h \
   lex.h type.h lab.h storag.h symbol.h symbol.def equiv.h global.h \
!  name.h intrin.h intrin.def $(RTL_H) stp.h stt.h stamp-str src.h sta.h stc.h
! stc.o: stc.c proj.h $(CONFIG_H) $(ASSERT_H) stc.h bad.h bad.def where.h \
!  $(GLIMITS_H) top.h malloc.h bld.h bld-op.def bit.h com.h com-rt.def \
!  $(TREE_H) info.h info-b.def info-k.def info-w.def target.h lex.h type.h \
!  lab.h storag.h symbol.h symbol.def equiv.h global.h name.h intrin.h \
!  intrin.def $(RTL_H) expr.h stp.h stt.h stamp-str data.h implic.h src.h sta.h \
!  std.h stv.h stw.h
! std.o: std.c proj.h $(CONFIG_H) $(ASSERT_H) std.h bld.h bld-op.def bit.h \
!  malloc.h com.h com-rt.def $(TREE_H) info.h info-b.def info-k.def \
   info-w.def target.h bad.h bad.def where.h $(GLIMITS_H) top.h lex.h \
   type.h lab.h storag.h symbol.h symbol.def equiv.h global.h name.h \
!  intrin.h intrin.def $(RTL_H) stp.h stt.h stamp-str stv.h stw.h sta.h ste.h \
!  sts.h
! ste.o: ste.c proj.h $(CONFIG_H) $(ASSERT_H) $(RTL_H) $(TREE_H) $(OUTPUT_H) ste.h \
!  bld.h bld-op.def bit.h malloc.h com.h com-rt.def info.h info-b.def \
   info-k.def info-w.def target.h bad.h bad.def where.h $(GLIMITS_H) top.h \
!  lex.h type.h lab.h storag.h symbol.h symbol.def equiv.h global.h \
!  name.h intrin.h intrin.def stp.h stt.h stamp-str sts.h stv.h stw.h expr.h \
!  sta.h
! storag.o: storag.c proj.h $(CONFIG_H) $(ASSERT_H) storag.h bld.h bld-op.def \
   bit.h malloc.h com.h com-rt.def $(TREE_H) info.h info-b.def info-k.def \
   info-w.def target.h bad.h bad.def where.h $(GLIMITS_H) top.h lex.h \
-  type.h lab.h symbol.h symbol.def equiv.h global.h name.h intrin.h \
-  intrin.def $(RTL_H) data.h
- stp.o: stp.c proj.h $(CONFIG_H) $(ASSERT_H) stp.h bld.h bld-op.def bit.h \
-  malloc.h com.h com-rt.def $(TREE_H) info.h info-b.def info-k.def \
-  info-w.def target.h bad.h bad.def where.h $(GLIMITS_H) top.h lex.h \
   type.h lab.h storag.h symbol.h symbol.def equiv.h global.h name.h \
!  intrin.h intrin.def $(RTL_H) stt.h
! str.o: str.c proj.h $(CONFIG_H) $(ASSERT_H) src.h bad.h bad.def where.h \
!  $(GLIMITS_H) top.h malloc.h stamp-str lex.h
! sts.o: sts.c proj.h $(CONFIG_H) $(ASSERT_H) sts.h malloc.h com.h com-rt.def \
!  $(TREE_H) bld.h bld-op.def bit.h info.h info-b.def info-k.def info-w.def \
!  target.h bad.h bad.def where.h $(GLIMITS_H) top.h lex.h type.h intrin.h \
!  intrin.def lab.h symbol.h symbol.def equiv.h storag.h global.h name.h \
!  $(RTL_H)
! stt.o: stt.c proj.h $(CONFIG_H) $(ASSERT_H) stt.h top.h malloc.h where.h \
!  $(GLIMITS_H) bld.h bld-op.def bit.h com.h com-rt.def $(TREE_H) info.h \
!  info-b.def info-k.def info-w.def target.h bad.h bad.def lex.h type.h \
!  lab.h storag.h symbol.h symbol.def equiv.h global.h name.h intrin.h \
!  intrin.def $(RTL_H) stp.h expr.h sta.h stamp-str
! stu.o: stu.c proj.h $(CONFIG_H) $(ASSERT_H) bld.h bld-op.def bit.h malloc.h \
!  com.h com-rt.def $(TREE_H) info.h info-b.def info-k.def info-w.def \
!  target.h bad.h bad.def where.h $(GLIMITS_H) top.h lex.h type.h lab.h \
!  storag.h symbol.h symbol.def equiv.h global.h name.h intrin.h \
!  intrin.def $(RTL_H) implic.h stu.h sta.h stamp-str
! stv.o: stv.c proj.h $(CONFIG_H) $(ASSERT_H) stv.h lab.h com.h com-rt.def \
!  $(TREE_H) bld.h bld-op.def bit.h malloc.h info.h info-b.def info-k.def \
   info-w.def target.h bad.h bad.def where.h $(GLIMITS_H) top.h lex.h \
!  type.h intrin.h intrin.def symbol.h symbol.def equiv.h storag.h \
!  global.h name.h $(RTL_H)
! stw.o: stw.c proj.h $(CONFIG_H) $(ASSERT_H) stw.h bld.h bld-op.def bit.h \
   malloc.h com.h com-rt.def $(TREE_H) info.h info-b.def info-k.def \
   info-w.def target.h bad.h bad.def where.h $(GLIMITS_H) top.h lex.h \
   type.h lab.h storag.h symbol.h symbol.def equiv.h global.h name.h \
!  intrin.h intrin.def $(RTL_H) stv.h sta.h stamp-str
! symbol.o: symbol.c proj.h $(CONFIG_H) $(ASSERT_H) symbol.h symbol.def bld.h \
!  bld-op.def bit.h malloc.h com.h com-rt.def $(TREE_H) info.h info-b.def \
   info-k.def info-w.def target.h bad.h bad.def where.h $(GLIMITS_H) top.h \
!  lex.h type.h lab.h storag.h $(RTL_H) intrin.h intrin.def equiv.h \
!  global.h name.h src.h st.h
! target.o: target.c proj.h $(CONFIG_H) $(ASSERT_H) $(GLIMITS_H) target.h $(TREE_H) \
!  bad.h bad.def where.h top.h malloc.h info.h info-b.def info-k.def \
!  info-w.def type.h lex.h
! top.o: top.c proj.h $(CONFIG_H) $(ASSERT_H) top.h malloc.h where.h $(GLIMITS_H) \
!  bad.h bad.def bit.h bld.h bld-op.def com.h com-rt.def $(TREE_H) info.h \
!  info-b.def info-k.def info-w.def target.h lex.h type.h lab.h storag.h \
!  symbol.h symbol.def equiv.h global.h name.h intrin.h intrin.def $(RTL_H) \
!  data.h expr.h implic.h src.h st.h $(FLAGS_H)
! type.o: type.c proj.h $(CONFIG_H) $(ASSERT_H) type.h malloc.h
  version.o: version.c
! where.o: where.c proj.h $(CONFIG_H) $(ASSERT_H) where.h $(GLIMITS_H) top.h \
!  malloc.h lex.h
  
  # The rest of this list (Fortran 77 language-specific files) is hand-generated.
--- 258,432 ----
  # use HOST_CC="./xgcc -B./" to use GCC in the build directory, for example.
  #Also note that this particular build file seems to want to use
! # substitions: $(CONFIG_H) for config.h; $(TREE_H) for tree.h;
! # $(RTL_H) for rtl.h; etc..  deps-kinda uses a sed script to do those
  # substitutions, plus others for elegance.
  
! ansify.o: ansify.c $(HCONFIG_H) $(SYSTEM_H) $(ASSERT_H)
! bad.o: bad.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) bad.h bad.def where.h \
!  $(GLIMITS_H) top.h malloc.h $(FLAGS_H) com.h com-rt.def $(TREE_H) bld.h \
!  bld-op.def bit.h info.h info-b.def info-k.def info-w.def target.h \
!  lex.h type.h intrin.h intrin.def lab.h symbol.h symbol.def equiv.h \
!  storag.h global.h name.h $(TOPLEV_H)
! bit.o: bit.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) $(GLIMITS_H) bit.h \
!  malloc.h
! bld.o: bld.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) bld.h bld-op.def bit.h \
   malloc.h com.h com-rt.def $(TREE_H) info.h info-b.def info-k.def \
   info-w.def target.h bad.h bad.def where.h $(GLIMITS_H) top.h lex.h \
   type.h lab.h storag.h symbol.h symbol.def equiv.h global.h name.h \
!  intrin.h intrin.def
! com.o: com.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) $(FLAGS_H) $(RTL_H) $(TOPLEV_H) \
!  $(TREE_H) $(OUTPUT_H) $(CONVERT_H) com.h com-rt.def bld.h bld-op.def bit.h \
!  malloc.h info.h info-b.def info-k.def info-w.def target.h bad.h \
!  bad.def where.h $(GLIMITS_H) top.h lex.h type.h intrin.h intrin.def \
!  lab.h symbol.h symbol.def equiv.h storag.h global.h name.h expr.h \
!  implic.h src.h st.h
! data.o: data.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) data.h bld.h \
   bld-op.def bit.h malloc.h com.h com-rt.def $(TREE_H) info.h info-b.def \
   info-k.def info-w.def target.h bad.h bad.def where.h $(GLIMITS_H) top.h \
   lex.h type.h lab.h storag.h symbol.h symbol.def equiv.h global.h \
!  name.h intrin.h intrin.def expr.h st.h
! equiv.o: equiv.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) equiv.h bld.h \
!  bld-op.def bit.h malloc.h com.h com-rt.def $(TREE_H) info.h info-b.def \
!  info-k.def info-w.def target.h bad.h bad.def where.h $(GLIMITS_H) top.h \
!  lex.h type.h lab.h storag.h symbol.h symbol.def global.h name.h \
!  intrin.h intrin.def data.h
! expr.o: expr.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) expr.h bld.h \
!  bld-op.def bit.h malloc.h com.h com-rt.def $(TREE_H) info.h info-b.def \
!  info-k.def info-w.def target.h bad.h bad.def where.h $(GLIMITS_H) top.h \
!  lex.h type.h lab.h storag.h symbol.h symbol.def equiv.h global.h \
!  name.h intrin.h intrin.def implic.h src.h st.h stamp-str
! fini.o: fini.c proj.h $(HCONFIG_H) $(SYSTEM_H) $(ASSERT_H) malloc.h
! global.o: global.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) global.h info.h \
!  info-b.def info-k.def info-w.def target.h $(TREE_H) bad.h bad.def \
!  where.h $(GLIMITS_H) top.h malloc.h lex.h type.h name.h symbol.h \
!  symbol.def bld.h bld-op.def bit.h com.h com-rt.def lab.h storag.h \
!  intrin.h intrin.def equiv.h
! implic.o: implic.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) implic.h info.h \
!  info-b.def info-k.def info-w.def target.h $(TREE_H) bad.h bad.def \
!  where.h $(GLIMITS_H) top.h malloc.h lex.h type.h symbol.h symbol.def \
!  bld.h bld-op.def bit.h com.h com-rt.def lab.h storag.h intrin.h \
!  intrin.def equiv.h global.h name.h src.h
! info.o: info.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) info.h info-b.def \
!  info-k.def info-w.def target.h $(TREE_H) bad.h bad.def where.h $(GLIMITS_H) \
!  top.h malloc.h lex.h type.h
! intdoc.o: intdoc.c $(HCONFIG_H) $(SYSTEM_H) $(ASSERT_H) intrin.h intrin.def \
!  intdoc.h0 intdoc.h0
! intrin.o: intrin.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) intrin.h \
!  intrin.def bld.h bld-op.def bit.h malloc.h com.h com-rt.def $(TREE_H) \
!  info.h info-b.def info-k.def info-w.def target.h bad.h bad.def \
!  where.h $(GLIMITS_H) top.h lex.h type.h lab.h storag.h symbol.h \
!  symbol.def equiv.h global.h name.h expr.h src.h
! lab.o: lab.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) lab.h com.h com-rt.def \
!  $(TREE_H) bld.h bld-op.def bit.h malloc.h info.h info-b.def info-k.def \
   info-w.def target.h bad.h bad.def where.h $(GLIMITS_H) top.h lex.h \
   type.h intrin.h intrin.def symbol.h symbol.def equiv.h storag.h \
!  global.h name.h
! lex.o: lex.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) top.h malloc.h where.h \
!  $(GLIMITS_H) bad.h bad.def com.h com-rt.def $(TREE_H) bld.h bld-op.def \
!  bit.h info.h info-b.def info-k.def info-w.def target.h lex.h type.h \
!  intrin.h intrin.def lab.h symbol.h symbol.def equiv.h storag.h \
!  global.h name.h src.h $(FLAGS_H) $(INPUT_H) $(TOPLEV_H) $(OUTPUT_H)
! malloc.o: malloc.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) malloc.h
! name.o: name.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) bad.h bad.def where.h \
   $(GLIMITS_H) top.h malloc.h name.h global.h info.h info-b.def info-k.def \
   info-w.def target.h $(TREE_H) lex.h type.h symbol.h symbol.def bld.h \
!  bld-op.def bit.h com.h com-rt.def lab.h storag.h intrin.h intrin.def \
!  equiv.h src.h
! parse.o: parse.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) top.h malloc.h \
!  where.h $(GLIMITS_H) com.h com-rt.def $(TREE_H) bld.h bld-op.def bit.h \
!  info.h info-b.def info-k.def info-w.def target.h bad.h bad.def lex.h \
!  type.h intrin.h intrin.def lab.h symbol.h symbol.def equiv.h storag.h \
!  global.h name.h version.h $(FLAGS_H)
! proj.o: proj.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) $(GLIMITS_H)
! src.o: src.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) src.h bad.h bad.def \
!  where.h $(GLIMITS_H) top.h malloc.h
! st.o: st.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) st.h bad.h bad.def \
!  where.h $(GLIMITS_H) top.h malloc.h lex.h symbol.h symbol.def bld.h \
!  bld-op.def bit.h com.h com-rt.def $(TREE_H) info.h info-b.def info-k.def \
!  info-w.def target.h type.h lab.h storag.h intrin.h intrin.def equiv.h \
   global.h name.h sta.h stamp-str stb.h expr.h stp.h stt.h stc.h std.h \
   stv.h stw.h ste.h sts.h stu.h
! sta.o: sta.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) sta.h bad.h bad.def \
!  where.h $(GLIMITS_H) top.h malloc.h lex.h stamp-str symbol.h symbol.def \
!  bld.h bld-op.def bit.h com.h com-rt.def $(TREE_H) info.h info-b.def \
!  info-k.def info-w.def target.h type.h lab.h storag.h intrin.h \
!  intrin.def equiv.h global.h name.h implic.h stb.h expr.h stp.h stt.h \
!  stc.h std.h stv.h stw.h
! stb.o: stb.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) stb.h bad.h bad.def \
!  where.h $(GLIMITS_H) top.h malloc.h expr.h bld.h bld-op.def bit.h com.h \
   com-rt.def $(TREE_H) info.h info-b.def info-k.def info-w.def target.h \
   lex.h type.h lab.h storag.h symbol.h symbol.def equiv.h global.h \
!  name.h intrin.h intrin.def stp.h stt.h stamp-str src.h sta.h stc.h
! stc.o: stc.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) stc.h bad.h bad.def \
!  where.h $(GLIMITS_H) top.h malloc.h bld.h bld-op.def bit.h com.h \
!  com-rt.def $(TREE_H) info.h info-b.def info-k.def info-w.def target.h \
!  lex.h type.h lab.h storag.h symbol.h symbol.def equiv.h global.h \
!  name.h intrin.h intrin.def expr.h stp.h stt.h stamp-str data.h implic.h \
!  src.h sta.h std.h stv.h stw.h
! std.o: std.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) std.h bld.h bld-op.def \
!  bit.h malloc.h com.h com-rt.def $(TREE_H) info.h info-b.def info-k.def \
   info-w.def target.h bad.h bad.def where.h $(GLIMITS_H) top.h lex.h \
   type.h lab.h storag.h symbol.h symbol.def equiv.h global.h name.h \
!  intrin.h intrin.def stp.h stt.h stamp-str stv.h stw.h sta.h ste.h sts.h
! ste.o: ste.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) $(RTL_H) $(TOPLEV_H) ste.h \
!  bld.h bld-op.def bit.h malloc.h com.h com-rt.def $(TREE_H) info.h \
!  info-b.def info-k.def info-w.def target.h bad.h bad.def where.h \
!  $(GLIMITS_H) top.h lex.h type.h lab.h storag.h symbol.h symbol.def \
!  equiv.h global.h name.h intrin.h intrin.def stp.h stt.h stamp-str sts.h \
!  stv.h stw.h expr.h sta.h
! storag.o: storag.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) storag.h bld.h \
!  bld-op.def bit.h malloc.h com.h com-rt.def $(TREE_H) info.h info-b.def \
   info-k.def info-w.def target.h bad.h bad.def where.h $(GLIMITS_H) top.h \
!  lex.h type.h lab.h symbol.h symbol.def equiv.h global.h name.h \
!  intrin.h intrin.def data.h
! stp.o: stp.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) stp.h bld.h bld-op.def \
   bit.h malloc.h com.h com-rt.def $(TREE_H) info.h info-b.def info-k.def \
   info-w.def target.h bad.h bad.def where.h $(GLIMITS_H) top.h lex.h \
   type.h lab.h storag.h symbol.h symbol.def equiv.h global.h name.h \
!  intrin.h intrin.def stt.h
! str.o: str.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) src.h bad.h bad.def \
!  where.h $(GLIMITS_H) top.h malloc.h stamp-str lex.h
! sts.o: sts.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) sts.h malloc.h com.h \
!  com-rt.def $(TREE_H) bld.h bld-op.def bit.h info.h info-b.def info-k.def \
   info-w.def target.h bad.h bad.def where.h $(GLIMITS_H) top.h lex.h \
!  type.h intrin.h intrin.def lab.h symbol.h symbol.def equiv.h storag.h \
!  global.h name.h
! stt.o: stt.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) stt.h top.h malloc.h \
!  where.h $(GLIMITS_H) bld.h bld-op.def bit.h com.h com-rt.def $(TREE_H) \
!  info.h info-b.def info-k.def info-w.def target.h bad.h bad.def lex.h \
!  type.h lab.h storag.h symbol.h symbol.def equiv.h global.h name.h \
!  intrin.h intrin.def stp.h expr.h sta.h stamp-str
! stu.o: stu.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) bld.h bld-op.def bit.h \
   malloc.h com.h com-rt.def $(TREE_H) info.h info-b.def info-k.def \
   info-w.def target.h bad.h bad.def where.h $(GLIMITS_H) top.h lex.h \
   type.h lab.h storag.h symbol.h symbol.def equiv.h global.h name.h \
!  intrin.h intrin.def implic.h stu.h sta.h stamp-str
! stv.o: stv.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) stv.h lab.h com.h \
!  com-rt.def $(TREE_H) bld.h bld-op.def bit.h malloc.h info.h info-b.def \
   info-k.def info-w.def target.h bad.h bad.def where.h $(GLIMITS_H) top.h \
!  lex.h type.h intrin.h intrin.def symbol.h symbol.def equiv.h storag.h \
!  global.h name.h
! stw.o: stw.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) stw.h bld.h bld-op.def \
!  bit.h malloc.h com.h com-rt.def $(TREE_H) info.h info-b.def info-k.def \
!  info-w.def target.h bad.h bad.def where.h $(GLIMITS_H) top.h lex.h \
!  type.h lab.h storag.h symbol.h symbol.def equiv.h global.h name.h \
!  intrin.h intrin.def stv.h sta.h stamp-str
! symbol.o: symbol.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) symbol.h \
!  symbol.def bld.h bld-op.def bit.h malloc.h com.h com-rt.def $(TREE_H) \
!  info.h info-b.def info-k.def info-w.def target.h bad.h bad.def \
!  where.h $(GLIMITS_H) top.h lex.h type.h lab.h storag.h intrin.h \
!  intrin.def equiv.h global.h name.h src.h st.h
! target.o: target.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) $(GLIMITS_H) \
!  target.h $(TREE_H) bad.h bad.def where.h top.h malloc.h info.h \
!  info-b.def info-k.def info-w.def type.h lex.h
! top.o: top.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) top.h malloc.h where.h \
!  $(GLIMITS_H) bad.h bad.def bit.h bld.h bld-op.def com.h com-rt.def \
!  $(TREE_H) info.h info-b.def info-k.def info-w.def target.h lex.h type.h \
!  lab.h storag.h symbol.h symbol.def equiv.h global.h name.h intrin.h \
!  intrin.def data.h expr.h implic.h src.h st.h $(FLAGS_H) $(TOPLEV_H)
! type.o: type.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) type.h malloc.h
  version.o: version.c
! where.o: where.c proj.h $(CONFIG_H) $(SYSTEM_H) $(ASSERT_H) where.h $(GLIMITS_H) \
!  top.h malloc.h lex.h
  
  # The rest of this list (Fortran 77 language-specific files) is hand-generated.
*************** fini.o:
*** 463,467 ****
  
  proj-h.o: proj.o
! 	$(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) \
  	      `echo $(srcdir)/proj.c | sed 's,^\./,,'` -o $@
  
--- 466,470 ----
  
  proj-h.o: proj.o
! 	$(HOST_CC) -c -DUSE_HCONFIG $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) \
  	      `echo $(srcdir)/proj.c | sed 's,^\./,,'` -o $@
  
*************** proj-h.o: proj.o
*** 485,489 ****
  MG=-MG
  deps-kinda:
! 	$(HOST_CC) -DMAKING_DEPENDENCIES -MM $(MG) *.c | \
  	  sed -e 's: \([.]/\)*assert[.]j: $$(ASSERT_H):g' \
  	      -e 's: \([.]/\)*config[.]j: $$(CONFIG_H):g' \
--- 488,492 ----
  MG=-MG
  deps-kinda:
! 	$(HOST_CC) -DMAKING_DEPENDENCIES -MM $(MG) *.c 2>&1 | \
  	  sed -e 's: \([.]/\)*assert[.]j: $$(ASSERT_H):g' \
  	      -e 's: \([.]/\)*config[.]j: $$(CONFIG_H):g' \
*************** deps-kinda:
*** 495,500 ****
--- 498,505 ----
  	      -e 's: \([.]/\)*output[.]j: $$(OUTPUT_H):g' \
  	      -e 's: \([.]/\)*rtl[.]j: $$(RTL_H):g' \
+ 	      -e 's: \([.]/\)*system[.]j: $$(SYSTEM_H):g' \
  	      -e 's: \([.]/\)*tconfig[.]j: $$(TCONFIG_H):g' \
  	      -e 's: \([.]/\)*tm[.]j: $$(TM_H):g' \
+ 	      -e 's: \([.]/\)*toplev[.]j: $$(TOPLEV_H):g' \
  	      -e 's: \([.]/\)*tree[.]j: $$(TREE_H):g' \
  	      -e 's: \([.]/\)*str[.]h: stamp-str:g' \
*** g77-e/gcc/f/ansify.c.~1~	Tue May 19 06:49:08 1998
--- g77-e/gcc/f/ansify.c	Mon Jun 15 22:00:04 1998
*************** the Free Software Foundation, 59 Temple 
*** 23,32 ****
     support that, and we want *this* program to be compilable
     by pretty much any C compiler.  */
! 
! #include "assert.j"		/* Use gcc's assert.h. */
! #include <stdio.h>
  #include <stddef.h>
- #include <stdlib.h>
- #include <string.h>
  
  typedef enum
--- 23,30 ----
     support that, and we want *this* program to be compilable
     by pretty much any C compiler.  */
! #include "hconfig.j"
! #include "system.j"
! #include "assert.j"
  #include <stddef.h>
  
  typedef enum
*** g77-e/gcc/f/bad.c.~1~	Fri Jun 12 18:15:23 1998
--- g77-e/gcc/f/bad.c	Mon Jun 15 21:32:44 1998
*************** the Free Software Foundation, 59 Temple 
*** 38,45 ****
  
  #include "proj.h"
- #include <ctype.h>
  #include "bad.h"
  #include "flags.j"
  #include "com.h"
  #include "where.h"
  
--- 38,45 ----
  
  #include "proj.h"
  #include "bad.h"
  #include "flags.j"
  #include "com.h"
+ #include "toplev.j"
  #include "where.h"
  
*************** ffebad_finish ()
*** 458,462 ****
      {
        /* Didn't output "warning:" string, capitalize it for message.  */
!       if ((s[0] != '\0') && isalpha (s[0]) && islower (s[0]))
  	{
  	  char c;
--- 458,462 ----
      {
        /* Didn't output "warning:" string, capitalize it for message.  */
!       if ((s[0] != '\0') && ISALPHA (s[0]) && ISLOWER (s[0]))
  	{
  	  char c;
*************** ffebad_finish ()
*** 487,491 ****
  	{
  	  c = ffebad_message_[++i];
! 	  if (isalpha (c) && isupper (c))
  	    {
  	      index = c - 'A';
--- 487,491 ----
  	{
  	  c = ffebad_message_[++i];
! 	  if (ISALPHA (c) && ISUPPER (c))
  	    {
  	      index = c - 'A';
*************** ffebad_finish ()
*** 505,509 ****
  		}
  	    }
! 	  else if (isdigit (c))
  	    {
  	      index = c - '0';
--- 505,509 ----
  		}
  	    }
! 	  else if (ISDIGIT (c))
  	    {
  	      index = c - '0';
*** g77-e/gcc/f/bld.c.~1~	Tue May 19 06:49:16 1998
--- g77-e/gcc/f/bld.c	Mon Jun 15 22:03:21 1998
*************** the Free Software Foundation, 59 Temple 
*** 37,41 ****
  
  #include "proj.h"
- #include <ctype.h>
  #include "bld.h"
  #include "bit.h"
--- 37,40 ----
*************** ffebld_constant_cmp (ffebldConstant c1, 
*** 447,450 ****
--- 446,450 ----
     Displays the constant in summary form.  */
  
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  void
  ffebld_constant_dump (ffebldConstant c)
*************** ffebld_constant_dump (ffebldConstant c)
*** 864,867 ****
--- 864,868 ----
      }
  }
+ #endif
  
  /* ffebld_constant_is_magical -- Determine if integer is "magical"
*************** ffebld_constant_new_typeless_val (ffebld
*** 2003,2006 ****
--- 2004,2008 ----
     constant at a particular offset is valid.  */
  
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  void
  ffebld_constantarray_dump (ffebldConstantArray array, ffeinfoBasictype bt,
*************** ffebld_constantarray_dump (ffebldConstan
*** 2058,2061 ****
--- 2060,2064 ----
  
  }
+ #endif
  
  /* ffebld_constantarray_get -- Get a value from an array of constants
*************** ffebld_constantarray_put (ffebldConstant
*** 4410,4413 ****
--- 4413,4417 ----
     See prototype.  */
  
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  void
  ffebld_constantunion_dump (ffebldConstantUnion u, ffeinfoBasictype bt,
*************** ffebld_constantunion_dump (ffebldConstan
*** 4738,4741 ****
--- 4742,4746 ----
      }
  }
+ #endif
  
  /* ffebld_dump -- Dump expression tree in concise form
*************** ffebld_constantunion_dump (ffebldConstan
*** 4744,4747 ****
--- 4749,4753 ----
     ffebld_dump(b);  */
  
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  void
  ffebld_dump (ffebld b)
*************** ffebld_dump (ffebld b)
*** 4871,4874 ****
--- 4877,4881 ----
      }
  }
+ #endif
  
  /* ffebld_dump_prefix -- Dump the prefix for a constant of a given type
*************** ffebld_dump (ffebld b)
*** 4877,4880 ****
--- 4884,4888 ----
  	 FFEINFO_kindtypeINTEGER1);  */
  
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  void
  ffebld_dump_prefix (FILE *out, ffeinfoBasictype bt, ffeinfoKindtype kt)
*************** ffebld_dump_prefix (FILE *out, ffeinfoBa
*** 5173,5176 ****
--- 5181,5185 ----
      }
  }
+ #endif
  
  /* ffebld_init_0 -- Initialize the module
*** g77-e/gcc/f/bld.h.~1~	Tue May 19 06:49:17 1998
--- g77-e/gcc/f/bld.h	Mon Jun 15 22:02:28 1998
*************** extern struct _ffebld_pool_stack_ ffebld
*** 478,482 ****
--- 478,484 ----
  
  int ffebld_constant_cmp (ffebldConstant c1, ffebldConstant c2);
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  void ffebld_constant_dump (ffebldConstant c);
+ #endif
  bool ffebld_constant_is_magical (ffebldConstant c);
  bool ffebld_constant_is_zero (ffebldConstant c);
*************** ffebldConstant ffebld_constant_new_typel
*** 681,686 ****
--- 683,690 ----
  						 ffetargetTypeless val);
  ffebldConstant ffebld_constant_negated (ffebldConstant c);
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  void ffebld_constantarray_dump (ffebldConstantArray array, ffeinfoBasictype bt,
  		     ffeinfoKindtype kt, ffetargetOffset size, ffebit bits);
+ #endif
  ffebldConstantUnion ffebld_constantarray_get (ffebldConstantArray array,
  	   ffeinfoBasictype bt, ffeinfoKindtype kt, ffetargetOffset offset);
*************** void ffebld_constantarray_preparray (voi
*** 699,706 ****
--- 703,712 ----
  void ffebld_constantarray_put (ffebldConstantArray array, ffeinfoBasictype bt,
    ffeinfoKindtype kt, ffetargetOffset offset, ffebldConstantUnion constant);
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  void ffebld_constantunion_dump (ffebldConstantUnion u, ffeinfoBasictype bt,
  				ffeinfoKindtype kt);
  void ffebld_dump (ffebld b);
  void ffebld_dump_prefix (FILE *out, ffeinfoBasictype bt, ffeinfoKindtype kt);
+ #endif
  void ffebld_init_0 (void);
  void ffebld_init_1 (void);
*** g77-e/gcc/f/com.c.~1~	Fri Jun 12 18:15:23 1998
--- g77-e/gcc/f/com.c	Mon Jun 15 22:15:54 1998
*************** the Free Software Foundation, 59 Temple 
*** 88,94 ****
  #include "proj.h"
  #if FFECOM_targetCURRENT == FFECOM_targetGCC
- #include "config.j"
  #include "flags.j"
  #include "rtl.j"
  #include "tree.j"
  #include "output.j"  /* Must follow tree.j so TREE_CODE is defined! */
--- 88,94 ----
  #include "proj.h"
  #if FFECOM_targetCURRENT == FFECOM_targetGCC
  #include "flags.j"
  #include "rtl.j"
+ #include "toplev.j"
  #include "tree.j"
  #include "output.j"  /* Must follow tree.j so TREE_CODE is defined! */
*************** ffecom_end_transition ()
*** 11485,11489 ****
--- 11485,11491 ----
      {
        ffestorag_report ();
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
        ffesymbol_report_all ();
+ #endif
      }
  
*************** ffecom_exec_transition ()
*** 11570,11574 ****
--- 11572,11578 ----
      {
        ffestorag_report ();
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
        ffesymbol_report_all ();
+ #endif
      }
  
*** g77-e/gcc/f/com.h.~1~	Fri Jun 12 18:15:23 1998
--- g77-e/gcc/f/com.h	Mon Jun 15 21:16:57 1998
*************** the Free Software Foundation, 59 Temple 
*** 84,89 ****
     will probably be bugs, some of them difficult to detect or even trigger.  */
  
- #include "config.j"
- 
  /* Do we need int (for 32-bit or 64-bit systems) or long (16-bit or
     normally 32-bit) for f2c-type integers? */
--- 84,87 ----
*** g77-e/gcc/f/equiv.c.~1~	Tue May 19 06:49:26 1998
--- g77-e/gcc/f/equiv.c	Mon Jun 15 22:04:55 1998
*************** ffeequiv_add (ffeequiv eq, ffebld list, 
*** 867,870 ****
--- 867,871 ----
     ffeequiv_dump(eq);  */
  
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  void
  ffeequiv_dump (ffeequiv eq)
*************** ffeequiv_dump (ffeequiv eq)
*** 874,877 ****
--- 875,879 ----
    ffebld_dump (ffeequiv_list (eq));
  }
+ #endif
  
  /* ffeequiv_exec_transition -- Do the hard work on all the equivalence objects
*** g77-e/gcc/f/equiv.h.~1~	Tue May 19 06:49:27 1998
--- g77-e/gcc/f/equiv.h	Mon Jun 15 22:04:59 1998
*************** struct _ffeequiv_
*** 63,67 ****
--- 63,69 ----
  
  void ffeequiv_add (ffeequiv eq, ffebld list, ffelexToken t);
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  void ffeequiv_dump (ffeequiv eq);
+ #endif
  void ffeequiv_exec_transition (void);
  void ffeequiv_init_2 (void);
*** g77-e/gcc/f/expr.c.~1~	Thu Jun  4 06:41:17 1998
--- g77-e/gcc/f/expr.c	Mon Jun 15 21:32:55 1998
*************** the Free Software Foundation, 59 Temple 
*** 32,36 ****
  
  #include "proj.h"
- #include <ctype.h>
  #include "expr.h"
  #include "bad.h"
--- 32,35 ----
*************** ffeexpr_isdigits_ (char *p)
*** 9478,9482 ****
  {
    for (; *p != '\0'; ++p)
!     if (!isdigit (*p))
        return FALSE;
    return TRUE;
--- 9477,9481 ----
  {
    for (; *p != '\0'; ++p)
!     if (! ISDIGIT (*p))
        return FALSE;
    return TRUE;
*** g77-e/gcc/f/fini.c.~1~	Tue May 19 06:49:31 1998
--- g77-e/gcc/f/fini.c	Mon Jun 15 21:43:10 1998
*************** the Free Software Foundation, 59 Temple 
*** 20,25 ****
  02111-1307, USA.  */
  
  #include "proj.h"
- #include <ctype.h>
  #include "malloc.h"
  
--- 20,25 ----
  02111-1307, USA.  */
  
+ #define USE_HCONFIG
  #include "proj.h"
  #include "malloc.h"
  
*************** main (int argc, char **argv)
*** 307,311 ****
        else if (cc != EOF)
  	{
! 	  while (((cc = getc (in)) != EOF) && (!isalnum (cc)))
  	    ;
  	  ungetc (cc, in);
--- 307,311 ----
        else if (cc != EOF)
  	{
! 	  while (((cc = getc (in)) != EOF) && (! ISALNUM (cc)))
  	    ;
  	  ungetc (cc, in);
*************** main (int argc, char **argv)
*** 378,382 ****
  	{
  	  cc = buf[i];
! 	  if (isascii (cc) && isalpha (cc))
  	    {
  	      newname->name_uc[i] = toupper (cc);
--- 378,382 ----
  	{
  	  cc = buf[i];
! 	  if (ISALPHA (cc))
  	    {
  	      newname->name_uc[i] = toupper (cc);
*** g77-e/gcc/f/g77spec.c.~1~	Sat Jun 13 03:55:02 1998
--- g77-e/gcc/f/g77spec.c	Mon Jun 15 21:23:30 1998
*************** Boston, MA 02111-1307, USA.  */
*** 46,63 ****
  
  #include "config.h"
! 
! #include <sys/types.h>
! #include <stdio.h>
! 
  #include "gansidecl.h"
- 
- #ifdef HAVE_STDLIB_H
- #include <stdlib.h>
- #endif
- 
- #ifdef HAVE_STRING_H
- #include <string.h>
- #endif
- 
  #include <f/version.h>
  
--- 46,51 ----
  
  #include "config.h"
! #include "system.h"
  #include "gansidecl.h"
  #include <f/version.h>
  
*** g77-e/gcc/f/implic.c.~1~	Tue May 19 06:49:37 1998
--- g77-e/gcc/f/implic.c	Mon Jun 15 21:29:53 1998
*************** the Free Software Foundation, 59 Temple 
*** 32,36 ****
  
  #include "proj.h"
- #include <ctype.h>
  #include "implic.h"
  #include "info.h"
--- 32,35 ----
*************** ffeimplic_lookup_ (char c)
*** 94,98 ****
  {
    /* NOTE: This is definitely ASCII-specific!!  */
!   if (isalpha (c) || (c == '_'))
      return &ffeimplic_table_[c - 'A'];
    return NULL;
--- 93,97 ----
  {
    /* NOTE: This is definitely ASCII-specific!!  */
!   if (ISALPHA (c) || (c == '_'))
      return &ffeimplic_table_[c - 'A'];
    return NULL;
*** g77-e/gcc/f/intdoc.c.~1~	Fri Jun 12 18:15:24 1998
--- g77-e/gcc/f/intdoc.c	Mon Jun 15 22:00:11 1998
*************** the Free Software Foundation, 59 Temple 
*** 21,34 ****
  
  /* From f/proj.h, which uses #error -- not all C compilers
!    support that, and we want _this_ program to be compilable
     by pretty much any C compiler.  */
! 
! #include "assert.j"		/* Use gcc's assert.h. */
! #include <stdio.h>
  #include <stddef.h>
- #include <stdlib.h>
- #include <string.h>
- #define FFEINTRIN_DOC 1
- #include "intrin.h"
  
  typedef enum
--- 21,30 ----
  
  /* From f/proj.h, which uses #error -- not all C compilers
!    support that, and we want *this* program to be compilable
     by pretty much any C compiler.  */
! #include "hconfig.j"
! #include "system.j"
! #include "assert.j"
  #include <stddef.h>
  
  typedef enum
*************** typedef enum
*** 44,47 ****
--- 40,47 ----
  
  #define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
+ 
+ /* Pull in the intrinsics info, but only the doc parts.  */
+ #define FFEINTRIN_DOC 1
+ #include "intrin.h"
  
  char *family_name (ffeintrinFamily family);
*** g77-e/gcc/f/intrin.c.~1~	Tue May 19 06:49:45 1998
--- g77-e/gcc/f/intrin.c	Mon Jun 15 22:06:24 1998
*************** the Free Software Foundation, 59 Temple 
*** 23,27 ****
  
  #include "proj.h"
- #include <ctype.h>
  #include "intrin.h"
  #include "expr.h"
--- 23,26 ----
*************** ffeintrin_init_0 ()
*** 1554,1562 ****
        for (; *p1 != '\0' && *p2 != '\0' && *p3 != '\0'; ++p1, ++p2, ++p3)
  	{
! 	  if (!isascii (*p1) || !isascii (*p2) || !isascii (*p3))
  	    break;
! 	  if ((isdigit (*p1) || (*p1 == '_')) && (*p1 == *p2) && (*p1 == *p3))
  	    continue;
! 	  if (!isupper (*p1) || !islower (*p2)
  	      || (*p1 != toupper (*p2)) || ((*p3 != *p1) && (*p3 != *p2)))
  	    break;
--- 1553,1563 ----
        for (; *p1 != '\0' && *p2 != '\0' && *p3 != '\0'; ++p1, ++p2, ++p3)
  	{
! 	  if (! IN_CTYPE_DOMAIN (*p1)
! 	      || ! IN_CTYPE_DOMAIN (*p2)
! 	      || ! IN_CTYPE_DOMAIN (*p3))
  	    break;
! 	  if ((ISDIGIT (*p1) || (*p1 == '_')) && (*p1 == *p2) && (*p1 == *p3))
  	    continue;
! 	  if (! ISUPPER (*p1) || ! ISLOWER (*p2)
  	      || (*p1 != toupper (*p2)) || ((*p3 != *p1) && (*p3 != *p2)))
  	    break;
*** g77-e/gcc/f/lex.c.~1~	Fri Jun 12 18:15:24 1998
--- g77-e/gcc/f/lex.c	Mon Jun 15 22:08:47 1998
*************** the Free Software Foundation, 59 Temple 
*** 21,25 ****
  
  #include "proj.h"
- #include <ctype.h>
  #include "top.h"
  #include "bad.h"
--- 21,24 ----
*************** the Free Software Foundation, 59 Temple 
*** 29,35 ****
  #include "src.h"
  #if FFECOM_targetCURRENT == FFECOM_targetGCC
- #include "config.j"
  #include "flags.j"
  #include "input.j"
  #include "tree.j"
  #include "output.j"  /* Must follow tree.j so TREE_CODE is defined! */
--- 28,34 ----
  #include "src.h"
  #if FFECOM_targetCURRENT == FFECOM_targetGCC
  #include "flags.j"
  #include "input.j"
+ #include "toplev.j"
  #include "tree.j"
  #include "output.j"  /* Must follow tree.j so TREE_CODE is defined! */
*************** ffelex_cfelex_ (ffelexToken *xtoken, FIL
*** 771,775 ****
  	    }
  	  c = ffelex_getc_ (finput);
! 	  if (!isdigit (c))
  	    break;
  	}
--- 770,774 ----
  	    }
  	  c = ffelex_getc_ (finput);
! 	  if (! ISDIGIT (c))
  	    break;
  	}
*************** ffelexHandler
*** 1813,1820 ****
  ffelex_file_fixed (ffewhereFile wf, FILE *f)
  {
!   register int c;		/* Character currently under consideration. */
!   register ffewhereColumnNumber column;	/* Not really; 0 means column 1... */
    bool disallow_continuation_line;
!   bool ignore_disallowed_continuation;
    int latest_char_in_file = 0;	/* For getting back into comment-skipping
  				   code. */
--- 1812,1819 ----
  ffelex_file_fixed (ffewhereFile wf, FILE *f)
  {
!   register int c = 0;		/* Character currently under consideration. */
!   register ffewhereColumnNumber column = 0;	/* Not really; 0 means column 1... */
    bool disallow_continuation_line;
!   bool ignore_disallowed_continuation = FALSE;
    int latest_char_in_file = 0;	/* For getting back into comment-skipping
  				   code. */
*************** ffelexHandler
*** 3034,3042 ****
  ffelex_file_free (ffewhereFile wf, FILE *f)
  {
!   register int c;		/* Character currently under consideration. */
!   register ffewhereColumnNumber column;	/* Not really; 0 means column 1... */
!   bool continuation_line;
    ffewhereColumnNumber continuation_column;
!   int latest_char_in_file;	/* For getting back into comment-skipping
  				   code. */
  
--- 3033,3041 ----
  ffelex_file_free (ffewhereFile wf, FILE *f)
  {
!   register int c = 0;		/* Character currently under consideration. */
!   register ffewhereColumnNumber column = 0;	/* Not really; 0 means column 1... */
!   bool continuation_line = FALSE;
    ffewhereColumnNumber continuation_column;
!   int latest_char_in_file = 0;	/* For getting back into comment-skipping
  				   code. */
  
*************** ffelex_splice_tokens (ffelexHandler firs
*** 4315,4319 ****
    while (*p != '\0')
      {
!       if (isdigit (*p))
  	{
  	  t = ffelex_token_number_from_names (master, i);
--- 4319,4323 ----
    while (*p != '\0')
      {
!       if (ISDIGIT (*p))
  	{
  	  t = ffelex_token_number_from_names (master, i);
*** g77-e/gcc/f/lex.h.~1~	Tue May 19 06:49:52 1998
--- g77-e/gcc/f/lex.h	Mon Jun 15 21:29:53 1998
*************** typedef lex_sigh__ (*ffelexHandler) (ffe
*** 93,97 ****
  /* Include files needed by this one. */
  
- #include <ctype.h>
  #include "top.h"
  #include "where.h"
--- 93,96 ----
*************** ffelexToken ffelex_token_use (ffelexToke
*** 174,178 ****
  #define ffelex_init_4()
  #define ffelex_is_firstnamechar(c) \
!   (isalpha ((c)) || ((c) == '_'))
  #define ffelex_terminate_0()
  #define ffelex_terminate_1()
--- 173,177 ----
  #define ffelex_init_4()
  #define ffelex_is_firstnamechar(c) \
!   (ISALPHA ((c)) || ((c) == '_'))
  #define ffelex_terminate_0()
  #define ffelex_terminate_1()
*** g77-e/gcc/f/parse.c.~1~	Tue May 19 06:49:57 1998
--- g77-e/gcc/f/parse.c	Mon Jun 15 21:19:31 1998
*************** the Free Software Foundation, 59 Temple 
*** 21,26 ****
  
  #include "proj.h"
- #include <ctype.h>
- #include <signal.h>
  #include "top.h"
  #include "com.h"
--- 21,24 ----
*** g77-e/gcc/f/proj.c.~1~	Tue May 19 06:49:59 1998
--- g77-e/gcc/f/proj.c	Mon Jun 15 21:33:01 1998
*************** the Free Software Foundation, 59 Temple 
*** 21,25 ****
  
  #include "proj.h"
- #include <ctype.h>
  #include "glimits.j"
  
--- 21,24 ----
*************** strtoul (const char *nptr, char **endptr
*** 34,38 ****
    assert (endptr == NULL);
  
!   while (isdigit (*nptr))
      {
        number = old_number * 10 + (*(nptr++) - '0');
--- 33,37 ----
    assert (endptr == NULL);
  
!   while (ISDIGIT (*nptr))
      {
        number = old_number * 10 + (*(nptr++) - '0');
*** g77-e/gcc/f/proj.h.~1~	Fri Jun 12 18:15:24 1998
--- g77-e/gcc/f/proj.h	Mon Jun 15 21:59:41 1998
*************** the Free Software Foundation, 59 Temple 
*** 25,28 ****
--- 25,35 ----
  #define _H_f_proj
  
+ #ifdef USE_HCONFIG
+ #include "hconfig.j"
+ #else
+ #include "config.j"
+ #endif
+ #include "system.j"
+ 
  #if !defined (__GNUC__) || (__GNUC__ < 2)
  #error "You have to use gcc 2.x to build g77 (might be fixed in g77-0.6)."
*************** the Free Software Foundation, 59 Temple 
*** 37,52 ****
  #endif	/* !defined (BUILT_WITH_270) */
  
! /* Include files everyone gets. */
! 
! #include "config.j"		/* Must come before any other #includes in gcc. */
! #include "assert.j"		/* Use gcc's assert.h. */
! #include <ctype.h>
! #include <stdio.h>
  #include <stddef.h>
- #include <stdlib.h>
- #include <string.h>
  
  /* Generally useful definitions. */
- 
  typedef enum
    {
--- 44,54 ----
  #endif	/* !defined (BUILT_WITH_270) */
  
! /* Include files everyone gets.  <assert.h> is needed for assert().
!    <stddef.h> is needed for offsetof, but technically also NULL,
!    size_t, ptrdiff_t, and so on.  */
! #include "assert.j"
  #include <stddef.h>
  
  /* Generally useful definitions. */
  typedef enum
    {
*************** typedef enum
*** 61,66 ****
  
  #define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
- #define STR(s) # s
- #define STRX(s) STR(s)
  
  #ifndef UNUSED	/* Compile with -DUNUSED= if cc doesn't support this. */
--- 63,66 ----
*** g77-e/gcc/f/src.c.~1~	Tue May 19 06:50:02 1998
--- g77-e/gcc/f/src.c	Mon Jun 15 21:19:30 1998
*************** the Free Software Foundation, 59 Temple 
*** 30,34 ****
  
  #include "proj.h"
- #include <ctype.h>
  #include "src.h"
  #include "top.h"
--- 30,33 ----
*** g77-e/gcc/f/src.h.~1~	Tue May 19 06:50:03 1998
--- g77-e/gcc/f/src.h	Mon Jun 15 21:28:19 1998
*************** extern bool ffesrc_ok_match_noninit_lowe
*** 88,94 ****
  
  #define ffesrc_is_name_init(c) \
!   ((isalpha ((c))) || (!(1 || ffe_is_90 ()) && ((c) == '_')))
  #define ffesrc_is_name_noninit(c) \
!   ((isalnum ((c))) || (!(1 || ffe_is_90 ()) && ((c) == '_')))
  
  /* Test if source-translated character matches given alphabetic character
--- 88,94 ----
  
  #define ffesrc_is_name_init(c) \
!   ((ISALPHA ((c))) || (! (1 || ffe_is_90 ()) && ((c) == '_')))
  #define ffesrc_is_name_noninit(c) \
!   ((ISALNUM ((c))) || (! (1 || ffe_is_90 ()) && ((c) == '_')))
  
  /* Test if source-translated character matches given alphabetic character
*** g77-e/gcc/f/sta.c.~1~	Tue May 19 06:50:06 1998
--- g77-e/gcc/f/sta.c	Mon Jun 15 22:16:04 1998
*************** ffesta_eof ()
*** 1453,1457 ****
--- 1453,1459 ----
      {
        ffestorag_report ();
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
        ffesymbol_report_all ();
+ #endif
      }
  }
*************** ffesta_zero (ffelexToken t)
*** 1989,1993 ****
--- 1991,1997 ----
      {
        ffestorag_report ();
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
        ffesymbol_report_all ();
+ #endif
      }
  
*** g77-e/gcc/f/stb.c.~1~	Tue May 19 06:50:08 1998
--- g77-e/gcc/f/stb.c	Mon Jun 15 21:33:00 1998
*************** the Free Software Foundation, 59 Temple 
*** 89,93 ****
  
  #include "proj.h"
- #include <ctype.h>
  #include "stb.h"
  #include "bad.h"
--- 89,92 ----
*************** ffestb_do (ffelexToken t)
*** 1917,1921 ****
  
  	case FFELEX_typeOPEN_PAREN:	/* Must be "DO" label "WHILE". */
! 	  if (!isdigit (*p))
  	    goto bad_i;		/* :::::::::::::::::::: */
  	  ffesta_tokens[1] = ffelex_token_number_from_names (ffesta_tokens[0],
--- 1916,1920 ----
  
  	case FFELEX_typeOPEN_PAREN:	/* Must be "DO" label "WHILE". */
! 	  if (! ISDIGIT (*p))
  	    goto bad_i;		/* :::::::::::::::::::: */
  	  ffesta_tokens[1] = ffelex_token_number_from_names (ffesta_tokens[0],
*************** ffestb_do (ffelexToken t)
*** 1940,1944 ****
  	      return (ffelexHandler) ffestb_do2_;
  	    }
! 	  if (!isdigit (*p))
  	    goto bad_i;		/* :::::::::::::::::::: */
  	  ffesta_tokens[1] = ffelex_token_number_from_names (ffesta_tokens[0],
--- 1939,1943 ----
  	      return (ffelexHandler) ffestb_do2_;
  	    }
! 	  if (! ISDIGIT (*p))
  	    goto bad_i;		/* :::::::::::::::::::: */
  	  ffesta_tokens[1] = ffelex_token_number_from_names (ffesta_tokens[0],
*************** ffestb_do (ffelexToken t)
*** 1951,1955 ****
  
  	case FFELEX_typeEQUALS:
! 	  if (isdigit (*p))
  	    {
  	      ffesta_tokens[1]
--- 1950,1954 ----
  
  	case FFELEX_typeEQUALS:
! 	  if (ISDIGIT (*p))
  	    {
  	      ffesta_tokens[1]
*************** ffestb_do (ffelexToken t)
*** 1973,1977 ****
  	case FFELEX_typeSEMICOLON:
  	  ffesta_confirmed ();
! 	  if (isdigit (*p))
  	    {
  	      ffesta_tokens[1]
--- 1972,1976 ----
  	case FFELEX_typeSEMICOLON:
  	  ffesta_confirmed ();
! 	  if (ISDIGIT (*p))
  	    {
  	      ffesta_tokens[1]
*************** ffestb_goto (ffelexToken t)
*** 3370,3374 ****
  	{
  	  p = ffelex_token_text (ffesta_tokens[0]) + (i = FFESTR_firstlGOTO);
! 	  if (isdigit (*p))
  	    {
  	      nt = ffelex_token_number_from_names (ffesta_tokens[0], i);
--- 3369,3373 ----
  	{
  	  p = ffelex_token_text (ffesta_tokens[0]) + (i = FFESTR_firstlGOTO);
! 	  if (ISDIGIT (*p))
  	    {
  	      nt = ffelex_token_number_from_names (ffesta_tokens[0], i);
*************** ffestb_R838 (ffelexToken t)
*** 6692,6696 ****
  	case FFELEX_typeOPEN_PAREN:
  	  p = ffelex_token_text (ffesta_tokens[0]) + (i = FFESTR_firstlASSIGN);
! 	  if (!isdigit (*p))
  	    goto bad_i;		/* :::::::::::::::::::: */
  	  ffesta_tokens[1]
--- 6691,6695 ----
  	case FFELEX_typeOPEN_PAREN:
  	  p = ffelex_token_text (ffesta_tokens[0]) + (i = FFESTR_firstlASSIGN);
! 	  if (! ISDIGIT (*p))
  	    goto bad_i;		/* :::::::::::::::::::: */
  	  ffesta_tokens[1]
*************** ffestb_R10014_ (ffelexToken t)
*** 9689,9693 ****
        if (*p == '\0')
  	return (ffelexHandler) ffestb_R10015_;
!       if (!isdigit (*p))
  	{
  	  if (ffestb_local_.format.current == FFESTP_formattypeH)
--- 9688,9692 ----
        if (*p == '\0')
  	return (ffelexHandler) ffestb_R10015_;
!       if (! ISDIGIT (*p))
  	{
  	  if (ffestb_local_.format.current == FFESTP_formattypeH)
*************** ffestb_R10014_ (ffelexToken t)
*** 9767,9771 ****
        if (*p == '\0')
  	return (ffelexHandler) ffestb_R10015_;
!       if (!isdigit (*p))
  	{
  	  ffestb_local_.format.current = FFESTP_formattypeNone;
--- 9766,9770 ----
        if (*p == '\0')
  	return (ffelexHandler) ffestb_R10015_;
!       if (! ISDIGIT (*p))
  	{
  	  ffestb_local_.format.current = FFESTP_formattypeNone;
*************** ffestb_R10015_ (ffelexToken t)
*** 10047,10051 ****
        if (*p == '\0')
  	return (ffelexHandler) ffestb_R10015_;
!       if (!isdigit (*p))
  	{
  	  ffestb_local_.format.current = FFESTP_formattypeNone;
--- 10046,10050 ----
        if (*p == '\0')
  	return (ffelexHandler) ffestb_R10015_;
!       if (! ISDIGIT (*p))
  	{
  	  ffestb_local_.format.current = FFESTP_formattypeNone;
*************** ffestb_R10018_ (ffelexToken t)
*** 10221,10225 ****
  	return (ffelexHandler) ffestb_R10019_;	/* Go get NUMBER. */
        i = 1;
!       if (!isdigit (*p))
  	{
  	  ffesta_ffebad_1p (FFEBAD_FORMAT_TEXT_IN_NUMBER, t, 1, NULL);
--- 10220,10224 ----
  	return (ffelexHandler) ffestb_R10019_;	/* Go get NUMBER. */
        i = 1;
!       if (! ISDIGIT (*p))
  	{
  	  ffesta_ffebad_1p (FFEBAD_FORMAT_TEXT_IN_NUMBER, t, 1, NULL);
*************** ffestb_R12026_ (ffelexToken t)
*** 11904,11908 ****
  	      for (p = ffelex_token_text (ffesta_tokens[2]); *p != '\0'; ++p)
  		{
! 		  if (!isalpha (*p))
  		    {
  		      ffelex_token_kill (ffesta_tokens[1]);
--- 11903,11907 ----
  	      for (p = ffelex_token_text (ffesta_tokens[2]); *p != '\0'; ++p)
  		{
! 		  if (! ISALPHA (*p))
  		    {
  		      ffelex_token_kill (ffesta_tokens[1]);
*************** ffestb_S3P4 (ffelexToken t)
*** 12011,12015 ****
  				 (ffeexprCallback) ffestb_S3P41_)))
  	  (t);
!       if (!isdigit (*p))
  	goto bad_i;		/* :::::::::::::::::::: */
        nt = ffelex_token_number_from_names (ffesta_tokens[0], i);
--- 12010,12014 ----
  				 (ffeexprCallback) ffestb_S3P41_)))
  	  (t);
!       if (! ISDIGIT (*p))
  	goto bad_i;		/* :::::::::::::::::::: */
        nt = ffelex_token_number_from_names (ffesta_tokens[0], i);
*************** ffestb_V025 (ffelexToken t)
*** 12444,12448 ****
  	}
        p = ffelex_token_text (ffesta_tokens[0]) + (i = FFESTR_firstlDEFINEFILE);
!       if (isdigit (*p))
  	nt = ffelex_token_number_from_names (ffesta_tokens[0], i);
        else if (ffesrc_is_name_init (*p))
--- 12443,12447 ----
  	}
        p = ffelex_token_text (ffesta_tokens[0]) + (i = FFESTR_firstlDEFINEFILE);
!       if (ISDIGIT (*p))
  	nt = ffelex_token_number_from_names (ffesta_tokens[0], i);
        else if (ffesrc_is_name_init (*p))
*************** ffestb_V020 (ffelexToken t)
*** 17981,17985 ****
  	}
        p = ffelex_token_text (ffesta_tokens[0]) + (i = FFESTR_firstlTYPE);
!       if (isdigit (*p))
  	ffesta_confirmed ();	/* Else might be '90 TYPE statement. */
        for (ix = 0; ix < FFESTP_typeix; ++ix)
--- 17980,17984 ----
  	}
        p = ffelex_token_text (ffesta_tokens[0]) + (i = FFESTR_firstlTYPE);
!       if (ISDIGIT (*p))
  	ffesta_confirmed ();	/* Else might be '90 TYPE statement. */
        for (ix = 0; ix < FFESTP_typeix; ++ix)
*** g77-e/gcc/f/ste.c.~1~	Fri Jun 12 18:15:24 1998
--- g77-e/gcc/f/ste.c	Mon Jun 15 21:16:56 1998
*************** the Free Software Foundation, 59 Temple 
*** 49,54 ****
  
  #if FFECOM_targetCURRENT == FFECOM_targetGCC
- #include "config.j"
  #include "rtl.j"
  #endif
  
--- 49,54 ----
  
  #if FFECOM_targetCURRENT == FFECOM_targetGCC
  #include "rtl.j"
+ #include "toplev.j"
  #endif
  
*** g77-e/gcc/f/stt.c.~1~	Tue May 19 06:50:33 1998
--- g77-e/gcc/f/stt.c	Mon Jun 15 22:10:43 1998
*************** ffestt_caselist_create ()
*** 122,125 ****
--- 122,126 ----
     The cases in the list are dumped with commas separating them.  */
  
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  void
  ffestt_caselist_dump (ffesttCaseList list)
*************** ffestt_caselist_dump (ffesttCaseList lis
*** 141,144 ****
--- 142,146 ----
      }
  }
+ #endif
  
  /* ffestt_caselist_kill -- Kill list of cases
*************** ffestt_dimlist_create ()
*** 444,447 ****
--- 446,450 ----
     The dims in the list are dumped with commas separating them.	 */
  
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  void
  ffestt_dimlist_dump (ffesttDimList list)
*************** ffestt_dimlist_dump (ffesttDimList list)
*** 460,463 ****
--- 463,467 ----
      }
  }
+ #endif
  
  /* ffestt_dimlist_kill -- Kill list of dims
*************** ffestt_exprlist_drive (ffesttExprList li
*** 615,618 ****
--- 619,623 ----
     The exprs in the list are dumped with commas separating them.  */
  
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  void
  ffestt_exprlist_dump (ffesttExprList list)
*************** ffestt_exprlist_dump (ffesttExprList lis
*** 627,630 ****
--- 632,636 ----
      }
  }
+ #endif
  
  /* ffestt_exprlist_kill -- Kill list of exprs
*************** ffestt_implist_drive (ffesttImpList list
*** 852,855 ****
--- 858,862 ----
     The token pairs in the list are dumped with commas separating them.	*/
  
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  void
  ffestt_implist_dump (ffesttImpList list)
*************** ffestt_implist_dump (ffesttImpList list)
*** 871,874 ****
--- 878,882 ----
      }
  }
+ #endif
  
  /* ffestt_implist_kill -- Kill list of token pairs
*************** ffestt_tokenlist_create ()
*** 935,939 ****
  }
  
! /* ffestt_tokenlist_drive -- Dump list of tokens
  
     ffesttTokenList tl;
--- 943,947 ----
  }
  
! /* ffestt_tokenlist_drive -- Drive list of tokens
  
     ffesttTokenList tl;
*************** ffestt_tokenlist_drive (ffesttTokenList 
*** 964,967 ****
--- 972,976 ----
     The tokens in the list are dumped with commas separating them.  */
  
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  void
  ffestt_tokenlist_dump (ffesttTokenList tl)
*************** ffestt_tokenlist_dump (ffesttTokenList t
*** 992,995 ****
--- 1001,1005 ----
      }
  }
+ #endif
  
  /* ffestt_tokenlist_handle -- Handle list of tokens
*** g77-e/gcc/f/stt.h.~1~	Tue May 19 06:50:34 1998
--- g77-e/gcc/f/stt.h	Mon Jun 15 22:08:29 1998
*************** void ffestt_caselist_append (ffesttCaseL
*** 165,169 ****
--- 165,171 ----
  			     ffebld case2, ffelexToken t);
  ffesttCaseList ffestt_caselist_create (void);
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  void ffestt_caselist_dump (ffesttCaseList list);
+ #endif
  void ffestt_caselist_kill (ffesttCaseList list);
  void ffestt_dimlist_append (ffesttDimList list, ffebld lower, ffebld upper,
*************** ffebld ffestt_dimlist_as_expr (ffesttDim
*** 173,177 ****
--- 175,181 ----
  			       bool is_ugly_assumed);
  ffesttDimList ffestt_dimlist_create (void);
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  void ffestt_dimlist_dump (ffesttDimList list);
+ #endif
  void ffestt_dimlist_kill (ffesttDimList list);
  ffestpDimtype ffestt_dimlist_type (ffesttDimList dims, bool is_ugly_assumed);
*************** void ffestt_exprlist_append (ffesttExprL
*** 179,188 ****
--- 183,196 ----
  ffesttExprList ffestt_exprlist_create (void);
  void ffestt_exprlist_drive (ffesttExprList list, void (*fn) ());
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  void ffestt_exprlist_dump (ffesttExprList list);
+ #endif
  void ffestt_exprlist_kill (ffesttExprList list);
  ffesttFormatList ffestt_formatlist_append (ffesttFormatList list);
  ffesttFormatList ffestt_formatlist_create (ffesttFormatList parent,
  					   ffelexToken t);
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  void ffestt_formatlist_dump (ffesttFormatList list);
+ #endif
  void ffestt_formatlist_kill (ffesttFormatList list);
  void ffestt_implist_append (ffesttImpList list, ffelexToken first,
*************** void ffestt_implist_append (ffesttImpLis
*** 190,199 ****
--- 198,211 ----
  ffesttImpList ffestt_implist_create (void);
  void ffestt_implist_drive (ffesttImpList list, void (*fn) ());
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  void ffestt_implist_dump (ffesttImpList list);
+ #endif
  void ffestt_implist_kill (ffesttImpList list);
  void ffestt_tokenlist_append (ffesttTokenList list, ffelexToken t);
  ffesttTokenList ffestt_tokenlist_create (void);
  void ffestt_tokenlist_drive (ffesttTokenList list, void (*fn) ());
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  void ffestt_tokenlist_dump (ffesttTokenList list);
+ #endif
  ffelexHandler ffestt_tokenlist_handle (ffesttTokenList list,
  				       ffelexHandler handler);
*** g77-e/gcc/f/symbol.c.~1~	Tue May 19 06:50:41 1998
--- g77-e/gcc/f/symbol.c	Mon Jun 15 22:12:09 1998
*************** ffesymbol_drive_sfnames (ffesymbol (*fn)
*** 795,798 ****
--- 795,799 ----
  /* Dump info on the symbol for debugging purposes.  */
  
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  void
  ffesymbol_dump (ffesymbol s)
*************** ffesymbol_dump (ffesymbol s)
*** 829,832 ****
--- 830,834 ----
  	     ffeintrin_name_implementation (s->implementation));
  }
+ #endif
  
  /* Produce generic error message about a symbol.
*************** ffesymbol_reference (ffesymbol s, ffelex
*** 1012,1015 ****
--- 1014,1018 ----
  /* Report info on the symbol for debugging purposes.  */
  
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  ffesymbol
  ffesymbol_report (ffesymbol s)
*************** ffesymbol_report (ffesymbol s)
*** 1173,1179 ****
--- 1176,1184 ----
    return s;
  }
+ #endif
  
  /* Report info on the symbols.	*/
  
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  void
  ffesymbol_report_all ()
*************** ffesymbol_report_all ()
*** 1183,1186 ****
--- 1188,1192 ----
    ffename_space_drive_symbol (ffesymbol_global_, ffesymbol_report);
  }
+ #endif
  
  /* Resolve symbol that has become known intrinsic or non-intrinsic.  */
*** g77-e/gcc/f/symbol.h.~1~	Tue May 19 06:50:43 1998
--- g77-e/gcc/f/symbol.h	Mon Jun 15 22:12:07 1998
*************** void ffesymbol_drive (ffesymbol (*fn) ()
*** 181,185 ****
--- 181,187 ----
  void ffesymbol_drive_sfnames (ffesymbol (*fn) ());
  #define ffesymbol_dummyargs(s) ((s)->dummy_args)
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  void ffesymbol_dump (ffesymbol s);
+ #endif
  void ffesymbol_error (ffesymbol s, ffelexToken t);
  #define ffesymbol_equiv(s) ((s)->equiv)
*************** ffesymbol ffesymbol_lookup_local (ffelex
*** 220,225 ****
--- 222,229 ----
  #define ffesymbol_rank(s) ffeinfo_rank((s)->info)
  void ffesymbol_reference (ffesymbol s, ffelexToken t, bool explicit);
+ #if FFECOM_targetCURRENT == FFECOM_targetFFE
  ffesymbol ffesymbol_report (ffesymbol s);
  void ffesymbol_report_all (void);
+ #endif
  void ffesymbol_resolve_intrin (ffesymbol s);
  void ffesymbol_retract (bool retract);
*** g77-e/gcc/f/system.j.~1~	Mon Jun 15 21:49:22 1998
--- g77-e/gcc/f/system.j	Mon Jun 15 21:49:32 1998
***************
*** 0 ****
--- 1,27 ----
+ /* system.j -- Wrapper for GCC's system.h
+    Copyright (C) 1998 Free Software Foundation, Inc.
+    Contributed by James Craig Burley (burley@gnu.org).
+ 
+ This file is part of GNU Fortran.
+ 
+ GNU Fortran is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+ 
+ GNU Fortran is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU General Public License
+ along with GNU Fortran; see the file COPYING.  If not, write to
+ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA.  */
+ 
+ #ifndef MAKING_DEPENDENCIES
+ #ifndef _J_f_system
+ #define _J_f_system
+ #include "system.h"
+ #endif
+ #endif
*** g77-e/gcc/f/target.c.~1~	Tue May 19 06:50:45 1998
--- g77-e/gcc/f/target.c	Mon Jun 15 21:33:00 1998
*************** the Free Software Foundation, 59 Temple 
*** 70,74 ****
  
  #include "proj.h"
- #include <ctype.h>
  #include "glimits.j"
  #include "target.h"
--- 70,73 ----
*************** ffetarget_print_char_ (FILE *f, unsigned
*** 132,136 ****
  
      default:
!       if (isprint (c) && isascii (c))
  	fputc (c, f);
        else
--- 131,135 ----
  
      default:
!       if (ISPRINT (c))
  	fputc (c, f);
        else
*************** ffetarget_typeless_binary (ffetargetType
*** 2387,2391 ****
        if ((new_value >> 1) != value)
  	overflow = TRUE;
!       if (isdigit (c))
  	new_value += c - '0';
        else
--- 2386,2390 ----
        if ((new_value >> 1) != value)
  	overflow = TRUE;
!       if (ISDIGIT (c))
  	new_value += c - '0';
        else
*************** ffetarget_typeless_octal (ffetargetTypel
*** 2431,2435 ****
        if ((new_value >> 3) != value)
  	overflow = TRUE;
!       if (isdigit (c))
  	new_value += c - '0';
        else
--- 2430,2434 ----
        if ((new_value >> 3) != value)
  	overflow = TRUE;
!       if (ISDIGIT (c))
  	new_value += c - '0';
        else
*************** ffetarget_typeless_hex (ffetargetTypeles
*** 2475,2479 ****
        if ((new_value >> 4) != value)
  	overflow = TRUE;
!       if (isdigit (c))
  	new_value += c - '0';
        else if ((c >= 'A') && (c <= 'F'))
--- 2474,2478 ----
        if ((new_value >> 4) != value)
  	overflow = TRUE;
!       if (ISDIGIT (c))
  	new_value += c - '0';
        else if ((c >= 'A') && (c <= 'F'))
*** g77-e/gcc/f/top.c.~1~	Fri Jun 12 18:17:49 1998
--- g77-e/gcc/f/top.c	Mon Jun 15 21:32:34 1998
*************** the Free Software Foundation, 59 Temple 
*** 31,35 ****
  /* Include files. */
  
- #include <ctype.h>
  #include "proj.h"
  #include "top.h"
--- 31,34 ----
*************** the Free Software Foundation, 59 Temple 
*** 57,60 ****
--- 56,60 ----
  #if FFECOM_targetCURRENT == FFECOM_targetGCC
  #include "flags.j"
+ #include "toplev.j"
  #endif
  
*************** ffe_is_digit_string_ (char *s)
*** 152,156 ****
    char *p;
  
!   for (p = s; isdigit (*p); ++p)
      ;
  
--- 152,156 ----
    char *p;
  
!   for (p = s; ISDIGIT (*p); ++p)
      ;
  
*** g77-e/gcc/f/toplev.j.~1~	Mon Jun 15 20:54:26 1998
--- g77-e/gcc/f/toplev.j	Mon Jun 15 20:55:02 1998
***************
*** 0 ****
--- 1,27 ----
+ /* toplev.j -- Wrapper for GCC's toplev.h
+    Copyright (C) 1998 Free Software Foundation, Inc.
+    Contributed by James Craig Burley (burley@gnu.org).
+ 
+ This file is part of GNU Fortran.
+ 
+ GNU Fortran is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+ 
+ GNU Fortran is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU General Public License
+ along with GNU Fortran; see the file COPYING.  If not, write to
+ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA.  */
+ 
+ #ifndef MAKING_DEPENDENCIES
+ #ifndef _J_f_toplev
+ #define _J_f_toplev
+ #include "toplev.h"
+ #endif
+ #endif
--------

-------- patch file P1:
Mon Jun 15 23:39:24 1998  Craig Burley  <burley@gnu.org>

	* Make-lang.in (f/g77.info): Use -f when removing
	pre-existing Info files, if any.  (This rm command
	can go away once makeinfo has been changed to delete
	.info-N files beyond the last one it creates.)

	* Make-lang.in ($(srcdir)/f/intdoc.texi): Compile
	using $(INCLUDES) macro to get the new hconfig.h
	and system.h headers.


*** g77-e/gcc/f/Make-lang.in.~1~	Mon Jun 15 21:50:55 1998
--- g77-e/gcc/f/Make-lang.in	Mon Jun 15 23:36:10 1998
*************** f/g77.info: $(srcdir)/f/g77.texi $(srcdi
*** 247,251 ****
  	esac
  	if [ -f lang-f77 ]; then \
! 	  rm $(srcdir)/f/g77.info-*; \
  	  $(MAKEINFO) -I$(srcdir)/f -o f/g77.info $(srcdir)/f/g77.texi; \
  	fi
--- 247,251 ----
  	esac
  	if [ -f lang-f77 ]; then \
! 	  rm -f $(srcdir)/f/g77.info-*; \
  	  $(MAKEINFO) -I$(srcdir)/f -o f/g77.info $(srcdir)/f/g77.texi; \
  	fi
*************** $(srcdir)/f/intdoc.texi: f/intdoc.c f/in
*** 287,294 ****
  	esac
  	if [ -f lang-f77 ]; then \
! 	  $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \
  	   `echo $(srcdir)/f/ansify.c | sed 's,^\./,,'` -o f/ansify; \
  	  f/ansify < $(srcdir)/f/intdoc.in > f/intdoc.h0 $(srcdir)/f/intdoc.in; \
! 	  $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -I./f \
  	   `echo $(srcdir)/f/intdoc.c | sed 's,^\./,,'` -o f/intdoc; \
  	  f/intdoc > $(srcdir)/f/intdoc.texi; \
--- 287,294 ----
  	esac
  	if [ -f lang-f77 ]; then \
! 	  $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) $(INCLUDES) \
  	   `echo $(srcdir)/f/ansify.c | sed 's,^\./,,'` -o f/ansify; \
  	  f/ansify < $(srcdir)/f/intdoc.in > f/intdoc.h0 $(srcdir)/f/intdoc.in; \
! 	  $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) $(INCLUDES) -I./f \
  	   `echo $(srcdir)/f/intdoc.c | sed 's,^\./,,'` -o f/intdoc; \
  	  f/intdoc > $(srcdir)/f/intdoc.texi; \
--------



More information about the Gcc-patches mailing list