F77: remove .j files

Zack Weinberg zack@wolery.cumb.org
Tue Jun 20 16:17:00 GMT 2000


The Fortran front end indirects all references to GCC's common headers
through a set of wrappers, whose names end in .j.  This serves only to
obfuscate the build process.  The following patch eliminates them.

We lose the capability to autogenerate dependencies for the Fortran
subdirectory.  I don't think this is any great loss, since that code
is unmaintained and we can't do this anywhere else.

The str-*.j files created in the build directory by fini.c are
unaffected.

zw

	* Make-lang.in (F77_SRCS): Remove all .j files.
	* Makefile.in (ASSERT_H, CONFIG_H, CONVERT_H, FLAGS_H, GGC_H,
	GLIMITS_H, HCONFIG_H, INPUT_H, OUTPUT_H, RTL_H, SYSTEM_H,
	TOPLEV_H, TREE_H): Remove references to .j files.
	(TCONFIG_H, TM_H): Remove entirely.
	(deps-kinda): Delete rule.
	Correct commentary.

	* assert.j, config.j, convert.j. flags.j, ggc.j, glimits.j,
	hconfig.j, input.j, output.j, rtl.j, system.j, toplev.j,
	tree.j, tconfig.j, tree.j: Delete.

	* ansify.c, bad.c, bit.c, com.c, com.h, intdoc.c, lex.c,
	parse.c, proj.c, proj.h, ste.c, target.c, target.h, top.c,
	where.c, where.h: Include parent-directory headers directly.
	* lex.c: Don't include tree.h twice.

===================================================================
Index: f/Make-lang.in
--- f/Make-lang.in	2000/06/17 13:53:59	1.64
+++ f/Make-lang.in	2000/06/20 23:06:25
@@ -94,7 +94,6 @@ g77-cross$(exeext): g77$(exeext)
 	else true; fi
 
 F77_SRCS = \
- $(srcdir)/f/assert.j \
  $(srcdir)/f/bad.c \
  $(srcdir)/f/bad.def \
  $(srcdir)/f/bad.h \
@@ -106,8 +105,6 @@ F77_SRCS = \
  $(srcdir)/f/com-rt.def \
  $(srcdir)/f/com.c \
  $(srcdir)/f/com.h \
- $(srcdir)/f/config.j \
- $(srcdir)/f/convert.j \
  $(srcdir)/f/data.c \
  $(srcdir)/f/data.h \
  $(srcdir)/f/equiv.c \
@@ -115,14 +112,10 @@ F77_SRCS = \
  $(srcdir)/f/expr.c \
  $(srcdir)/f/expr.h \
  $(srcdir)/f/fini.c \
- $(srcdir)/f/flags.j \
- $(srcdir)/f/glimits.j \
  $(srcdir)/f/global.c \
  $(srcdir)/f/global.h \
- $(srcdir)/f/hconfig.j \
  $(srcdir)/f/implic.c \
  $(srcdir)/f/implic.h \
- $(srcdir)/f/input.j \
  $(srcdir)/f/info-b.def \
  $(srcdir)/f/info-k.def \
  $(srcdir)/f/info-w.def \
@@ -139,11 +132,9 @@ F77_SRCS = \
  $(srcdir)/f/malloc.h \
  $(srcdir)/f/name.c \
  $(srcdir)/f/name.h \
- $(srcdir)/f/output.j \
  $(srcdir)/f/parse.c \
  $(srcdir)/f/proj.c \
  $(srcdir)/f/proj.h \
- $(srcdir)/f/rtl.j \
  $(srcdir)/f/src.c \
  $(srcdir)/f/src.h \
  $(srcdir)/f/st.c \
@@ -184,15 +175,10 @@ F77_SRCS = \
  $(srcdir)/f/symbol.c \
  $(srcdir)/f/symbol.def \
  $(srcdir)/f/symbol.h \
- $(srcdir)/f/system.j \
  $(srcdir)/f/target.c \
  $(srcdir)/f/target.h \
- $(srcdir)/f/tconfig.j \
- $(srcdir)/f/tm.j \
  $(srcdir)/f/top.c \
  $(srcdir)/f/top.h \
- $(srcdir)/f/toplev.j \
- $(srcdir)/f/tree.j \
  $(srcdir)/f/type.c \
  $(srcdir)/f/type.h \
  $(srcdir)/f/version.c \
