X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fparser%2Fhschooks.c;h=c0d0132e6e196d881a238ac7c181d2f422adbd71;hp=f3e7447a494e78574ddd71cf923773ef0d4acfdd;hb=d7b3ad9be373e02ea8b679d978f6ca898436892d;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1 diff --git a/compiler/parser/hschooks.c b/compiler/parser/hschooks.c index f3e7447..c0d0132 100644 --- a/compiler/parser/hschooks.c +++ b/compiler/parser/hschooks.c @@ -4,19 +4,8 @@ for various bits of the RTS. They are linked in instead of the defaults. */ -/* For GHC 4.08, we are relying on the fact that RtsFlags has - * compatible layout with the current version, because we're - * #including the current version of RtsFlags.h below. 4.08 didn't - * ship with its own RtsFlags.h, unfortunately. For later GHC - * versions, we #include the correct RtsFlags.h. - */ -#if __GLASGOW_HASKELL__ < 502 -#include "../includes/Rts.h" -#include "../includes/RtsFlags.h" -#else #include "Rts.h" #include "RtsFlags.h" -#endif #include "HsFFI.h" @@ -30,21 +19,9 @@ void defaultsHook (void) { RtsFlags.GcFlags.heapSizeSuggestion = 6*1024*1024 / BLOCK_SIZE; - RtsFlags.GcFlags.maxStkSize = 8*1024*1024 / sizeof(W_); -#if __GLASGOW_HASKELL__ >= 411 - /* GHC < 4.11 didn't have these */ + RtsFlags.GcFlags.maxStkSize = 64*1024*1024 / sizeof(W_); RtsFlags.GcFlags.giveStats = COLLECT_GC_STATS; RtsFlags.GcFlags.statsFile = stderr; -#endif -} - -void -OutOfHeapHook (unsigned long request_size/* always zero these days */, - unsigned long heap_size) - /* both in bytes */ -{ - fprintf(stderr, "GHC's heap exhausted: current limit is %lu bytes;\nUse the `-M' option to increase the total heap size.\n", - heap_size); } void