* Makefile.in (ggc-page.o): Now includes toplev.h.

	* ggc-page.c (toplev.h): Now included.
	(gc_time): Remove declaration.
	(ggc_collect): TIME now long.
	* toplev.c (parse_time, varasm_time, gc_time): Still global; all
	others static.
	* toplev.h (gc_time, parse_time, gc_time): New declarations.
	* cp/decl2.c (parse_time, varconst_time): Delete declarations.
	(finish_file): Delete LINENO declaration.
	START_TIME and THIS_TIME now long.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@33169 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 16 insertions, 18 deletions

diff --git a/gcc/ggc-page.c b/gcc/ggc-page.c
index a7490f3cad1..7fc8b2c3038 100644
--- a/gcc/ggc-page.c
+++ b/gcc/ggc-page.c
@@ -1,28 +1,29 @@
 /* "Bag-of-pages" garbage collector for the GNU compiler.
    Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
-   This file is part of GNU CC.
+This file is part of GNU CC.
 
-   GNU CC 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 CC 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 CC 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.
+GNU CC 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 CC; see the file COPYING.  If not, write to
-   the Free Software Foundation, 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+You should have received a copy of the GNU General Public License
+along with GNU CC; see the file COPYING.  If not, write to
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
 #include "system.h"
 #include "tree.h"
 #include "rtl.h"
 #include "tm_p.h"
+#include "toplev.h"
 #include "varray.h"
 #include "flags.h"
 #include "ggc.h"
@@ -97,9 +98,6 @@
 #define HOST_BITS_PER_PTR  HOST_BITS_PER_LONG
 #endif
 
-/* Timing information for collect execution goes into here.  */
-extern int gc_time;
-
 /* The "" allocated string.  */
 char *empty_string;
 
@@ -1103,7 +1101,7 @@ poison_pages ()
 void
 ggc_collect ()
 {
-  int time;
+  long time;
 
   /* Avoid frequent unnecessary work by skipping collection if the
      total allocations haven't expanded much since the last
@@ -1115,7 +1113,7 @@ ggc_collect ()
 
   time = get_run_time ();
   if (!quiet_flag)
-    fprintf (stderr, " {GC %luk -> ", (unsigned long)G.allocated / 1024);
+    fprintf (stderr, " {GC %luk -> ", (unsigned long) G.allocated / 1024);
 
   /* Zero the total allocated bytes.  We'll reaccumulate this while
      marking.  */