Re: toplev.h, revision.next

Re: toplev.h, revision.next

[Kaveh R. Ghazi]

 > From: Robert Lipe <robertl@dgii.com>
 > Subject: Re: toplev.h, revision.next
 > 
 > > This looks OK to me.
 > 
 > It's now committed 
 > 
 > > 	Please tell me the Makefile dependency lists are machine generated...
 > > 
 > > No, they aren't.  Kaveh has just been hand adding system.h to dependency
 > > lists everytime he adds an include.  Ideally we should do the same thing
 > 
 > Sounds like a good job for a computer.


	No need to fear, automake is here! :-)

Is anyone interested in taking on this challenge?

--
Kaveh R. Ghazi			Project Manager / Custom Development
ghazi@caip.rutgers.edu		Icon CMT Corp.

Re: toplev.h, revision.next

[Robert Lipe]

> I cleaned up the toplev.h changes.  I added the missing Makefile.in
> and cp/Makefile.in dependencies, I included toplev.h in toplev.c, I
> regenerated objc/objc-parse.[cy], and I added the missing objc/Make-lang.in

Thank you, Sir.   I hadn't noticed the missing toplev.h in perhaps the
single most important file until I mentioned it earlier today.

> dependency.  I think we have all of the hard stuff done, and now it is a
> simple matter of adding additional toplev.h includes as we need them.

Agreed.     There are still a few missing call sites.   The patch had
just gotten too large and I wanted to get it rolling.

Thanx for the help, Jim.

RJL

Re: toplev.h, revision.next

[Jim Wilson]

I cleaned up the toplev.h changes.  I added the missing Makefile.in
and cp/Makefile.in dependencies, I included toplev.h in toplev.c, I
regenerated objc/objc-parse.[cy], and I added the missing objc/Make-lang.in
dependency.  I think we have all of the hard stuff done, and now it is a
simple matter of adding additional toplev.h includes as we need them.

Jim

Re: toplev.h, revision.next

[Jim Wilson]

Just trying a build with the current CVS sources, I see there is a problem
with cp/errfn.c.  The first problem is that I get an error for conflicting
declarations.  This file has:
	typedef void errorfn ();        /* deliberately vague */
	extern errorfn warning;
	extern errorfn error;