===================================================================
Index: f/Makefile.in
--- f/Makefile.in	2000/06/06 07:23:41	1.22
+++ f/Makefile.in	2000/06/20 23:06:26
@@ -220,40 +220,28 @@ native: config.status ../f771$(exeext)
 
 # F77 language-specific files.
 
-# These macros expand to the corresponding g77-source .j files plus
-# the gcc-source files involved (each file itself, plus whatever
-# files on which it depends, but without including stuff resulting
-# from configuration, since we can't guess at that).  The files
-# that live in a distclean'd gcc source directory have "$(srcdir)/"
-# prefixes, while the others don't because they'll be created
-# only in the build directory.
-ASSERT_H = $(srcdir)/assert.j $(srcdir)/../assert.h
-CONFIG_H = $(srcdir)/config.j ../config.h
-CONVERT_H = $(srcdir)/convert.j $(srcdir)/../convert.h
-FLAGS_H = $(srcdir)/flags.j $(srcdir)/../flags.h
-GGC_H = $(srcdir)/ggc.j $(srcdir)/../ggc.h $(srcdir)/../varray.h
-GLIMITS_H = $(srcdir)/glimits.j $(srcdir)/../glimits.h
-HCONFIG_H = $(srcdir)/hconfig.j ../hconfig.h
-INPUT_H = $(srcdir)/input.j $(srcdir)/../input.h
-OUTPUT_H = $(srcdir)/output.j $(srcdir)/../output.h
-RTL_H = $(srcdir)/rtl.j $(srcdir)/../rtl.h $(srcdir)/../rtl.def \
+# These macros expand to the corresponding gcc-source files involved
+# (each file itself, plus whatever files on which it depends, but
+# without including stuff resulting from configuration, since we can't
+# guess at that).  The files that live in a distclean'd gcc source
+# directory have "$(srcdir)/" prefixes, while the others don't because
+# they'll be created only in the build directory.
+ASSERT_H = $(srcdir)/../assert.h
+CONFIG_H = ../config.h
+CONVERT_H = $(srcdir)/../convert.h
+FLAGS_H = $(srcdir)/../flags.h
+GGC_H = $(srcdir)/../ggc.h $(srcdir)/../varray.h
+GLIMITS_H = $(srcdir)/../glimits.h
+HCONFIG_H = ../hconfig.h
+INPUT_H = $(srcdir)/../input.h
+OUTPUT_H = $(srcdir)/../output.h
+RTL_H = $(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 \
+SYSTEM_H = $(srcdir)/../system.h
+TOPLEV_H = $(srcdir)/../toplev.h
+TREE_H = $(srcdir)/../tree.h $(srcdir)/../real.h \
 	$(srcdir)/../tree.def $(srcdir)/../machmode.h $(srcdir)/../machmode.def
 
-#Build the first part of this list with the command line:
-#    cd gcc/; make deps-kinda -f f/Makefile.in
-#Note that this command uses the host C compiler;
-# 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 \
@@ -422,8 +410,6 @@ 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 $(GGC_H)
 
-# The rest of this list (Fortran 77 language-specific files) is hand-generated.
-
 stamp-str: str-1t.h str-1t.j str-2t.h str-2t.j \
  str-fo.h str-fo.j str-io.h str-io.j str-nq.h  str-nq.j \
  str-op.h str-op.j str-ot.h str-ot.j
@@ -461,44 +447,6 @@ fini.o:
 proj-h.o: proj.c proj.h $(HCONFIG_H) $(SYSTEM_H) $(ASSERT_H) $(GLIMITS_H)
 	$(HOST_CC) -c -DUSE_HCONFIG $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) \
 	      `echo $(srcdir)/proj.c | sed 's,^\./,,'` -o $@
