Makefile.in (RTL_BASE_H, RTL_H): Correct.

	* Makefile.in (RTL_BASE_H, RTL_H): Correct.
	(BUILD_RTL): Remove $(BUILD_PREFIX) from ggc-none.o.
	(genobjs): Add errors.o, ggc-none.o, and min-insn-modes.o.
	(read-rtl.o, gensupport.o, genconfig.o, genflags.o, gencodes.o)
	(genconstants.o, genemit.o, genopinit.o, genrecog.o, genextract.o)
	(genpeep.o, genattr.o, genattrtab.o, genautomata.o, genoutput.o)
	(genconditions.o): Depend on $(RTL_BASE_H) not $(RTL_H).
	(ggc-none.o, errors.o): Move rule to generators section;
	correct dependencies.
	(min-insn-modes.o): Move rule to generators section; remove
	unnecessary explicit command; correct dependencies.
	(print-rtl.o, print-rtl1.o): Correct dependencies.
	($(BUILD_PREFIX_1)errors.o. $(BUILD_PREFIX_1)ggc-none.o): Delete rule.
	(mostlyclean): Update.

	* errors.c: Include bconfig.h not config.h.  Correct comment.
	* gengtype.c, genpreds.c: Don't define NO_GENRTL_H.
	* ggc-none.c: Include bconfig.h; not config.h or tm.h.
	* print-rtl.c: Don't include tm_p.h.

	* rtl.h: Move forward-decl of struct function down where it's
	needed.  Include genrtl.h #ifndef GENERATOR_FILE, not
	#ifndef NO_GENRTL_H.  Remove unnecessary #ifdef BUFSIZ statements.

From-SVN: r85574

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e62fdf50fc678659a361864aca153c397b543f01..506b4adbe6adc740a5f1c561f8a6a24034146895 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,29 @@
+2004-08-04  Zack Weinberg  <zack@codesourcery.com>
+
+       * Makefile.in (RTL_BASE_H, RTL_H): Correct.
+       (BUILD_RTL): Remove $(BUILD_PREFIX) from ggc-none.o.
+       (genobjs): Add errors.o, ggc-none.o, and min-insn-modes.o.
+       (read-rtl.o, gensupport.o, genconfig.o, genflags.o, gencodes.o)
+       (genconstants.o, genemit.o, genopinit.o, genrecog.o, genextract.o)
+       (genpeep.o, genattr.o, genattrtab.o, genautomata.o, genoutput.o)
+       (genconditions.o): Depend on $(RTL_BASE_H) not $(RTL_H).
+       (ggc-none.o, errors.o): Move rule to generators section;
+       correct dependencies.
+       (min-insn-modes.o): Move rule to generators section; remove
+       unnecessary explicit command; correct dependencies.
+       (print-rtl.o, print-rtl1.o): Correct dependencies.
+       ($(BUILD_PREFIX_1)errors.o. $(BUILD_PREFIX_1)ggc-none.o): Delete rule.
+       (mostlyclean): Update.
+
+       * errors.c: Include bconfig.h not config.h.  Correct comment.
+       * gengtype.c, genpreds.c: Don't define NO_GENRTL_H.
+       * ggc-none.c: Include bconfig.h; not config.h or tm.h.
+       * print-rtl.c: Don't include tm_p.h.
+
+       * rtl.h: Move forward-decl of struct function down where it's
+       needed.  Include genrtl.h #ifndef GENERATOR_FILE, not
+       #ifndef NO_GENRTL_H.  Remove unnecessary #ifdef BUFSIZ statements.
+
 2004-08-04  Zdenek Dvorak  <rakdver@atrey.karlin.mff.cuni.cz>
            Jeff Law  <law@redhat.com>
 

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index e16b1c90d74564bd9922ccca107f8a9014a1f299..4198d541528dc9ddb4e113398c8d85105c725761 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -682,8 +682,8 @@ HOOKS_H = hooks.h
 LANGHOOKS_DEF_H = langhooks-def.h $(HOOKS_H)
 TARGET_DEF_H = target-def.h $(HOOKS_H)
 MACHMODE_H = machmode.h mode-classes.def insn-modes.h
-RTL_BASE_H = rtl.h rtl.def $(MACHMODE_H)
-RTL_H = $(RTL_BASE_H) genrtl.h input.h statistics.h
+RTL_BASE_H = rtl.h rtl.def $(MACHMODE_H) input.h statistics.h
+RTL_H = $(RTL_BASE_H) genrtl.h
 PARAMS_H = params.h params.def
 TREE_H = tree.h tree.def $(MACHMODE_H) tree-check.h builtins.def \
           input.h statistics.h vec.h