which conflict with the declarations in toplev.h.  If I delete the extern
declarations, I get warnings for `incompatible pointer type assignment'.

It also has
	extern errorfn compiler_error;
and this function is defined in cp/lex.c the same ugly way that error in
toplev.c used to be defined.

I believe that we need to fix compiler_error the same way that error was fixed,
prototype the errorfn typedef, and then delete the now unnecessary extern
declarations from cp/errfn.c.

Jim

Re: toplev.h, revision.next

[Robert Lipe]

> This looks OK to me.

It's now committed 

The coverage isn't 100% yet.  There are more things that should be
protoed in toplev.h such as error_for_asm() and pfatal_with_name().
Also, there are more files that should include toplev.h such as
config/*/i386.c (probably actually just short of config/*/*.c).   I'll
try to beat on this as time allows.

> There is a spurious cp/parse.c change which we don't need, as all it does
> is change the path to the bison.simple file.  The ChangeLog entry claims
> that a toplev.h include was added to this file, but it isn't there, so

Cold busted.   I was hand-massaging the output of a 'cvs diff'. :-)

> 	Please tell me the Makefile dependency lists are machine generated...
> 
> No, they aren't.  Kaveh has just been hand adding system.h to dependency
> lists everytime he adds an include.  Ideally we should do the same thing

Sounds like a good job for a computer.

> for toplev.h.  If you want a quick hack, you could add it to RTL_H and TREE_H,
> but we are really trying to get away from that rtl/tree duplication.

Your call.

> We do need the Makefile.in dependencies added in, but that can be done with
> a separate patch if that makes things easier.  Mybe I can just add them in
> myself after you check in your patch if you don't have time.


Right now, I've just punted on it.   It'll be a couple of days before I 
get to it, so if you want to take a crack at i, please feel free to do so.

Thanx for the help.
RJL

Re: toplev.h, revision.next

[Jim Wilson]

This looks OK to me.

There is a spurious cp/parse.c change which we don't need, as all it does
is change the path to the bison.simple file.  The ChangeLog entry claims
that a toplev.h include was added to this file, but it isn't there, so
presumably the ChangeLog mention should disappear also.

	Please tell me the Makefile dependency lists are machine generated...

No, they aren't.  Kaveh has just been hand adding system.h to dependency
lists everytime he adds an include.  Ideally we should do the same thing
for toplev.h.  If you want a quick hack, you could add it to RTL_H and TREE_H,
but we are really trying to get away from that rtl/tree duplication.

We do need the Makefile.in dependencies added in, but that can be done with
a separate patch if that makes things easier.  Mybe I can just add them in
myself after you check in your patch if you don't have time.

Jim

toplev.h, revision.next

[Robert Lipe]

I've had this project iced for a while, but we left the toplev.h saga
with a toplev.h that required little editing of a million files, but
turned the stomachs of many of our elders.   Implementing the suggestions
of Jim, Kaveh, Jeff, and Richard, we now have a new proposed pass that
is much more of an editor exercise.

This probably doesn't hit every last needed occurrence of the added
include.   It just hit the limit of balls I can juggle.

Please tell me the Makefile dependency lists are machine generated...


/* toplev.h - Various declarations for functions found in toplev.c
   Copyright (C) 1998 Free Software Foundation, Inc.
 */

#ifndef __GCC_TOPLEV_H__
#define __GCC_TOPLEV_H__

extern void print_time                  PROTO ((char *, int));
extern int get_run_time                 PROTO ((void));
extern void debug_start_source_file     PROTO ((char *));
extern void debug_end_source_file       PROTO ((unsigned));
extern void debug_define                PROTO ((unsigned, char *));
extern void debug_undef                 PROTO ((unsigned, char *));
extern void fatal                       PVPROTO ((char *, ...))
                                                ATTRIBUTE_PRINTF_1;
extern void fatal_io_error              PROTO ((char *));
extern void warning                     PVPROTO ((char *, ...))
                                                ATTRIBUTE_PRINTF_1;
extern void error                       PVPROTO ((char *, ...))
                                                ATTRIBUTE_PRINTF_1;
extern void pedwarn                     PVPROTO ((char *, ...))
                                                ATTRIBUTE_PRINTF_1;
extern void pedwarn_with_file_and_line  PVPROTO ((char *, int, char *, ...))
                                                ATTRIBUTE_PRINTF_3;
extern void warning_with_file_and_line  PVPROTO ((char *, int, char *, ...))
                                                ATTRIBUTE_PRINTF_3;
extern void error_with_file_and_line    PVPROTO ((char *, int, char *, ...))
                                                ATTRIBUTE_PRINTF_3;
extern void sorry                       PVPROTO ((char *s, ...))
                                                ATTRIBUTE_PRINTF_1;
extern void default_print_error_function PROTO ((char *));
extern void report_error_function       PROTO ((char *));

extern void rest_of_decl_compilation    PROTO ((union tree_node *, char *, int, int));
extern void rest_of_type_compilation    PROTO ((union tree_node *, int));
extern void rest_of_compilation         PROTO ((union tree_node *));
extern void pedwarn_with_decl           PVPROTO ((union tree_node *, char *, ...));
extern void warning_with_decl           PVPROTO ((union tree_node *, char *, ...));
extern void error_with_decl             PVPROTO ((union tree_node *, char *, ...));
extern void announce_function           PROTO ((union tree_node *));

#endif /* __GCC_TOPLEV_H */



ChangeLogs:

Mon May  4 01:32:20 1998  Robert Lipe  <robertl@dgii.com>

        * toplev.h: New file.   Protypes for functions in toplev.c.
        * tree.h, rtl.h: Deleted protos for functions in toplev.c.
        * c-common.c, c-convert.c, c-decl.c, c-iterate.c, c-lex.c,
        c-parse.in, c-parse.y, c-pragma.c, c-typeck.c, calls.c,
        convert.c, dwarf2out.c, except.c, expr.c, final.c, fold-const.c,
        function.c, hash.c, profile.c, real.c, reg-stack.c, regclass.c,
        reload.c, reload1.c, stmt.c, stor-layout.c, tlink.c, tree.c,
        varasm.c: include it.


Mon May  4 01:43:16 1998  Robert Lipe  <robertl@dgii.com>
        * cp/call.c, cp/class.c, cp/decl.c, cp/decl2.c,
        cp/errfn.c, cp/error.c, cp/except.c, cp/expr.c,
        cp/friend.c, cp/init.c, cp/lex.c, cp/method.c,
        cp/parse.c, cp/pt.c, cp/repo.c, cp/rtti.c, cp/search.c,
        cp/semantics.c, cp/sig.c, cp/tree.c, cp/typeck.c, cp/typeck2.c,
        cp/xref.c: Add include toplev.h.


Index: c-common.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/c-common.c,v
retrieving revision 1.14
diff -u -p -r1.14 c-common.c
--- c-common.c	1998/04/24 06:27:03	1.14
+++ c-common.c	1998/05/04 06:12:42
@@ -25,6 +25,7 @@ Boston, MA 02111-1307, USA.  */
 #include "c-tree.h"
 #include "flags.h"
 #include "obstack.h"
+#include "toplev.h"
 
 #ifndef WCHAR_TYPE_SIZE
 #ifdef INT_TYPE_SIZE
Index: c-convert.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/c-convert.c,v
retrieving revision 1.2
diff -u -p -r1.2 c-convert.c
--- c-convert.c	1998/04/03 16:33:15	1.2
+++ c-convert.c	1998/05/04 06:12:42
@@ -28,6 +28,7 @@ Boston, MA 02111-1307, USA.  */
 #include "tree.h"
 #include "flags.h"
 #include "convert.h"
+#include "toplev.h"
 
 /* Change of width--truncation and extension of integers or reals--
    is represented with NOP_EXPR.  Proper functioning of many things
Index: c-decl.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/c-decl.c,v
retrieving revision 1.22
diff -u -p -r1.22 c-decl.c
--- c-decl.c	1998/04/21 13:25:55	1.22
+++ c-decl.c	1998/05/04 06:12:48
@@ -33,6 +33,7 @@ Boston, MA 02111-1307, USA.  */
 #include "output.h"
 #include "c-tree.h"
 #include "c-lex.h"
+#include "toplev.h"
 
 /* In grokdeclarator, distinguish syntactic contexts of declarators.  */
 enum decl_context
Index: c-iterate.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/c-iterate.c,v
retrieving revision 1.3
diff -u -p -r1.3 c-iterate.c
--- c-iterate.c	1998/04/03 16:33:19	1.3
+++ c-iterate.c	1998/05/04 06:12:48
@@ -30,6 +30,7 @@ Boston, MA 02111-1307, USA.  */
 #include "flags.h"
 #include "obstack.h"
 #include "rtl.h"
+#include "toplev.h"
 \f
 /*
 		KEEPING TRACK OF EXPANSIONS
Index: c-lex.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/c-lex.c,v
retrieving revision 1.17
diff -u -p -r1.17 c-lex.c
--- c-lex.c	1998/04/16 22:22:43	1.17
+++ c-lex.c	1998/05/04 06:12:50
@@ -30,6 +30,7 @@ Boston, MA 02111-1307, USA.  */
 #include "flags.h"
 #include "c-parse.h"
 #include "c-pragma.h"
+#include "toplev.h"
 
 /* MULTIBYTE_CHARS support only works for native compilers.
    ??? Ideally what we want is to model widechar support after
Index: c-parse.in
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/c-parse.in,v
retrieving revision 1.6
diff -u -p -r1.6 c-parse.in
--- c-parse.in	1998/04/06 14:01:19	1.6
+++ c-parse.in	1998/05/04 06:12:58
@@ -68,6 +68,7 @@ end ifc
 #include "c-tree.h"
 #include "flags.h"
 #include "output.h"
+#include "toplev.h"
 
 #ifdef MULTIBYTE_CHARS
 #include <locale.h>
Index: c-parse.y
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/c-parse.y,v
retrieving revision 1.6
diff -u -p -r1.6 c-parse.y
--- c-parse.y	1998/04/06 14:01:21	1.6
+++ c-parse.y	1998/05/04 06:13:00
@@ -64,6 +64,7 @@ State 434 contains 2 shift/reduce confli
 #include "c-tree.h"
 #include "flags.h"
 #include "output.h"
+#include "toplev.h"
 
 #ifdef MULTIBYTE_CHARS
 #include <locale.h>
Index: c-pragma.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/c-pragma.c,v
retrieving revision 1.5
diff -u -p -r1.5 c-pragma.c
--- c-pragma.c	1998/04/03 16:33:28	1.5
+++ c-pragma.c	1998/05/04 06:13:00
@@ -26,6 +26,7 @@ Boston, MA 02111-1307, USA.  */
 #include "defaults.h"
 #include "c-pragma.h"
 #include "flags.h"
+#include "toplev.h"
 
 #ifdef HANDLE_SYSV_PRAGMA
 
Index: c-typeck.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/c-typeck.c,v
retrieving revision 1.13
diff -u -p -r1.13 c-typeck.c
--- c-typeck.c	1998/04/04 17:37:29	1.13
+++ c-typeck.c	1998/05/04 06:13:08
@@ -36,6 +36,7 @@ Boston, MA 02111-1307, USA.  */
 #include "output.h"
 #include "rtl.h"
 #include "expr.h"
+#include "toplev.h"
 
 /* Nonzero if we've already printed a "missing braces around initializer"
    message within this initializer.  */
Index: calls.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/calls.c,v
retrieving revision 1.21
diff -u -p -r1.21 calls.c
--- calls.c	1998/04/29 12:41:21	1.21
+++ calls.c	1998/05/04 06:13:12
@@ -31,6 +31,7 @@ Boston, MA 02111-1307, USA.  */
 #include "expr.h"
 #include "regs.h"
 #include "insn-flags.h"
+#include "toplev.h"
 
 /* Decide whether a function's arguments should be processed
    from first to last or from last to first.
Index: convert.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/convert.c,v
retrieving revision 1.2
diff -u -p -r1.2 convert.c
--- convert.c	1998/04/03 16:33:53	1.2
+++ convert.c	1998/05/04 06:13:13
@@ -26,6 +26,7 @@ Boston, MA 02111-1307, USA.  */
 #include "tree.h"
 #include "flags.h"
 #include "convert.h"
+#include "toplev.h"
 
 /* Convert EXPR to some pointer or reference type TYPE.
 
Index: dwarf2out.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/dwarf2out.c,v
retrieving revision 1.46
diff -u -p -r1.46 dwarf2out.c
--- dwarf2out.c	1998/04/29 13:47:28	1.46
+++ dwarf2out.c	1998/05/04 06:13:23
@@ -40,6 +40,7 @@ the Free Software Foundation, 675 Mass A
 #include "expr.h"
 #include "except.h"
 #include "dwarf2.h"
+#include "toplev.h"
 
 /* We cannot use <assert.h> in GCC source, since that would include
    GCC's assert.h, which may not be compatible with the host compiler.  */
Index: except.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/except.c,v
retrieving revision 1.42
diff -u -p -r1.42 except.c
--- except.c	1998/04/16 22:57:50	1.42
+++ except.c	1998/05/04 06:13:26
@@ -404,6 +404,7 @@ Boston, MA 02111-1307, USA.  */
 #include "insn-config.h"
 #include "recog.h"
 #include "output.h"
+#include "toplev.h"
 
 /* One to use setjmp/longjmp method of generating code for exception
    handling.  */
Index: expr.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/expr.c,v
retrieving revision 1.50
diff -u -p -r1.50 expr.c
--- expr.c	1998/04/28 19:12:47	1.50
+++ expr.c	1998/05/04 06:13:41
@@ -38,6 +38,7 @@ Boston, MA 02111-1307, USA.  */
 #include "output.h"
 #include "typeclass.h"
 #include "defaults.h"
+#include "toplev.h"
 
 #define CEIL(x,y) (((x) + (y) - 1) / (y))
 
Index: final.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/final.c,v
retrieving revision 1.37
diff -u -p -r1.37 final.c
--- final.c	1998/04/27 06:20:13	1.37
+++ final.c	1998/05/04 06:13:44
@@ -67,6 +67,7 @@ Boston, MA 02111-1307, USA.  */
 #include "defaults.h"
 #include "output.h"
 #include "except.h"
+#include "toplev.h"
 
 /* Get N_SLINE and N_SOL from stab.h if we can expect the file to exist.  */
 #if defined (DBX_DEBUGGING_INFO) || defined (XCOFF_DEBUGGING_INFO)
Index: fold-const.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/fold-const.c,v
retrieving revision 1.28
diff -u -p -r1.28 fold-const.c
--- fold-const.c	1998/04/25 16:17:08	1.28
+++ fold-const.c	1998/05/04 06:13:51
@@ -47,6 +47,7 @@ Boston, MA 02111-1307, USA.  */
 #include <setjmp.h>
 #include "flags.h"
 #include "tree.h"
+#include "toplev.h"
 
 /* Handle floating overflow for `const_binop'.  */
 static jmp_buf float_error;
