[project @ 2002-04-02 13:21:36 by simonpj]

[ghc-hetmet.git] / ghc / compiler / parser / hschooks.c

diff --git a/ghc/compiler/parser/hschooks.c b/ghc/compiler/parser/hschooks.c
index 6d94290..7d94a7a 100644 (file)
--- a/ghc/compiler/parser/hschooks.c
+++ b/ghc/compiler/parser/hschooks.c
@@ -11,7 +11,7 @@ in instead of the defaults.
 #endif
 
 #if __GLASGOW_HASKELL__ >= 408
-#include "../rts/RtsFlags.h"
+#include "../includes/RtsFlags.h"
 #include "HsFFI.h"
 #endif
 
@@ -20,6 +20,7 @@ defaultsHook (void)
 {
 #if __GLASGOW_HASKELL__ >= 408
     RtsFlags.GcFlags.heapSizeSuggestion = 6*1024*1024 / BLOCK_SIZE;
+    RtsFlags.GcFlags.maxStkSize         = 8*1024*1024 / sizeof(W_);
 #endif
 #if __GLASGOW_HASKELL__ >= 411
     RtsFlags.GcFlags.giveStats = COLLECT_GC_STATS;
@@ -41,8 +42,8 @@ setHeapSize( HsInt size )
 {
 #if __GLASGOW_HASKELL__ >= 408
     RtsFlags.GcFlags.heapSizeSuggestion = size / BLOCK_SIZE;
-    if (RtsFlags.GcFlags.heapSizeSuggestion > 
-       RtsFlags.GcFlags.maxHeapSize) {
+    if (RtsFlags.GcFlags.maxHeapSize != 0 &&
+       RtsFlags.GcFlags.heapSizeSuggestion > RtsFlags.GcFlags.maxHeapSize) {
        RtsFlags.GcFlags.maxHeapSize = RtsFlags.GcFlags.heapSizeSuggestion;
     }
 #endif