-
-# Other than str-*.j, the *.j files are dummy #include files
-# that normally just #include the corresponding back-end *.h
-# files, but not if MAKING_DEPENDENCIES is #defined.  The str-*.j
-# files also are not actually included if MAKING_DEPENDENCIES
-# is #defined.  The point of all this is to come up with a clean
-# dependencies list whether working in a clean directory, such
-# that str-*.j and such do not exist, or in a directory full
-# of already-built files.  Any dependency on a str-*.j file
-# implies a dependency on str.h, so we key on that to replace
-# it with stamp-str, and dependencies on the other *.j files
-# are generally left alone (modulo special macros like RTL_H)
-# because we might not want to recompile all of g77 just
-# because a back-end file changes.  MG is usually "-MG" but
-# should be defined with "make MG= deps-kinda..." if using
-# a compiler that doesn't support -MG (gcc does as of 2.6) --
-# it prevents diagnostics when an #include file is missing,
-# as will be the case with proj.h in a clean directory.
-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' \
-	      -e 's: \([.]/\)*convert[.]j: $$(CONVERT_H):g' \
-	      -e 's: \([.]/\)*flags[.]j: $$(FLAGS_H):g' \
-	      -e 's: \([.]/\)*glimits[.]j: $$(GLIMITS_H):g' \
-	      -e 's: \([.]/\)*hconfig[.]j: $$(HCONFIG_H):g' \
-	      -e 's: \([.]/\)*input[.]j: $$(INPUT_H):g' \
-	      -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' \
-	      -e 's:.*g77spec.*::g' \
-	      -e 's%^\(.*\)[ ]*: %\1: %g'
 
 # This rule is just a handy way to build the g77 derived files without
 # having the gcc source tree around.
===================================================================
Index: f/ansify.c
--- f/ansify.c	2000/03/06 18:03:55	1.8
+++ f/ansify.c	2000/06/20 23:06:26
@@ -19,28 +19,8 @@ along with GNU Fortran; see the file COP
 the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
-/* 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"
-#if HAVE_STDDEF_H
-#include <stddef.h>
-#endif
-
-typedef enum
-  {
-#if !defined(false) || !defined(true)
-    false = 0, true = 1,
-#endif
-#if !defined(FALSE) || !defined(TRUE)
-    FALSE = 0, TRUE = 1,
-#endif
-    Doggone_Trailing_Comma_Dont_Work = 1
-  } bool;
-
-#define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
+#include "hconfig.h"
+#include "system.h"
 
 #define die_unless(c) \
   do if (!(c)) \
===================================================================
Index: f/assert.j
--- f/assert.j	Tue Jun 20 16:06:32 2000
+++ f/assert.j	Tue May  5 13:32:27 1998
@@ -1,27 +0,0 @@
-/* assert.j -- Wrapper for GCC's assert.h
-   Copyright (C) 1995 Free Software Foundation, Inc.
-   Contributed by James Craig Burley.
-
-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_assert
-#define _J_f_assert
-#include "assert.h"
-#endif
-#endif
===================================================================
Index: f/bad.c
--- f/bad.c	1999/09/16 22:20:42	1.9
+++ f/bad.c	2000/06/20 23:06:26
@@ -38,9 +38,9 @@ the Free Software Foundation, 59 Temple 
 
 #include "proj.h"
 #include "bad.h"
-#include "flags.j"
+#include "flags.h"
 #include "com.h"
-#include "toplev.j"
+#include "toplev.h"
 #include "where.h"
 
 /* Externals defined here. */
===================================================================
Index: f/bit.c
--- f/bit.c	1999/02/15 18:16:26	1.4
+++ f/bit.c	2000/06/20 23:06:26
@@ -31,7 +31,7 @@ the Free Software Foundation, 59 Temple 
 /* Include files. */
 
 #include "proj.h"
-#include "glimits.j"
+#include "glimits.h"
 #include "bit.h"
 #include "malloc.h"
 
===================================================================
Index: f/com.c
--- f/com.c	2000/06/14 05:30:06	1.88
+++ f/com.c	2000/06/20 23:06:29
@@ -88,13 +88,13 @@ the Free Software Foundation, 59 Temple 
 
 #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! */
-#include "convert.j"
-#include "ggc.j"
+#include "flags.h"
+#include "rtl.h"
+#include "toplev.h"
+#include "tree.h"
+#include "output.h"  /* Must follow tree.h so TREE_CODE is defined! */
+#include "convert.h"
+#include "ggc.h"
 #endif	/* FFECOM_targetCURRENT == FFECOM_targetGCC */
 
 #define FFECOM_GCC_INCLUDE 1	/* Enable -I. */