Index: function.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/function.c,v
retrieving revision 1.26
diff -u -p -r1.26 function.c
--- function.c	1998/04/16 22:08:49	1.26
+++ function.c	1998/05/04 06:13:58
@@ -55,6 +55,7 @@ Boston, MA 02111-1307, USA.  */
 #include "output.h"
 #include "basic-block.h"
 #include "obstack.h"
+#include "toplev.h"
 
 #ifndef TRAMPOLINE_ALIGNMENT
 #define TRAMPOLINE_ALIGNMENT FUNCTION_BOUNDARY
Index: hash.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/hash.c,v
retrieving revision 1.4
diff -u -p -r1.4 hash.c
--- hash.c	1998/04/03 16:35:48	1.4
+++ hash.c	1998/05/04 06:14:03
@@ -22,6 +22,8 @@ Foundation, Inc., 675 Mass Ave, Cambridg
 #include "system.h"
 #include "hash.h"
 #include "obstack.h"
+#include "gansidecl.h"
+#include "toplev.h"
 
 /* Obstack allocation and deallocation routines.  */
 #define obstack_chunk_alloc xmalloc
Index: profile.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/profile.c,v
retrieving revision 1.20
diff -u -p -r1.20 profile.c
--- profile.c	1998/04/23 19:10:52	1.20
+++ profile.c	1998/05/04 06:14:04
@@ -51,6 +51,7 @@ the Free Software Foundation, 675 Mass A
 #include "tree.h"
 #include "output.h"
 #include "gcov-io.h"
