params.def (GGC_MIN_HEAPSIZE): Fix GGC_ALWAYS_COLLECT problem.

	* params.def (GGC_MIN_HEAPSIZE): Fix GGC_ALWAYS_COLLECT problem.
	* doc/invoke.texi: Correct description of what needs to be done to
	force collection at every ggc_collect call.

From-SVN: r59143

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 104a280e7b812a7997e95e9a022e73811686f643..92562b22bcc0f31187f9031110064e528de55e29 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-15  Geoffrey Keating  <geoffk@apple.com>
+
+       * params.def (GGC_MIN_HEAPSIZE): Fix GGC_ALWAYS_COLLECT problem.
+       * doc/invoke.texi: Correct description of what needs to be done to
+       force collection at every ggc_collect call.
+
 2002-11-15  Ulrich Weigand  <uweigand@de.ibm.com>
 
        * config/s390/s390.c (optimization_options): Set 

diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index dc8a4363912b5750da1c00cd088a3504740952b8..1df52deca4412b004ea76e273aa97e263e44578c 100644 (file)
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -4241,9 +4241,10 @@ collector's heap should be allowed to expand between collections.
 Tuning this may improve compilation speed; it has no effect on code
 generation.
 
-The default is 30%.  Setting this parameter to zero causes a full
-collection to occur at every opportunity.  This is extremely slow, but
-can be useful for debugging.
+The default is 30%.  Setting this parameter and
+@option{ggc-min-heapsize} to zero causes a full collection to occur at
+every opportunity.  This is extremely slow, but can be useful for
+debugging.
 
 @item ggc-min-heapsize
 
@@ -4254,7 +4255,9 @@ tuning this may improve compilation speed, and has no effect on code
 generation.
 
 The default is 4096 (four megabytes).  Setting this parameter very large
-effectively disables garbage collection.
+effectively disables garbage collection.  Setting this parameter and
+@option{ggc-min-expand} to zero causes a full collection to occur at
+every opportunity.  
 
 @end table
 @end table

diff --git a/gcc/params.def b/gcc/params.def
index f65469081fd78bf7d7555ac9c106d621534a94dd..d961189b3a5d9a54f7a6f5207dbd50673260e225 100644 (file)
--- a/gcc/params.def
+++ b/gcc/params.def
@@ -1,5 +1,5 @@
 /* params.def - Run-time parameters.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
    Written by Mark Mitchell <mark@codesourcery.com>.
 
 This file is part of GCC.
@@ -193,8 +193,10 @@ this threshold (in percents). Used when profile feedback is not available",
 
 #ifdef ENABLE_GC_ALWAYS_COLLECT
 # define GGC_MIN_EXPAND_DEFAULT 0
+# define GGC_MIN_HEAPSIZE_DEFAULT 0
 #else
 # define GGC_MIN_EXPAND_DEFAULT 30
+# define GGC_MIN_HEAPSIZE_DEFAULT 4096
 #endif
 
 DEFPARAM(GGC_MIN_EXPAND,
@@ -203,12 +205,13 @@ DEFPARAM(GGC_MIN_EXPAND,
 a percentage of the total size of the heap.",
         GGC_MIN_EXPAND_DEFAULT)
 
-#undef GGC_MIN_EXPAND_DEFAULT
-
 DEFPARAM(GGC_MIN_HEAPSIZE,
         "ggc-min-heapsize",
         "Minimum heap size before we start collecting garbage, in kilobytes.",
-        4096)
+        GGC_MIN_HEAPSIZE_DEFAULT)
+
+#undef GGC_MIN_EXPAND_DEFAULT
+#undef GGC_MIN_HEAPSIZE_DEFAULT
 
 /*
 Local variables: