From 15a40ced5aac977c558a93e969ce375cc8d0372b Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Wed, 21 Jun 2000 20:11:14 +0000 Subject: [PATCH] Make-lang.in (F77_SRCS): Remove all .j files. * 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. From-SVN: r34638 --- gcc/f/ChangeLog | 139 ++++++++++++++++++++++++++++++----------------------- gcc/f/Make-lang.in | 14 ------ gcc/f/Makefile.in | 90 ++++++++-------------------------- gcc/f/ansify.c | 24 +-------- gcc/f/assert.j | 27 ----------- gcc/f/bad.c | 4 +- gcc/f/bit.c | 2 +- gcc/f/com.c | 14 +++--- gcc/f/com.h | 2 +- gcc/f/config.j | 27 ----------- gcc/f/convert.j | 28 ----------- gcc/f/flags.j | 27 ----------- gcc/f/ggc.j | 29 ----------- gcc/f/glimits.j | 28 ----------- gcc/f/hconfig.j | 27 ----------- gcc/f/input.j | 27 ----------- gcc/f/intdoc.c | 9 ++-- gcc/f/lex.c | 11 ++--- gcc/f/output.j | 27 ----------- gcc/f/parse.c | 2 +- gcc/f/proj.c | 2 +- gcc/f/proj.h | 8 +-- gcc/f/rtl.j | 28 ----------- gcc/f/ste.c | 6 +-- gcc/f/system.j | 27 ----------- gcc/f/target.c | 2 +- gcc/f/target.h | 2 +- gcc/f/tconfig.j | 27 ----------- gcc/f/tm.j | 27 ----------- gcc/f/top.c | 4 +- gcc/f/toplev.j | 27 ----------- gcc/f/tree.j | 28 ----------- gcc/f/where.c | 2 +- gcc/f/where.h | 2 +- 34 files changed, 134 insertions(+), 616 deletions(-) delete mode 100644 gcc/f/assert.j delete mode 100644 gcc/f/config.j delete mode 100644 gcc/f/convert.j delete mode 100644 gcc/f/flags.j delete mode 100644 gcc/f/ggc.j delete mode 100644 gcc/f/glimits.j delete mode 100644 gcc/f/hconfig.j delete mode 100644 gcc/f/input.j delete mode 100644 gcc/f/output.j delete mode 100644 gcc/f/rtl.j delete mode 100644 gcc/f/system.j delete mode 100644 gcc/f/tconfig.j delete mode 100644 gcc/f/tm.j delete mode 100644 gcc/f/toplev.j delete mode 100644 gcc/f/tree.j diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog index 05b51b1..2f52b90 100644 --- a/gcc/f/ChangeLog +++ b/gcc/f/ChangeLog @@ -1,3 +1,22 @@ +2000-06-21 Zack Weinberg + + * 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. + 2000-05-17 H.J. Lu (hjl@gnu.org) * Make-lang.in: Use a unique stamp for each target to support @@ -146,7 +165,7 @@ Sun Feb 27 16:40:33 2000 Richard Kenner 2000-02-23 Zack Weinberg * com.c (ffecom_type_permanent_copy_): Delete unused function. - (finish_decl): Don't change TREE_PERMANENT (DECL_INITIAL (decl)). + (finish_decl): Don't change TREE_PERMANENT (DECL_INITIAL (decl)). Sat Feb 19 18:43:13 2000 Richard Kenner @@ -203,9 +222,9 @@ Thu Dec 30 11:42:05 1999 Geoff Keating (ffecom_init_zero_): Remove obstack use. (ffecom_make_gfrt_): Remove obstack use. (ffecom_sym_transform_): Remove obstack use, save appropriate trees. - (ffecom_transform_common_): Remove obstack use, save appropriate + (ffecom_transform_common_): Remove obstack use, save appropriate trees. - (ffecom_type_namelist_): Remove obstack use, save appropriate + (ffecom_type_namelist_): Remove obstack use, save appropriate trees. (ffecom_type_vardesc_): Remove obstack use, save appropriate trees. (ffecom_lookup_label): Remove obstack use, save appropriate trees. @@ -262,11 +281,11 @@ Sun Nov 28 21:39:05 1999 Kaveh R. Ghazi * intrin.c (ffeintrin_cmp_name_): Don't needlessly cast away const-ness. - + Sun Nov 28 21:15:29 1999 Kaveh R. Ghazi * com.c (ffecom_get_invented_identifier): Rewrite to take an ellipses. - + (ffecom_char_enhance_arg_, ffecom_do_entry_, ffecom_f2c_make_type_, ffecom_gen_sfuncdef_, ffecom_start_progunit_, ffecom_start_progunit_, @@ -295,7 +314,7 @@ Sun Nov 28 21:15:29 1999 Kaveh R. Ghazi ffeste_io_icilist_, ffeste_io_inlist_, ffeste_io_olist_): Likewise. Wed Nov 10 12:43:21 1999 Philippe De Muyter - Kaveh R. Ghazi + Kaveh R. Ghazi * proj.h: Test `GCC_VERSION', not `HAVE_GCC_VERSION'. @@ -396,9 +415,9 @@ Wed Aug 25 01:21:06 1999 Rainer Orth Mon Aug 9 19:44:08 1999 Kaveh R. Ghazi - * com.c (lang_print_error_function): Constify a char*. - (init_parse): Remove redundant prototype for `print_error_function'. - (lang_identify): Constify a char*. + * com.c (lang_print_error_function): Constify a char*. + (init_parse): Remove redundant prototype for `print_error_function'. + (lang_identify): Constify a char*. Thu Aug 5 02:40:42 1999 Jeffrey A Law (law@cygnus.com) @@ -411,9 +430,9 @@ Thu Aug 5 02:40:42 1999 Jeffrey A Law (law@cygnus.com) (ffecom_init_0): Init and use ptr_type_node. 1999-07-17 Alexandre Oliva - + * root.texi: Update e-mail addresses to gcc.gnu.org. - * g77spec.c (lang_specific_driver): Updated URL with bug reporting + * g77spec.c (lang_specific_driver): Updated URL with bug reporting instructions to gcc.gnu.org. Removed e-mail address. Sat Jul 17 11:28:43 1999 Craig Burley @@ -912,64 +931,64 @@ Fri Apr 2 12:49:12 1999 Craig Burley Tue Mar 30 12:04:11 1999 Kaveh R. Ghazi - * sta.c (ffesta_ffebad_1sp, ffesta_ffebad_1st, ffesta_ffebad_2st): - Const-ify a char*. - - * sta.h (ffesta_ffebad_1sp, ffesta_ffebad_1st, ffesta_ffebad_2st): - Likewise. - - * stb.c (ffestb_local_u_): Likewise. - (ffestb_do, ffestb_dowhile, ffestb_else, ffestb_elsexyz, - ffestb_else3_, ffestb_endxyz, ffestb_goto, ffestb_let, - ffestb_type, ffestb_type1_, ffestb_varlist, ffestb_R423B, - ffestb_R522, ffestb_R528, ffestb_R542, ffestb_R834, ffestb_R835, - ffestb_R838, ffestb_R841, ffestb_R1102, ffestb_blockdata, - ffestb_R1212, ffestb_R1228, ffestb_V009, ffestb_module, - ffestb_R809, ffestb_R810, ffestb_R10014_, ffestb_R10015_, - ffestb_R10018_, ffestb_R1107, ffestb_R1202, ffestb_R12026_, - ffestb_S3P4, ffestb_V012, ffestb_V014, ffestb_V025, ffestb_V0255_, - ffestb_V020, ffestb_dimlist, ffestb_dummy, ffestb_R524, - ffestb_R547, ffestb_decl_chartype, ffestb_decl_dbltype, - ffestb_decl_gentype, ffestb_decl_recursive, ffestb_decl_entsp_2_, - ffestb_decl_func_, ffestb_V003, ffestb_V016, ffestb_V027, - ffestb_decl_R539): Likewise. - - * stb.h (_ffestb_args_): Likewise. + * sta.c (ffesta_ffebad_1sp, ffesta_ffebad_1st, ffesta_ffebad_2st): + Const-ify a char*. - * stc.c (ffestc_subr_binsrch_, ffestc_subr_is_present_, - ffestc_subr_speccmp_, ffestc_R904, ffestc_R907): Likewise. + * sta.h (ffesta_ffebad_1sp, ffesta_ffebad_1st, ffesta_ffebad_2st): + Likewise. - * std.c (ffestd_R1001dump_1005_1_, ffestd_R1001dump_1005_2_, - ffestd_R1001dump_1005_3_, ffestd_R1001dump_1005_4_, - ffestd_R1001dump_1005_5_, ffestd_R1001dump_1010_1_, - ffestd_R1001dump_1010_2_, ffestd_R1001dump_1010_3_, - ffestd_R1001dump_1010_4_, ffestd_R1001dump_1010_5_): Likewise. + * stb.c (ffestb_local_u_): Likewise. + (ffestb_do, ffestb_dowhile, ffestb_else, ffestb_elsexyz, + ffestb_else3_, ffestb_endxyz, ffestb_goto, ffestb_let, + ffestb_type, ffestb_type1_, ffestb_varlist, ffestb_R423B, + ffestb_R522, ffestb_R528, ffestb_R542, ffestb_R834, ffestb_R835, + ffestb_R838, ffestb_R841, ffestb_R1102, ffestb_blockdata, + ffestb_R1212, ffestb_R1228, ffestb_V009, ffestb_module, + ffestb_R809, ffestb_R810, ffestb_R10014_, ffestb_R10015_, + ffestb_R10018_, ffestb_R1107, ffestb_R1202, ffestb_R12026_, + ffestb_S3P4, ffestb_V012, ffestb_V014, ffestb_V025, ffestb_V0255_, + ffestb_V020, ffestb_dimlist, ffestb_dummy, ffestb_R524, + ffestb_R547, ffestb_decl_chartype, ffestb_decl_dbltype, + ffestb_decl_gentype, ffestb_decl_recursive, ffestb_decl_entsp_2_, + ffestb_decl_func_, ffestb_V003, ffestb_V016, ffestb_V027, + ffestb_decl_R539): Likewise. + + * stb.h (_ffestb_args_): Likewise. + + * stc.c (ffestc_subr_binsrch_, ffestc_subr_is_present_, + ffestc_subr_speccmp_, ffestc_R904, ffestc_R907): Likewise. + + * std.c (ffestd_R1001dump_1005_1_, ffestd_R1001dump_1005_2_, + ffestd_R1001dump_1005_3_, ffestd_R1001dump_1005_4_, + ffestd_R1001dump_1005_5_, ffestd_R1001dump_1010_1_, + ffestd_R1001dump_1010_2_, ffestd_R1001dump_1010_3_, + ffestd_R1001dump_1010_4_, ffestd_R1001dump_1010_5_): Likewise. - * ste.c (ffeste_begin_iterdo_, ffeste_subr_file_): Likewise. + * ste.c (ffeste_begin_iterdo_, ffeste_subr_file_): Likewise. - * sts.c (ffests_printf_1D, ffests_printf_1U, ffests_printf_1s, - ffests_printf_2Us, ffests_puts, ffests_puttext): Likewise. + * sts.c (ffests_printf_1D, ffests_printf_1U, ffests_printf_1s, + ffests_printf_2Us, ffests_puts, ffests_puttext): Likewise. - * sts.h (ffests_printf_1D, ffests_printf_1U, ffests_printf_1s, - ffests_printf_2Us, ffests_puts, ffests_puttext): Likewise. + * sts.h (ffests_printf_1D, ffests_printf_1U, ffests_printf_1s, + ffests_printf_2Us, ffests_puts, ffests_puttext): Likewise. - * stt.c (ffestt_exprlist_drive, ffestt_implist_drive, - ffestt_tokenlist_drive): Add prototype arguments. + * stt.c (ffestt_exprlist_drive, ffestt_implist_drive, + ffestt_tokenlist_drive): Add prototype arguments. - * stt.h (ffestt_exprlist_drive, ffestt_implist_drive, - ffestt_tokenlist_drive): Likewise. + * stt.h (ffestt_exprlist_drive, ffestt_implist_drive, + ffestt_tokenlist_drive): Likewise. - * stu.c (ffestu_dummies_transition_): Likewise. - (ffestu_sym_end_transition): Const-ify a char*. + * stu.c (ffestu_dummies_transition_): Likewise. + (ffestu_sym_end_transition): Const-ify a char*. - * stw.c (ffestw_display_state, ffestw_new, ffestw_pop): Add - prototype arguments. + * stw.c (ffestw_display_state, ffestw_new, ffestw_pop): Add + prototype arguments. - * stw.h (ffestw_display_state, ffestw_new, ffestw_pop): Likewise. + * stw.h (ffestw_display_state, ffestw_new, ffestw_pop): Likewise. - * version.c (ffe_version_string): Const-ify a char*. + * version.c (ffe_version_string): Const-ify a char*. - * version.h (ffe_version_string): Likewise. + * version.h (ffe_version_string): Likewise. Sat Mar 27 13:00:43 1999 Kaveh R. Ghazi @@ -993,7 +1012,7 @@ Sat Mar 27 13:00:43 1999 Kaveh R. Ghazi ffecom_get_identifier_, ffecom_decl_field, ffecom_get_invented_identifier, lang_print_error_function, skip_redundant_dir_prefix, read_name_map, print_containing_files): - Const-ify a char*. + Const-ify a char*. (savestring): Remove, use `xstrdup' instead. * com.h (ffecom_decl_field, ffecom_get_invented_identifier): @@ -1201,7 +1220,7 @@ Wed Mar 3 00:05:52 1999 Craig Burley * g77.texi: Clarify/index lack of run-time allocation for concatenation. - + 1999-02-25 Andreas Jaeger * f/intdoc.in: Add missing `,' after cross references. @@ -1329,7 +1348,7 @@ Sun Jan 31 20:34:29 1999 Zack Weinberg Tue Jan 5 22:12:41 1999 Kaveh R. Ghazi - * Make-lang.in (g77.o): Depend on prefix.h. + * Make-lang.in (g77.o): Depend on prefix.h. Fri Nov 27 13:10:32 1998 Kaveh R. Ghazi diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in index b070879..f87842b 100644 --- a/gcc/f/Make-lang.in +++ b/gcc/f/Make-lang.in @@ -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 \ diff --git a/gcc/f/Makefile.in b/gcc/f/Makefile.in index 301716b..f33498f 100644 --- a/gcc/f/Makefile.in +++ b/gcc/f/Makefile.in @@ -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 @@ -462,44 +448,6 @@ 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. g77-only: force diff --git a/gcc/f/ansify.c b/gcc/f/ansify.c index d2eea91..1c6f92d 100644 --- a/gcc/f/ansify.c +++ b/gcc/f/ansify.c @@ -19,28 +19,8 @@ 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. */ -/* 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 -#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)) \ diff --git a/gcc/f/assert.j b/gcc/f/assert.j deleted file mode 100644 index d9b9daa..0000000 --- a/gcc/f/assert.j +++ /dev/null @@ -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 diff --git a/gcc/f/bad.c b/gcc/f/bad.c index 5b42129..6f25246 100644 --- a/gcc/f/bad.c +++ b/gcc/f/bad.c @@ -38,9 +38,9 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #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. */ diff --git a/gcc/f/bit.c b/gcc/f/bit.c index 5f581a0..70d7833 100644 --- a/gcc/f/bit.c +++ b/gcc/f/bit.c @@ -31,7 +31,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA /* Include files. */ #include "proj.h" -#include "glimits.j" +#include "glimits.h" #include "bit.h" #include "malloc.h" diff --git a/gcc/f/com.c b/gcc/f/com.c index 7611d24..07c3141e 100644 --- a/gcc/f/com.c +++ b/gcc/f/com.c @@ -88,13 +88,13 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #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. */ diff --git a/gcc/f/com.h b/gcc/f/com.h index 8316040..6cf8aaa 100644 --- a/gcc/f/com.h +++ b/gcc/f/com.h @@ -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 diff --git a/gcc/f/config.j b/gcc/f/config.j deleted file mode 100644 index fda03eb..0000000 --- a/gcc/f/config.j +++ /dev/null @@ -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 diff --git a/gcc/f/convert.j b/gcc/f/convert.j deleted file mode 100644 index 76b8e02..0000000 --- a/gcc/f/convert.j +++ /dev/null @@ -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 diff --git a/gcc/f/flags.j b/gcc/f/flags.j deleted file mode 100644 index 44587a4..0000000 --- a/gcc/f/flags.j +++ /dev/null @@ -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 diff --git a/gcc/f/ggc.j b/gcc/f/ggc.j deleted file mode 100644 index 1689b41..0000000 --- a/gcc/f/ggc.j +++ /dev/null @@ -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 diff --git a/gcc/f/glimits.j b/gcc/f/glimits.j deleted file mode 100644 index 0262258..0000000 --- a/gcc/f/glimits.j +++ /dev/null @@ -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 -#endif -#endif diff --git a/gcc/f/hconfig.j b/gcc/f/hconfig.j deleted file mode 100644 index c73930c..0000000 --- a/gcc/f/hconfig.j +++ /dev/null @@ -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 diff --git a/gcc/f/input.j b/gcc/f/input.j deleted file mode 100644 index cc9ff24..0000000 --- a/gcc/f/input.j +++ /dev/null @@ -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 diff --git a/gcc/f/intdoc.c b/gcc/f/intdoc.c index 7e0a630..91c6b3c 100644 --- a/gcc/f/intdoc.c +++ b/gcc/f/intdoc.c @@ -22,12 +22,9 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA /* 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 -#endif +#include "hconfig.h" +#include "system.h" +#include "assert.h" typedef enum { diff --git a/gcc/f/lex.c b/gcc/f/lex.c index 0370637..031c39e 100644 --- a/gcc/f/lex.c +++ b/gcc/f/lex.c @@ -27,12 +27,11 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #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 diff --git a/gcc/f/output.j b/gcc/f/output.j deleted file mode 100644 index 8816b75..0000000 --- a/gcc/f/output.j +++ /dev/null @@ -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 diff --git a/gcc/f/parse.c b/gcc/f/parse.c index 1ffd6b3..feeb1d5 100644 --- a/gcc/f/parse.c +++ b/gcc/f/parse.c @@ -25,7 +25,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "where.h" #include "version.h" #if FFECOM_targetCURRENT == FFECOM_targetGCC -#include "flags.j" +#include "flags.h" #endif #define NAME_OF_STDIN "" diff --git a/gcc/f/proj.c b/gcc/f/proj.c index 237ebe0..3ed8345 100644 --- a/gcc/f/proj.c +++ b/gcc/f/proj.c @@ -20,7 +20,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "proj.h" -#include "glimits.j" +#include "glimits.h" #ifndef HAVE_STRTOUL unsigned long int diff --git a/gcc/f/proj.h b/gcc/f/proj.h index d55bd88..8671fda 100644 --- a/gcc/f/proj.h +++ b/gcc/f/proj.h @@ -25,11 +25,11 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #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 Place - Suite 330, Boston, MA 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 diff --git a/gcc/f/rtl.j b/gcc/f/rtl.j deleted file mode 100644 index ab78e3a..0000000 --- a/gcc/f/rtl.j +++ /dev/null @@ -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 diff --git a/gcc/f/ste.c b/gcc/f/ste.c index 13e49c5..ea927cc 100644 --- a/gcc/f/ste.c +++ b/gcc/f/ste.c @@ -33,9 +33,9 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #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" diff --git a/gcc/f/system.j b/gcc/f/system.j deleted file mode 100644 index 38547c8..0000000 --- a/gcc/f/system.j +++ /dev/null @@ -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 diff --git a/gcc/f/target.c b/gcc/f/target.c index 62b1fb8..b52e37f 100644 --- a/gcc/f/target.c +++ b/gcc/f/target.c @@ -69,7 +69,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA /* Include files. */ #include "proj.h" -#include "glimits.j" +#include "glimits.h" #include "target.h" #include "bad.h" #include "info.h" diff --git a/gcc/f/target.h b/gcc/f/target.h index 32df522..7eab106 100644 --- a/gcc/f/target.h +++ b/gcc/f/target.h @@ -34,7 +34,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #define HOST_WIDE_INT long #else #ifndef TREE_CODE -#include "tree.j" +#include "tree.h" #endif #endif diff --git a/gcc/f/tconfig.j b/gcc/f/tconfig.j deleted file mode 100644 index 9c4c3ec..0000000 --- a/gcc/f/tconfig.j +++ /dev/null @@ -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 diff --git a/gcc/f/tm.j b/gcc/f/tm.j deleted file mode 100644 index e0d7594..0000000 --- a/gcc/f/tm.j +++ /dev/null @@ -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 diff --git a/gcc/f/top.c b/gcc/f/top.c index 91db6d0..4da2258 100644 --- a/gcc/f/top.c +++ b/gcc/f/top.c @@ -54,8 +54,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #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. */ diff --git a/gcc/f/toplev.j b/gcc/f/toplev.j deleted file mode 100644 index 4b8b797..0000000 --- a/gcc/f/toplev.j +++ /dev/null @@ -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 diff --git a/gcc/f/tree.j b/gcc/f/tree.j deleted file mode 100644 index b0bf98a7..0000000 --- a/gcc/f/tree.j +++ /dev/null @@ -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 diff --git a/gcc/f/where.c b/gcc/f/where.c index 0fafa75..9f85354 100644 --- a/gcc/f/where.c +++ b/gcc/f/where.c @@ -33,7 +33,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "where.h" #include "lex.h" #include "malloc.h" -#include "ggc.j" +#include "ggc.h" /* Externals defined here. */ diff --git a/gcc/f/where.h b/gcc/f/where.h index efda13a..a6a3e1c 100644 --- a/gcc/f/where.h +++ b/gcc/f/where.h @@ -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. */ -- 2.7.4