+#include "toplev.h"
 
 extern char * xmalloc ();
 
Index: real.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/real.c,v
retrieving revision 1.6
diff -u -p -r1.6 real.c
--- real.c	1998/04/03 16:36:35	1.6
+++ real.c	1998/05/04 06:14:09
@@ -23,6 +23,7 @@ Boston, MA 02111-1307, USA.  */
 #include "config.h"
 #include "system.h"
 #include "tree.h"
+#include "toplev.h"
 
 /* To enable support of XFmode extended real floating point, define
 LONG_DOUBLE_TYPE_SIZE 96 in the tm.h file (m68k.h or i386.h).
Index: reg-stack.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/reg-stack.c,v
retrieving revision 1.18
diff -u -p -r1.18 reg-stack.c
--- reg-stack.c	1998/04/27 19:24:06	1.18
+++ reg-stack.c	1998/05/04 06:14:12
@@ -166,6 +166,7 @@ Boston, MA 02111-1307, USA.  */
 #include "hard-reg-set.h"
 #include "flags.h"
 #include "insn-flags.h"
+#include "toplev.h"
 
 #ifdef STACK_REGS
 
Index: regclass.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/regclass.c,v
retrieving revision 1.20
diff -u -p -r1.20 regclass.c
--- regclass.c	1998/04/07 13:24:40	1.20
+++ regclass.c	1998/05/04 06:14:15
@@ -34,6 +34,7 @@ Boston, MA 02111-1307, USA.  */
 #include "recog.h"
 #include "reload.h"
 #include "real.h"