@@ -775,7 +775,7 @@ LDEXP_LIB = @LDEXP_LIB@
 BUILD_LIBS = $(BUILD_LIBIBERTY)
 
 BUILD_RTL = $(BUILD_PREFIX)rtl.o read-rtl.o \
-               $(BUILD_PREFIX)ggc-none.o min-insn-modes.o
+               ggc-none.o min-insn-modes.o
 BUILD_SUPPORT = gensupport.o insn-conditions.o
 BUILD_EARLY_SUPPORT = gensupport.o dummy-conditions.o
 
@@ -1557,9 +1557,6 @@ ggc-zone.o: ggc-zone.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TR
 stringpool.o: stringpool.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
        $(TREE_H) $(GGC_H) gt-stringpool.h
 
-ggc-none.o: ggc-none.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) $(GGC_H)
-       $(CC) -c $(ALL_CFLAGS) -DGENERATOR_FILE $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
-
 prefix.o: prefix.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) Makefile prefix.h
        $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
        -DPREFIX=\"$(prefix)\" \
@@ -1791,14 +1788,11 @@ rtl.o : rtl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) $(RTL_H) real.h \
        $(CC) -c $(ALL_CFLAGS) -DGENERATOR_FILE $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
 print-rtl.o : print-rtl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
-    $(RTL_H) $(TREE_H) hard-reg-set.h $(BASIC_BLOCK_H) real.h $(TM_P_H)
+    $(RTL_H) $(TREE_H) hard-reg-set.h $(BASIC_BLOCK_H) real.h
 rtlanal.o : rtlanal.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) toplev.h \
    $(RTL_H) hard-reg-set.h $(TM_P_H) insn-config.h $(RECOG_H) real.h $(FLAGS_H) \
    $(BASIC_BLOCK_H) $(REGS_H) output.h target.h function.h
 
-errors.o : errors.c $(CONFIG_H) $(SYSTEM_H) errors.h
-       $(CC) -c $(ALL_CFLAGS) -DGENERATOR_FILE $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
-
 varasm.o : varasm.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(RTL_H) \
    $(FLAGS_H) function.h $(EXPR_H) hard-reg-set.h $(REGS_H) \
    output.h $(C_PRAGMA_H) toplev.h xcoffout.h debug.h $(GGC_H) $(TM_P_H) \
@@ -2450,7 +2444,8 @@ genprogs=$(genprognames:%=%$(build_exeext))
 genobjs=$(genprognames:%=%.o) read-rtl.o gensupport.o genattrtab.o \
         genautomata.o gengenrtl.o genmodes.o genpreds.o gengtype.o \
        genconstants.o gen-protos.o scan.o fix-header.o scan-decls.o \
-       gencheck.o dummy-conditions.o genconditions.o
+       gencheck.o dummy-conditions.o genconditions.o errors.o ggc-none.o \
+       min-insn-modes.o
 
 $(genprogs): %$(build_exeext): %.o  $(BUILD_RTL) $(BUILD_SUPPORT) \
                               $(BUILD_PRINT) $(BUILD_ERRORS) \
@@ -2460,21 +2455,22 @@ $(genprogs): %$(build_exeext): %.o  $(BUILD_RTL) $(BUILD_SUPPORT) \
                $(BUILD_ERRORS) $(BUILD_LIBS)
 
 $(genobjs): %.o : %.c
-       $(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
+       $(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) \
+           $< $(OUTPUT_OPTION)
 
-read-rtl.o: read-rtl.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) $(RTL_H) \
+read-rtl.o: read-rtl.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) $(RTL_BASE_H) \
   $(OBSTACK_H) $(HASHTAB_H)
 
-gensupport.o: gensupport.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) $(RTL_H) \
+gensupport.o: gensupport.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) $(RTL_BASE_H) \
   $(OBSTACK_H) errors.h $(HASHTAB_H) gensupport.h
 
-genconfig.o : genconfig.c $(RTL_H) $(BCONFIG_H) \
+genconfig.o : genconfig.c $(RTL_BASE_H) $(BCONFIG_H) \
   $(SYSTEM_H) coretypes.h $(GTM_H) errors.h gensupport.h
 
-genflags.o : genflags.c $(RTL_H) $(OBSTACK_H) $(BCONFIG_H) \
+genflags.o : genflags.c $(RTL_BASE_H) $(OBSTACK_H) $(BCONFIG_H) \
   $(SYSTEM_H) coretypes.h $(GTM_H) errors.h gensupport.h
 