===================================================================
Index: f/com.h
--- f/com.h	2000/05/18 17:45:30	1.16
+++ f/com.h	2000/06/20 23:06:29
@@ -188,7 +188,7 @@ typedef enum
 
 #if FFECOM_targetCURRENT == FFECOM_targetGCC
 #ifndef TREE_CODE
-#include "tree.j"
+#include "tree.h"
 #endif
 
 #ifndef BUILT_FOR_270
===================================================================
Index: f/config.j
--- f/config.j	Tue Jun 20 16:06:32 2000
+++ f/config.j	Tue May  5 13:32:27 1998
@@ -1,27 +0,0 @@
-/* config.j -- Wrapper for GCC's config.h
-   Copyright (C) 1995 Free Software Foundation, Inc.
-   Contributed by James Craig Burley.
-
-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_config
-#define _J_f_config
-#include "config.h"
-#endif
-#endif
===================================================================
Index: f/convert.j
--- f/convert.j	Tue Jun 20 16:06:32 2000
+++ f/convert.j	Tue May  5 13:32:27 1998
@@ -1,28 +0,0 @@
-/* convert.j -- Wrapper for GCC's convert.h
-   Copyright (C) 1995 Free Software Foundation, Inc.
-   Contributed by James Craig Burley.
-
-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_convert
-#define _J_f_convert
-#include "tree.j"
-#include "convert.h"
-#endif
-#endif
===================================================================
Index: f/flags.j
--- f/flags.j	Tue Jun 20 16:06:32 2000
+++ f/flags.j	Tue May  5 13:32:27 1998
@@ -1,27 +0,0 @@
-/* flags.j -- Wrapper for GCC's flags.h
-   Copyright (C) 1995 Free Software Foundation, Inc.
-   Contributed by James Craig Burley.
-
-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_flags
-#define _J_f_flags
-#include "flags.h"
-#endif
-#endif
===================================================================
Index: f/ggc.j
--- f/ggc.j	Tue Jun 20 16:06:32 2000
+++ f/ggc.j	Tue May  5 13:32:27 1998
@@ -1,29 +0,0 @@
-/* rtl.j -- Wrapper for GCC's rtl.h
-   Copyright (C) 1995 Free Software Foundation, Inc.
-   Contributed by James Craig Burley.
-
-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_ggc
-#define _J_f_ggc
-#include "system.j"
-#include "config.j"
-#include "ggc.h"
-#endif
-#endif
===================================================================
Index: f/glimits.j
--- f/glimits.j	Tue Jun 20 16:06:32 2000
+++ f/glimits.j	Tue May  5 13:32:27 1998
@@ -1,28 +0,0 @@
-/* glimits.j -- Wrapper for GCC's glimits.h
-   Copyright (C) 1995 Free Software Foundation, Inc.
-   Contributed by James Craig Burley.
-
-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
-#if !USE_HOST_LIMITS
-#include "glimits.h"
-#else
-#include <limits.h>
-#endif
-#endif
===================================================================
Index: f/hconfig.j
--- f/hconfig.j	Tue Jun 20 16:06:32 2000
+++ f/hconfig.j	Tue May  5 13:32:27 1998
@@ -1,27 +0,0 @@
-/* hconfig.j -- Wrapper for GCC's hconfig.h
-   Copyright (C) 1995 Free Software Foundation, Inc.
-   Contributed by James Craig Burley.
-
-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_hconfig
-#define _J_f_hconfig
-#include "hconfig.h"
-#endif
-#endif
===================================================================
Index: f/input.j
--- f/input.j	Tue Jun 20 16:06:32 2000
+++ f/input.j	Tue May  5 13:32:27 1998
@@ -1,27 +0,0 @@
-/* input.j -- Wrapper for GCC's input.h
-   Copyright (C) 1995 Free Software Foundation, Inc.
-   Contributed by James Craig Burley.
-
-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_input
-#define _J_f_input
-#include "input.h"
-#endif
-#endif
===================================================================
Index: f/intdoc.c
--- f/intdoc.c	1999/04/07 06:48:36	1.13
+++ f/intdoc.c	2000/06/20 23:06:29
@@ -22,12 +22,9 @@ the Free Software Foundation, 59 Temple 
 /* 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"
-#if HAVE_STDDEF_H
-#include <stddef.h>
-#endif
+#include "hconfig.h"
+#include "system.h"
+#include "assert.h"
 
 typedef enum
   {
===================================================================
Index: f/lex.c
--- f/lex.c	2000/05/09 19:55:51	1.18
+++ f/lex.c	2000/06/20 23:06:30
@@ -27,12 +27,11 @@ the Free Software Foundation, 59 Temple 
 #include "malloc.h"
 #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! */