+#include "toplev.h"
 
 #ifndef REGISTER_MOVE_COST
 #define REGISTER_MOVE_COST(x, y) 2
Index: reload.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/reload.c,v
retrieving revision 1.23
diff -u -p -r1.23 reload.c
--- reload.c	1998/05/01 17:40:50	1.23
+++ reload.c	1998/05/04 06:14:22
@@ -100,6 +100,7 @@ a register with any other reload.  */
 #include "real.h"
 #include "output.h"
 #include "expr.h"
+#include "toplev.h"
 
 #ifndef REGISTER_MOVE_COST
 #define REGISTER_MOVE_COST(x, y) 2
Index: reload1.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/reload1.c,v
retrieving revision 1.20
diff -u -p -r1.20 reload1.c
--- reload1.c	1998/05/01 17:40:52	1.20
+++ reload1.c	1998/05/04 06:14:34
@@ -35,6 +35,7 @@ Boston, MA 02111-1307, USA.  */
 #include "basic-block.h"
 #include "output.h"
 #include "real.h"
+#include "toplev.h"
 
 /* This file contains the reload pass of the compiler, which is
    run after register allocation has been done.  It checks that
Index: rtl.h
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/rtl.h,v
retrieving revision 1.27
diff -u -p -r1.27 rtl.h
--- rtl.h	1998/04/27 06:05:54	1.27
+++ rtl.h	1998/05/04 06:14:37
@@ -1294,22 +1294,6 @@ extern rtx expand_mult_highpart		PROTO (
 						unsigned HOST_WIDE_INT, rtx,
 						int, int));
 
-/* In toplev.c */
-extern void strip_off_ending		PROTO ((char *, int));
-extern void print_time			PROTO ((char *, int));
-extern int get_run_time			PROTO ((void));
-#if 0
-extern void fatal			PVPROTO ((char *, ...));
-extern void warning			PVPROTO ((char *, ...));
-extern void error			PVPROTO ((char *, ...));
-#endif
-extern void pfatal_with_name		PROTO ((char *));
-extern void fancy_abort			PROTO ((void));
-extern int count_error			PROTO ((int));
-extern void pedwarn			PVPROTO ((char *, ...));
-extern void warning_for_asm		PVPROTO ((rtx, char *, ...));
-extern void error_for_asm		PVPROTO ((rtx, char *, ...));
-
 /* In global.c */
 #ifdef BUFSIZ
 extern int global_alloc			PROTO ((FILE *));
Index: stmt.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/stmt.c,v
retrieving revision 1.34
diff -u -p -r1.34 stmt.c
--- stmt.c	1998/04/21 19:43:55	1.34
+++ stmt.c	1998/05/04 06:14:43
@@ -50,6 +50,7 @@ Boston, MA 02111-1307, USA.  */
 #include "loop.h"
 #include "recog.h"
 #include "machmode.h"
+#include "toplev.h"
 
 #define obstack_chunk_alloc xmalloc
 #define obstack_chunk_free free
Index: stor-layout.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/stor-layout.c,v
retrieving revision 1.11
diff -u -p -r1.11 stor-layout.c
--- stor-layout.c	1998/04/04 17:46:04	1.11
+++ stor-layout.c	1998/05/04 06:14:46
@@ -28,6 +28,7 @@ Boston, MA 02111-1307, USA.  */
 #include "function.h"
 #include "rtl.h"
 #include "expr.h"
+#include "toplev.h"
 
 #define CEIL(x,y) (((x) + (y) - 1) / (y))
 
Index: tlink.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/tlink.c,v
retrieving revision 1.9
diff -u -p -r1.9 tlink.c
--- tlink.c	1998/04/03 16:37:12	1.9
+++ tlink.c	1998/05/04 06:14:46
@@ -24,6 +24,7 @@ the Free Software Foundation, 675 Mass A
 #include "system.h"
 #include "hash.h"
 #include "demangle.h"
+#include "toplev.h"
 
 #define MAX_ITERATIONS 17
 
Index: tree.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/tree.c,v
retrieving revision 1.23
diff -u -p -r1.23 tree.c
--- tree.c	1998/04/16 11:49:07	1.23
+++ tree.c	1998/05/04 06:14:50
@@ -46,6 +46,7 @@ Boston, MA 02111-1307, USA.  */
 #include "except.h"
 #include "function.h"
 #include "obstack.h"
+#include "toplev.h"
 
 #define obstack_chunk_alloc xmalloc
 #define obstack_chunk_free free