-gencodes.o : gencodes.c $(RTL_H) $(BCONFIG_H) \
+gencodes.o : gencodes.c $(RTL_BASE_H) $(BCONFIG_H) \
   $(SYSTEM_H) coretypes.h $(GTM_H) errors.h gensupport.h
 
 genconstants$(build_exeext) : genconstants.o $(BUILD_RTL) $(BUILD_EARLY_SUPPORT) \
@@ -2483,25 +2479,25 @@ genconstants$(build_exeext) : genconstants.o $(BUILD_RTL) $(BUILD_EARLY_SUPPORT)
         genconstants.o $(BUILD_EARLY_SUPPORT) $(BUILD_RTL) \
            $(BUILD_ERRORS) $(BUILD_LIBS)
 
-genconstants.o : genconstants.c $(RTL_H) $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) \
+genconstants.o : genconstants.c $(RTL_BASE_H) $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) \
   errors.h
 
-genemit.o : genemit.c $(RTL_H) $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) \
+genemit.o : genemit.c $(RTL_BASE_H) $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) \
   errors.h gensupport.h
 
-genopinit.o : genopinit.c $(RTL_H) $(BCONFIG_H) \
+genopinit.o : genopinit.c $(RTL_BASE_H) $(BCONFIG_H) \
   $(SYSTEM_H) coretypes.h $(GTM_H) errors.h gensupport.h
 
-genrecog.o : genrecog.c $(RTL_H) $(BCONFIG_H) \
+genrecog.o : genrecog.c $(RTL_BASE_H) $(BCONFIG_H) \
   $(SYSTEM_H) coretypes.h $(GTM_H) errors.h gensupport.h
 
-genextract.o : genextract.c $(RTL_H) $(BCONFIG_H) \
+genextract.o : genextract.c $(RTL_BASE_H) $(BCONFIG_H) \
   $(SYSTEM_H) coretypes.h $(GTM_H) insn-config.h errors.h gensupport.h
 
-genpeep.o : genpeep.c $(RTL_H) $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) \
+genpeep.o : genpeep.c $(RTL_BASE_H) $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) \
   errors.h gensupport.h
 
-genattr.o : genattr.c $(RTL_H) $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) errors.h \
+genattr.o : genattr.c $(RTL_BASE_H) $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) errors.h \
   gensupport.h
 
 genattrtab$(build_exeext) : genattrtab.o genautomata.o \
@@ -2512,13 +2508,13 @@ genattrtab$(build_exeext) : genattrtab.o genautomata.o \
         $(BUILD_RTL) $(BUILD_SUPPORT) $(BUILD_PRINT) $(BUILD_ERRORS) \
         $(BUILD_VARRAY) $(BUILD_LIBS) -lm
 
-genattrtab.o : genattrtab.c $(RTL_H) $(OBSTACK_H) $(BCONFIG_H) \
+genattrtab.o : genattrtab.c $(RTL_BASE_H) $(OBSTACK_H) $(BCONFIG_H) \
   $(SYSTEM_H) coretypes.h $(GTM_H) errors.h $(GGC_H) gensupport.h genattrtab.h
 
-genautomata.o : genautomata.c $(RTL_H) $(OBSTACK_H) $(BCONFIG_H) \
+genautomata.o : genautomata.c $(RTL_BASE_H) $(OBSTACK_H) $(BCONFIG_H) \
   $(SYSTEM_H) coretypes.h $(GTM_H) errors.h varray.h genattrtab.h $(HASHTAB_H)
 
-genoutput.o : genoutput.c $(RTL_H) $(BCONFIG_H) \
+genoutput.o : genoutput.c $(RTL_BASE_H) $(BCONFIG_H) \
   $(SYSTEM_H) coretypes.h $(GTM_H) errors.h gensupport.h
 
 gengenrtl$(build_exeext) : gengenrtl.o $(BUILD_LIBDEPS)
@@ -2570,8 +2566,11 @@ genconditions$(build_exeext) : genconditions.o $(BUILD_EARLY_SUPPORT) \
         genconditions.o $(BUILD_EARLY_SUPPORT) $(BUILD_RTL) \
            $(BUILD_ERRORS) $(BUILD_LIBS)
 