-#include "ggc.j"
+#include "flags.h"
+#include "input.h"
+#include "toplev.h"
+#include "output.h"
+#include "ggc.h"
 #endif
 
 #ifdef DWARF_DEBUGGING_INFO
===================================================================
Index: f/output.j
--- f/output.j	Tue Jun 20 16:06:32 2000
+++ f/output.j	Tue May  5 13:32:27 1998
@@ -1,27 +0,0 @@
-/* output.j -- Wrapper for GCC's output.h
-   Copyright (C) 1998 Free Software Foundation, Inc.
-   Contributed by James Craig Burley.
-
-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_output
-#define _J_f_output
-#include "output.h"
-#endif
-#endif
===================================================================
Index: f/parse.c
--- f/parse.c	1999/02/15 18:17:16	1.7
+++ f/parse.c	2000/06/20 23:06:30
@@ -25,7 +25,7 @@ the Free Software Foundation, 59 Temple 
 #include "where.h"
 #include "version.h"
 #if FFECOM_targetCURRENT == FFECOM_targetGCC
-#include "flags.j"
+#include "flags.h"
 #endif
 
 #define NAME_OF_STDIN "<stdin>"
===================================================================
Index: f/proj.c
--- f/proj.c	1999/02/15 18:17:17	1.6
+++ f/proj.c	2000/06/20 23:06:30
@@ -20,7 +20,7 @@ the Free Software Foundation, 59 Temple 
 02111-1307, USA.	 */
 
 #include "proj.h"
-#include "glimits.j"
+#include "glimits.h"
 
 #ifndef HAVE_STRTOUL
 unsigned long int
===================================================================
Index: f/proj.h
--- f/proj.h	1999/11/10 17:57:21	1.13
+++ f/proj.h	2000/06/20 23:06:30
@@ -25,11 +25,11 @@ the Free Software Foundation, 59 Temple 
 #define _H_f_proj
 
 #ifdef USE_HCONFIG
-#include "hconfig.j"
+#include "hconfig.h"
 #else
-#include "config.j"
+#include "config.h"
 #endif
-#include "system.j"
+#include "system.h"
 
 #if (GCC_VERSION < 2000)
 #error "You have to use gcc 2.x to build g77 (might be fixed in g77-0.6)."
@@ -39,7 +39,7 @@ the Free Software Foundation, 59 Temple 
    <stddef.h> is needed for offsetof, but technically also NULL,
    size_t, ptrdiff_t, and so on.  */
 
-#include "assert.j"
+#include "assert.h"
 
 #if HAVE_STDDEF_H
 #include <stddef.h>
===================================================================
Index: f/rtl.j
--- f/rtl.j	Tue Jun 20 16:06:32 2000
+++ f/rtl.j	Tue May  5 13:32:27 1998
@@ -1,28 +0,0 @@
-/* rtl.j -- Wrapper for GCC's rtl.h
-   Copyright (C) 1995 Free Software Foundation, Inc.
-   Contributed by James Craig Burley.
-
-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_rtl
-#define _J_f_rtl
-#include "config.j"
-#include "rtl.h"
-#endif
-#endif
===================================================================
Index: f/ste.c
--- f/ste.c	2000/06/15 18:05:03	1.22
+++ f/ste.c	2000/06/20 23:06:31
@@ -33,9 +33,9 @@ the Free Software Foundation, 59 Temple 
 #include "proj.h"
 
 #if FFECOM_targetCURRENT == FFECOM_targetGCC
-#include "rtl.j"
-#include "toplev.j"
-#include "ggc.j"
+#include "rtl.h"
+#include "toplev.h"
+#include "ggc.h"
 #endif
 
 #include "ste.h"
===================================================================
Index: f/system.j
--- f/system.j	Tue Jun 20 16:06:32 2000
+++ f/system.j	Tue May  5 13:32:27 1998
@@ -1,27 +0,0 @@
-/* system.j -- Wrapper for GCC's system.h
-   Copyright (C) 1998 Free Software Foundation, Inc.
-   Contributed by James Craig Burley.
-
-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
===================================================================
Index: f/target.c
--- f/target.c	2000/02/26 20:02:01	1.12
+++ f/target.c	2000/06/20 23:06:31
@@ -69,7 +69,7 @@ the Free Software Foundation, 59 Temple 
 /* Include files. */
 
 #include "proj.h"