Index: tree.h
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/tree.h,v
retrieving revision 1.25
diff -u -p -r1.25 tree.h
--- tree.h	1998/04/17 14:02:51	1.25
+++ tree.h	1998/05/04 06:14:54
@@ -2106,34 +2106,6 @@ extern void make_decl_rtl		PROTO ((tree,
 extern void make_decl_one_only		PROTO ((tree));
 extern void variable_section		PROTO ((tree, int));
 
-/* toplev.c */
-extern void print_time			PROTO ((char *, int));
-extern int get_run_time			PROTO ((void));
-extern void debug_start_source_file	PROTO ((char *));
-extern void debug_end_source_file	PROTO ((unsigned));
-extern void debug_define		PROTO ((unsigned, char *));
-extern void debug_undef			PROTO ((unsigned, char *));
-extern void rest_of_decl_compilation	PROTO ((tree, char *, int, int));
-extern void rest_of_type_compilation	PROTO ((tree, int));
-extern void rest_of_compilation		PROTO ((tree));
-extern void fatal			PVPROTO ((char *, ...));
-extern void fatal_io_error		PROTO ((char *));
-#if 0
-extern void warning			PVPROTO ((char *, ...));
-extern void error			PVPROTO ((char *, ...));
-#endif
-extern void pedwarn			PVPROTO ((char *, ...));
-extern void pedwarn_with_decl		PVPROTO ((tree, char *, ...));
-extern void pedwarn_with_file_and_line	PVPROTO ((char *, int, char *, ...));
-extern void warning_with_file_and_line	PVPROTO ((char *, int, char *, ...));
-extern void warning_with_decl		PVPROTO ((tree, char *, ...));
-extern void error_with_decl		PVPROTO ((tree, char *, ...));
-extern void error_with_file_and_line	PVPROTO ((char *, int, char *, ...));
-extern void sorry			PVPROTO ((char *s, ...));
-extern void default_print_error_function PROTO ((char *));
-extern void report_error_function	PROTO ((char *));
-extern void announce_function		PROTO ((tree));
-
 /* In fold-const.c */
 extern int div_and_round_double		PROTO ((enum tree_code, int,
 						HOST_WIDE_INT, HOST_WIDE_INT,
Index: varasm.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/varasm.c,v
retrieving revision 1.23
diff -u -p -r1.23 varasm.c
--- varasm.c	1998/04/17 00:40:30	1.23
+++ varasm.c	1998/05/04 06:14:58
@@ -41,6 +41,7 @@ Boston, MA 02111-1307, USA.  */
 #include "regs.h"
 #include "defaults.h"
 #include "real.h"
+#include "toplev.h"
 
 #include "obstack.h"
 #include "c-pragma.h"
Index: cp/call.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/call.c,v
retrieving revision 1.67
diff -u -p -r1.67 call.c
--- call.c	1998/05/03 02:30:57	1.67
+++ call.c	1998/05/04 06:15:04
@@ -30,6 +30,7 @@ Boston, MA 02111-1307, USA.  */
 #include "output.h"
 #include "flags.h"
 #include "rtl.h"
+#include "toplev.h"
 
 #include "obstack.h"
 #define obstack_chunk_alloc xmalloc
Index: cp/class.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/class.c,v
retrieving revision 1.41
diff -u -p -r1.41 class.c
--- class.c	1998/04/22 13:23:29	1.41
+++ class.c	1998/05/04 06:15:14
@@ -29,6 +29,7 @@ Boston, MA 02111-1307, USA.  */
 #include "flags.h"
 #include "rtl.h"
 #include "output.h"
+#include "toplev.h"
 
 #include "obstack.h"
 #define obstack_chunk_alloc xmalloc
Index: cp/decl.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/decl.c,v
retrieving revision 1.99
diff -u -p -r1.99 decl.c
--- decl.c	1998/05/03 02:30:56	1.99
+++ decl.c	1998/05/04 06:15:37
@@ -40,6 +40,7 @@ Boston, MA 02111-1307, USA.  */
 #include "defaults.h"
 #include "output.h"
 #include "except.h"
+#include "toplev.h"
 
 #define obstack_chunk_alloc xmalloc
 #define obstack_chunk_free free
Index: cp/decl2.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/decl2.c,v
retrieving revision 1.65
diff -u -p -r1.65 decl2.c
--- decl2.c	1998/04/28 07:33:51	1.65
+++ decl2.c	1998/05/04 06:15:42
@@ -39,6 +39,7 @@ Boston, MA 02111-1307, USA.  */
 #include "except.h"
 #include "expr.h"
 #include "defaults.h"
+#include "toplev.h"
 
 static tree get_sentry PROTO((tree));
 static void mark_vtable_entries PROTO((tree));
Index: cp/errfn.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/errfn.c,v
retrieving revision 1.6
diff -u -p -r1.6 errfn.c
--- errfn.c	1998/04/21 21:55:45	1.6
+++ errfn.c	1998/05/04 06:15:42
@@ -22,6 +22,8 @@ Boston, MA 02111-1307, USA.  */
 #include "config.h"
 #include "system.h"
 #include "tree.h"
+#include "toplev.h"
+
 #ifdef __STDC__
 #include <stdarg.h>
 #else
Index: cp/error.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/error.c,v
retrieving revision 1.34
diff -u -p -r1.34 error.c
--- error.c	1998/04/23 09:35:38	1.34
+++ error.c	1998/05/04 06:15:44
@@ -24,6 +24,7 @@ Boston, MA 02111-1307, USA.  */
 #include "tree.h"
 #include "cp-tree.h"
 #include "obstack.h"
+#include "toplev.h"
 
 typedef char* cp_printer ();
 
Index: cp/except.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/except.c,v
retrieving revision 1.33
diff -u -p -r1.33 except.c
--- except.c	1998/04/17 08:05:19	1.33
+++ except.c	1998/05/04 06:15:45
@@ -34,6 +34,7 @@ Boston, MA 02111-1307, USA.  */
 #include "except.h"
 #include "function.h"
 #include "defaults.h"
+#include "toplev.h"
 
 rtx expand_builtin_return_addr	PROTO((enum built_in_function, int, rtx));
 
Index: cp/expr.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/expr.c,v
retrieving revision 1.13
diff -u -p -r1.13 expr.c
--- expr.c	1998/03/31 13:25:21	1.13
+++ expr.c	1998/05/04 06:15:46
@@ -27,6 +27,7 @@ Boston, MA 02111-1307, USA.  */
 #include "flags.h"
 #include "expr.h"
 #include "cp-tree.h"
+#include "toplev.h"
 
 #if 0
 static tree extract_aggr_init PROTO((tree, tree));
Index: cp/friend.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/friend.c,v
retrieving revision 1.13
diff -u -p -r1.13 friend.c
--- friend.c	1998/04/26 16:30:03	1.13
+++ friend.c	1998/05/04 06:15:46
@@ -25,6 +25,7 @@ Boston, MA 02111-1307, USA.  */
 #include "cp-tree.h"
 #include "flags.h"
 #include "output.h"
+#include "toplev.h"
 
 static void add_friend PROTO((tree, tree));
 static void add_friends PROTO((tree, tree, tree));
Index: cp/init.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/init.c,v
retrieving revision 1.32
diff -u -p -r1.32 init.c
--- init.c	1998/04/10 03:38:23	1.32
+++ init.c	1998/05/04 06:15:50
@@ -30,6 +30,7 @@ Boston, MA 02111-1307, USA.  */
 #include "output.h"
 #include "except.h"
 #include "expr.h"
+#include "toplev.h"
 
 extern void compiler_error ();
 
Index: cp/lex.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/lex.c,v
retrieving revision 1.41
diff -u -p -r1.41 lex.c
--- lex.c	1998/04/17 08:05:20	1.41
+++ lex.c	1998/05/04 06:15:54
@@ -36,6 +36,7 @@ Boston, MA 02111-1307, USA.  */
 #include "flags.h"
 #include "obstack.h"
 #include "c-pragma.h"
+#include "toplev.h"
 
 /* MULTIBYTE_CHARS support only works for native compilers.
    ??? Ideally what we want is to model widechar support after
Index: cp/method.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/method.c,v
retrieving revision 1.43
diff -u -p -r1.43 method.c
--- method.c	1998/04/17 08:32:50	1.43
+++ method.c	1998/05/04 06:16:00
@@ -40,6 +40,7 @@ Boston, MA 02111-1307, USA.  */
 #include "output.h"
 #include "hard-reg-set.h"
 #include "flags.h"
+#include "toplev.h"
 
 /* TREE_LIST of the current inline functions that need to be
    processed.  */
Index: cp/parse.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/parse.c,v
retrieving revision 1.42
diff -u -p -r1.42 parse.c
--- parse.c	1998/04/26 16:30:05	1.42
+++ parse.c	1998/05/04 06:16:08
@@ -3491,7 +3491,7 @@ static const short yycheck[] = {     4,
     80,    81,    82,    83,    84,    85
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/lib/bison.simple"
+#line 3 "/usr/cygnus/progressive-97r2/share/bison.simple"
 
 /* Skeleton output parser for bison,
    Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
@@ -3684,7 +3684,7 @@ __yy_memcpy (char *to, char *from, int c
 #endif
 #endif
 \f
-#line 196 "/usr/lib/bison.simple"
+#line 196 "/usr/cygnus/progressive-97r2/share/bison.simple"
 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.
@@ -7784,7 +7784,7 @@ case 841:
     break;}
 }
    /* the action file gets copied in in place of this dollarsign */
-#line 498 "/usr/lib/bison.simple"
+#line 498 "/usr/cygnus/progressive-97r2/share/bison.simple"
 \f
   yyvsp -= yylen;
   yyssp -= yylen;
Index: cp/pt.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/pt.c,v
retrieving revision 1.124
diff -u -p -r1.124 pt.c
--- pt.c	1998/04/26 16:30:10	1.124
+++ pt.c	1998/05/04 06:16:15
@@ -38,6 +38,7 @@ Boston, MA 02111-1307, USA.  */
 #include "output.h"
 #include "defaults.h"
 #include "except.h"
+#include "toplev.h"
 
 /* The type of functions taking a tree, and some additional data, and
    returning an int.  */
Index: cp/repo.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/repo.c,v
retrieving revision 1.10
diff -u -p -r1.10 repo.c
--- repo.c	1998/03/31 13:25:36	1.10
+++ repo.c	1998/05/04 06:16:15
@@ -31,6 +31,7 @@ Boston, MA 02111-1307, USA.  */
 #include "cp-tree.h"
 #include "input.h"
 #include "obstack.h"
+#include "toplev.h"
 
 extern char *getpwd PROTO((void));
 
Index: cp/rtti.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/rtti.c,v
retrieving revision 1.10
diff -u -p -r1.10 rtti.c
--- rtti.c	1998/03/31 13:25:37	1.10
+++ rtti.c	1998/05/04 06:16:16
@@ -27,6 +27,7 @@ Boston, MA 02111-1307, USA.  */
 #include "flags.h"
 #include "output.h"
 #include "assert.h"
+#include "toplev.h"
 
 #ifndef INT_TYPE_SIZE
 #define INT_TYPE_SIZE BITS_PER_WORD
Index: cp/search.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/search.c,v
retrieving revision 1.22
diff -u -p -r1.22 search.c
--- search.c	1998/04/17 08:05:24	1.22
+++ search.c	1998/05/04 06:16:21
@@ -30,6 +30,7 @@ Boston, MA 02111-1307, USA.  */
 #include "flags.h"
 #include "rtl.h"
 #include "output.h"
+#include "toplev.h"
 
 #define obstack_chunk_alloc xmalloc
 #define obstack_chunk_free free
Index: cp/semantics.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/semantics.c,v
retrieving revision 1.5
diff -u -p -r1.5 semantics.c
--- semantics.c	1998/04/28 13:23:57	1.5
+++ semantics.c	1998/05/04 06:16:22
@@ -30,6 +30,7 @@
 #include "cp-tree.h"
 #include "except.h"
 #include "lex.h"
+#include "toplev.h"
 
 /* There routines provide a modular interface to perform many parsing
    operations.  They may therefore be used during actual parsing, or
Index: cp/sig.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/sig.c,v
retrieving revision 1.5
diff -u -p -r1.5 sig.c
--- sig.c	1998/04/10 03:38:20	1.5
+++ sig.c	1998/05/04 06:16:23
@@ -27,6 +27,7 @@ Boston, MA 02111-1307, USA.  */
 #include "cp-tree.h"
 #include "flags.h"
 #include "assert.h"
+#include "toplev.h"
 
 extern struct obstack *current_obstack;
 extern struct obstack permanent_obstack;
Index: cp/tree.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/tree.c,v
retrieving revision 1.34
diff -u -p -r1.34 tree.c
--- tree.c	1998/04/23 22:26:41	1.34
+++ tree.c	1998/05/04 06:16:25
@@ -26,6 +26,8 @@ Boston, MA 02111-1307, USA.  */
 #include "cp-tree.h"
 #include "flags.h"
 #include "rtl.h"
+#include "toplev.h"
+
 #ifdef __STDC__
 #include <stdarg.h>
 #else
Index: cp/typeck.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/typeck.c,v
retrieving revision 1.61
diff -u -p -r1.61 typeck.c
--- typeck.c	1998/04/26 16:30:11	1.61
+++ typeck.c	1998/05/04 06:16:34
@@ -37,6 +37,7 @@ Boston, MA 02111-1307, USA.  */
 #include "flags.h"
 #include "output.h"
 #include "expr.h"
+#include "toplev.h"
 
 extern void compiler_error ();
 
Index: cp/typeck2.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/typeck2.c,v
retrieving revision 1.19
diff -u -p -r1.19 typeck2.c
--- typeck2.c	1998/04/17 00:47:20	1.19
+++ typeck2.c	1998/05/04 06:16:35
@@ -35,6 +35,7 @@ Boston, MA 02111-1307, USA.  */
 #include "tree.h"
 #include "cp-tree.h"
 #include "flags.h"
+#include "toplev.h"
 
 static tree process_init_constructor PROTO((tree, tree, tree *));
 
Index: cp/xref.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/cp/xref.c,v
retrieving revision 1.8
diff -u -p -r1.8 xref.c
--- xref.c	1998/04/01 17:25:12	1.8
+++ xref.c	1998/05/04 06:16:36
@@ -25,6 +25,7 @@ Boston, MA 02111-1307, USA.  */
 #include "tree.h"
 #include "cp-tree.h"
 #include "input.h"
+#include "toplev.h"
 
 extern char *getpwd PROTO((void));
 
Index: objc/objc-act.c
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/objc/objc-act.c,v
retrieving revision 1.7
diff -u -p -r1.7 objc-act.c
--- objc-act.c	1998/04/06 01:05:12	1.7
+++ objc-act.c	1998/05/04 06:16:43
@@ -53,6 +53,7 @@ Boston, MA 02111-1307, USA.  */
 #include "function.h"
 #include <string.h>
 #include "output.h"
+#include "toplev.h"
 
 /* This is the default way of generating a method name.  */
 /* I am not sure it is really correct.