-genconditions.o : genconditions.c $(RTL_H) $(BCONFIG_H) $(SYSTEM_H) coretypes.h \
-  $(GTM_H) errors.h
+genconditions.o : genconditions.c $(RTL_BASE_H) $(BCONFIG_H) $(SYSTEM_H) \
+       coretypes.h $(GTM_H) errors.h
+errors.o : errors.c $(BCONFIG_H) $(SYSTEM_H) errors.h
+ggc-none.o : ggc-none.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GGC_H)
+min-insn-modes.o : min-insn-modes.c $(BCONFIG_H) system.h $(MACHMODE_H)
 
 #\f
 # Compile the libraries to be used by gen*.
@@ -2585,16 +2584,11 @@ $(BUILD_PREFIX_1)rtl.o: $(srcdir)/rtl.c $(BCONFIG_H) coretypes.h $(GTM_H) $(SYST
        $(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(BUILD_PREFIX)rtl.c $(OUTPUT_OPTION)
 
 print-rtl1.o: $(srcdir)/print-rtl.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h \
-  $(GTM_H) $(RTL_H) $(TREE_H) hard-reg-set.h $(BASIC_BLOCK_H) $(TM_P_H)
+  $(GTM_H) $(RTL_H) $(TREE_H) hard-reg-set.h $(BASIC_BLOCK_H)
        rm -f print-rtl1.c
        sed -e 's/config[.]h/bconfig.h/' $(srcdir)/print-rtl.c > print-rtl1.c
        $(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) print-rtl1.c $(OUTPUT_OPTION)
 
-$(BUILD_PREFIX_1)errors.o: errors.c $(BCONFIG_H) $(SYSTEM_H) errors.h
-       rm -f $(BUILD_PREFIX)errors.c
-       sed -e 's/config[.]h/bconfig.h/' $(srcdir)/errors.c > $(BUILD_PREFIX)errors.c
-       $(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(BUILD_PREFIX)errors.c $(OUTPUT_OPTION)
-
 $(BUILD_PREFIX_1)varray.o: varray.c $(BCONFIG_H) coretypes.h $(GTM_H) $(SYSTEM_H) varray.h \
   $(RTL_H) $(GGC_H) $(TREE_H) bitmap.h errors.h
        rm -f $(BUILD_PREFIX)varray.c
@@ -2603,15 +2597,6 @@ $(BUILD_PREFIX_1)varray.o: varray.c $(BCONFIG_H) coretypes.h $(GTM_H) $(SYSTEM_H
        $(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) \
                $(BUILD_PREFIX)varray.c $(OUTPUT_OPTION)
 
-$(BUILD_PREFIX_1)ggc-none.o: ggc-none.c $(BCONFIG_H) coretypes.h $(GTM_H) $(SYSTEM_H) $(GGC_H)
-       rm -f $(BUILD_PREFIX)ggc-none.c
-       sed -e 's/config[.]h/bconfig.h/' $(srcdir)/ggc-none.c > $(BUILD_PREFIX)ggc-none.c
-       $(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(BUILD_PREFIX)ggc-none.c $(OUTPUT_OPTION)
-
-min-insn-modes.o: min-insn-modes.c $(BCONFIG_H) $(SYSTEM_H) $(MACHMODE_H)
-       $(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) \
-           min-insn-modes.c $(OUTPUT_OPTION)
-
 #\f
 # Remake internationalization support.
 intl.o: intl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) intl.h Makefile
@@ -3017,9 +3002,7 @@ mostlyclean: lang.mostlyclean
        -rm -f *$(coverageexts)
        -rm -rf libgcc
 # Delete the temporary source copies for cross compilation.
-       -rm -f $(BUILD_PREFIX_1)rtl.c $(BUILD_PREFIX_1)print-rtl.c
-       -rm -f $(BUILD_PREFIX_1)bitmap.c $(BUILD_PREFIX_1)errors.c
-       -rm -f $(BUILD_PREFIX_1)ggc-none.c print-rtl1.c
+       -rm -f $(BUILD_PREFIX_1)rtl.c $(BUILD_PREFIX_1)varray.c print-rtl1.c
 # Delete the temp files made in the course of building libgcc.a.
        -rm -f xlimits.h
 # Delete other built files.

diff --git a/gcc/errors.c b/gcc/errors.c
index 09504d39d86382631bb8944b6ea80463a40e4c61..13288a8ced491bb1b650351fc5b2e30e56c1ea69 100644 (file)
--- a/gcc/errors.c
+++ b/gcc/errors.c
@@ -1,5 +1,5 @@
 /* Basic error reporting routines.
-   Copyright (C) 1999, 2000, 2001, 2003
+   Copyright (C) 1999, 2000, 2001, 2003, 2004
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -20,10 +20,10 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
 /* warning, error, and fatal.  These definitions are suitable for use
-   in the generator programs; eventually we would like to use them in
-   cc1 too, but that's a longer term project.  */
+   in the generator programs; the compiler has a more elaborate suite
+   of diagnostic printers, found in diagnostic.c.  */
 
-#include "config.h"
+#include "bconfig.h"
 #include "system.h"
 #include "errors.h"
 

diff --git a/gcc/gengtype.c b/gcc/gengtype.c
index 45a6f91923864bee1a9869c96e8ef4d4e70db315..a1c23d2c9805b7812262e73f418d497d7c4d78bb 100644 (file)
--- a/gcc/gengtype.c
+++ b/gcc/gengtype.c
@@ -24,8 +24,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "tm.h"
 #include "gengtype.h"
 #include "gtyp-gen.h"
-
-#define NO_GENRTL_H
 #include "rtl.h"
 #undef abort
 

diff --git a/gcc/genpreds.c b/gcc/genpreds.c
index e52e424dd3c06528ede253f996864ac16ba45ab2..b5601208df8b69aa7baa5bf832319e0baca8faa1 100644 (file)
--- a/gcc/genpreds.c
+++ b/gcc/genpreds.c
@@ -25,11 +25,8 @@ Boston, MA 02111-1307, USA.  */
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-
-#define NO_GENRTL_H
 #include "rtl.h"
 
-
 static void
 output_predicate_decls (void)
 {

diff --git a/gcc/ggc-none.c b/gcc/ggc-none.c
index 4c7e5190682f5f09a933f97af44bb14f46bbd108..2e657dbaec8f8f2b3442bba531ab1888c0225279 100644 (file)
--- a/gcc/ggc-none.c
+++ b/gcc/ggc-none.c
@@ -23,11 +23,11 @@
    need GC at all.  This prevents problems with pulling in all the
    tree stuff.  */
 
-#include "config.h"
+#include "bconfig.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
 #include "ggc.h"
+
 struct alloc_zone *rtl_zone = NULL;
 struct alloc_zone *garbage_zone = NULL;
 

diff --git a/gcc/print-rtl.c b/gcc/print-rtl.c
index 7ae35a08f0ae4639cd8077e66a59f293dd295248..2ca57a94c199a241dd51f7222865285bd0c497cc 100644 (file)
--- a/gcc/print-rtl.c
+++ b/gcc/print-rtl.c
@@ -34,7 +34,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "flags.h"
 #include "hard-reg-set.h"
 #include "basic-block.h"
-#include "tm_p.h"
 
 static FILE *outfile;
 

diff --git a/gcc/rtl.h b/gcc/rtl.h
index f0ad10e73332fac2820346211620cac1ab1933ce..81f0fa1e5db99a9151aea0d0fe12c33b94bfab39 100644 (file)
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -21,10 +21,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #ifndef GCC_RTL_H
 #define GCC_RTL_H
-#include "statistics.h"
-
-struct function;
 
+#include "statistics.h"
 #include "machmode.h"
 #include "input.h"
 
@@ -1634,6 +1632,8 @@ extern rtx immed_double_const (HOST_WIDE_INT, HOST_WIDE_INT,
 extern rtx force_const_mem (enum machine_mode, rtx);
 
 /* In varasm.c  */
+
+struct function;
 extern rtx get_pool_constant (rtx);
 extern rtx get_pool_constant_mark (rtx, bool *);
 extern enum machine_mode get_pool_mode (rtx);
@@ -1983,7 +1983,7 @@ extern GTY(()) rtx return_address_pointer_rtx;
 
 /* Include the RTL generation functions.  */
 
-#ifndef NO_GENRTL_H
+#ifndef GENERATOR_FILE
 #include "genrtl.h"
 #ifndef USE_MAPPED_LOCATION
 #undef gen_rtx_ASM_OPERANDS
@@ -2109,9 +2109,7 @@ extern int rtx_to_tree_code (enum rtx_code);
 
 /* In cse.c */
 extern int delete_trivially_dead_insns (rtx, int);
-#ifdef BUFSIZ
 extern int cse_main (rtx, int, int, FILE *);
-#endif
 extern void cse_condition_code_reg (void);
 
 /* In jump.c */
@@ -2192,22 +2190,16 @@ extern rtx gen_lowpart_SUBREG (enum machine_mode, rtx);
 extern int combine_instructions (rtx, unsigned int);
 extern unsigned int extended_count (rtx, enum machine_mode, int);
 extern rtx remove_death (unsigned int, rtx);
-#ifdef BUFSIZ
 extern void dump_combine_stats (FILE *);
 extern void dump_combine_total_stats (FILE *);
-#endif
 /* In web.c */
 extern void web_main (void);
 
 /* In sched-rgn.c.  */
-#ifdef BUFSIZ
 extern void schedule_insns (FILE *);
-#endif
 
 /* In sched-ebb.c.  */
-#ifdef BUFSIZ
 extern void schedule_ebbs (FILE *);
-#endif
 
 /* In haifa-sched.c.  */
 extern void fix_sched_param (const char *, const char *);
@@ -2218,19 +2210,15 @@ extern void debug_rtx (rtx);
 extern void debug_rtx_list (rtx, int);
 extern void debug_rtx_range (rtx, rtx);
 extern rtx debug_rtx_find (rtx, int);
-#ifdef BUFSIZ
 extern void print_mem_expr (FILE *, tree);
 extern void print_rtl (FILE *, rtx);
 extern void print_simple_rtl (FILE *, rtx);
 extern int print_rtl_single (FILE *, rtx);
 extern void print_inline_rtx (FILE *, rtx, int);
-#endif
 
 /* In loop.c */
 extern void init_loop (void);
-#ifdef BUFSIZ
 extern void loop_optimize (rtx, FILE *, int);
-#endif
 extern void branch_target_load_optimize (bool);
 
 /* In function.c */
@@ -2256,10 +2244,8 @@ extern rtx move_by_pieces (rtx, rtx, unsigned HOST_WIDE_INT,
 extern void recompute_reg_usage (rtx, int);
 extern int initialize_uninitialized_subregs (void);
 extern void delete_dead_jumptables (void);
-#ifdef BUFSIZ
 extern void print_rtl_with_bb (FILE *, rtx);
 extern void dump_flow_info (FILE *);
-#endif
 
 /* In expmed.c */
 extern void init_expmed (void);
@@ -2271,18 +2257,14 @@ extern rtx expand_mult_highpart (enum machine_mode, rtx,
 /* In gcse.c */
 extern bool can_copy_p (enum machine_mode);
 extern rtx fis_get_condition (rtx);
-#ifdef BUFSIZ
 extern int gcse_main (rtx, FILE *);
 extern int bypass_jumps (FILE *);
 extern void gcse_after_reload_main (rtx, FILE *);
-#endif
 
 /* In global.c */
 extern void mark_elimination (int, int);
-#ifdef BUFSIZ
 extern int global_alloc (FILE *);
 extern void dump_global_regs (FILE *);
-#endif
 #ifdef HARD_CONST
 /* Yes, this ifdef is silly, but HARD_REG_SET is not always defined.  */
 extern void retry_global_alloc (int, HARD_REG_SET);
@@ -2311,26 +2293,18 @@ extern bool invalid_mode_change_p (unsigned int, enum reg_class,
                                   enum machine_mode);
 
 /* In regmove.c */
-#ifdef BUFSIZ
 extern void regmove_optimize (rtx, int, FILE *);
-#endif
 extern void combine_stack_adjustments (void);
 
 /* In reorg.c */
-#ifdef BUFSIZ
 extern void dbr_schedule (rtx, FILE *);
-#endif
 
 /* In local-alloc.c */
-#ifdef BUFSIZ
 extern void dump_local_alloc (FILE *);
-#endif
 extern int local_alloc (void);
 
 /* In reg-stack.c */
-#ifdef BUFSIZ
 extern bool reg_to_stack (FILE *);
-#endif
 
 /* In calls.c */
 enum libcall_type
@@ -2363,11 +2337,9 @@ extern void init_rtl (void);
 extern void traverse_md_constants (int (*) (void **, void *), void *);
 struct md_constant { char *name, *value; };
 
-#ifdef BUFSIZ
+/* In read-rtl.c */
 extern int read_skip_spaces (FILE *);
 extern rtx read_rtx (FILE *);
-#endif
-
 extern const char *read_rtx_filename;
 extern int read_rtx_lineno;
 
@@ -2442,9 +2414,7 @@ extern void simplify_using_condition (rtx, rtx *, struct bitmap_head_def *);
 extern void reg_alloc (void);
 
 /* In modulo-sched.c.  */
-#ifdef BUFSIZ
 extern void sms_schedule (FILE *);
-#endif
 \f
 struct rtl_hooks
 {