-#include "glimits.j"
+#include "glimits.h"
 #include "target.h"
 #include "bad.h"
 #include "info.h"
===================================================================
Index: f/target.h
--- f/target.h	2000/04/15 22:17:00	1.9
+++ f/target.h	2000/06/20 23:06:31
@@ -34,7 +34,7 @@ the Free Software Foundation, 59 Temple 
 #define HOST_WIDE_INT long
 #else
 #ifndef TREE_CODE
-#include "tree.j"
+#include "tree.h"
 #endif
 #endif
 
===================================================================
Index: f/tconfig.j
--- f/tconfig.j	Tue Jun 20 16:06:32 2000
+++ f/tconfig.j	Tue May  5 13:32:27 1998
@@ -1,27 +0,0 @@
-/* tconfig.j -- Wrapper for GCC's tconfig.h
-   Copyright (C) 1995 Free Software Foundation, Inc.
-   Contributed by James Craig Burley.
-
-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_tconfig
-#define _J_f_tconfig
-#include "tconfig.h"
-#endif
-#endif
===================================================================
Index: f/tm.j
--- f/tm.j	Tue Jun 20 16:06:32 2000
+++ f/tm.j	Tue May  5 13:32:27 1998
@@ -1,27 +0,0 @@
-/* tm.j -- Wrapper for GCC's tm.h
-   Copyright (C) 1995 Free Software Foundation, Inc.
-   Contributed by James Craig Burley.
-
-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_tm
-#define _J_f_tm
-#include "tm.h"
-#endif
-#endif
===================================================================
Index: f/top.c
--- f/top.c	2000/05/17 08:15:28	1.21
+++ f/top.c	2000/06/20 23:06:31
@@ -54,8 +54,8 @@ the Free Software Foundation, 59 Temple 
 #include "target.h"
 #include "where.h"
 #if FFECOM_targetCURRENT == FFECOM_targetGCC
-#include "flags.j"
-#include "toplev.j"
+#include "flags.h"
+#include "toplev.h"
 #endif
 
 /* Externals defined here. */
===================================================================
Index: f/toplev.j
--- f/toplev.j	Tue Jun 20 16:06:32 2000
+++ f/toplev.j	Tue May  5 13:32:27 1998
@@ -1,27 +0,0 @@
-/* toplev.j -- Wrapper for GCC's toplev.h
-   Copyright (C) 1998 Free Software Foundation, Inc.
-   Contributed by James Craig Burley.
-
-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
===================================================================
Index: f/tree.j
--- f/tree.j	Tue Jun 20 16:06:32 2000
+++ f/tree.j	Tue May  5 13:32:27 1998
@@ -1,28 +0,0 @@
-/* tree.j -- Wrapper for GCC's tree.h
-   Copyright (C) 1995 Free Software Foundation, Inc.
-   Contributed by James Craig Burley.
-
-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_tree
-#define _J_f_tree
-#include "config.j"
-#include "tree.h"
-#endif
-#endif
===================================================================
Index: f/where.c
--- f/where.c	2000/05/09 19:55:52	1.8
+++ f/where.c	2000/06/20 23:06:31
@@ -33,7 +33,7 @@ the Free Software Foundation, 59 Temple 
 #include "where.h"
 #include "lex.h"
 #include "malloc.h"
-#include "ggc.j"
+#include "ggc.h"
 
 /* Externals defined here. */
 
===================================================================
Index: f/where.h
--- f/where.h	2000/05/09 19:55:52	1.5
+++ f/where.h	2000/06/20 23:06:31
@@ -61,7 +61,7 @@ typedef unsigned int ffewhereUses_;
 
 /* Include files needed by this one. */
 
-#include "glimits.j"
+#include "glimits.h"
 #include "top.h"
 
 /* Structure definitions. */


More information about the Gcc-patches mailing list