X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Flib%2Fstd%2FMakefile;h=d0816d152fc256a0bdda07fa1fbf6c9a9d7e9c87;hb=438596897ebbe25a07e1c82085cfbc5bdb00f09e;hp=75140b8cf3b255488f864a66e0cebb570933e1ea;hpb=40379fc9cf0c36153ce3a51301868c4fa3964774;p=ghc-hetmet.git

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 75140b8..d0816d1 100644
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -23,7 +23,7 @@ endif
 #
 
 LIBRARY = libHS$(_way).a
-HS_SRCS	= $(wildcard *.lhs)
+HS_SRCS = $(wildcard *.lhs)
 HS_OBJS = $(HS_SRCS:.lhs=.$(way_)o)
 LIBOBJS = $(HS_OBJS)
 HS_IFACES= $(HS_SRCS:.lhs=.$(way_)hi) PrelGHC.$(way_)hi
@@ -47,26 +47,21 @@ SRC_HC_OPTS += -hisuf $(way_)hi
 endif
 
 # per-module flags
-PrelArr_HC_OPTS     += -monly-2-regs
-Directory_HC_OPTS   += -monly-3-regs 
-Time_HC_OPTS        += -monly-3-regs -H16m
+PrelArrExtra_HC_OPTS     += -monly-2-regs
+Directory_HC_OPTS   	 += -monly-3-regs 
+Time_HC_OPTS        	 += -monly-3-regs
 
-# Far too much heap is needed to compile PrelNum with -O at the
+# Far too much heap is needed to compile PrelNumExtra with -O at the
 # moment, but there you go..
-PrelNum_HC_OPTS     += -H30m
-# Note: this option has to go in the Makefile rather than in an
-# OPTIONS line in the source file. The reason being that we want
-# to override the SRC_HC_OPTS of -O, and anything option coming
-# from the Makefile overrides what's in OPTIONS lines. (mumble_HC_OPTS
-# does override SRC_HC_OPTS settings)
-PrelUnsafe_HC_OPTS           += -Onot
-
-PrelBase_HC_OPTS         += -H12m
-PrelRead_HC_OPTS         += -H13m
+PrelNumExtra_HC_OPTS     += -H30m -K2m
+
+PrelBase_HC_OPTS         += -H10m
+PrelRead_HC_OPTS         += -H16m
 PrelTup_HC_OPTS          += -H12m
+PrelNum_HC_OPTS		 += -H12m
 PrelArr_HC_OPTS          += -H8m
-PrelHandle_HC_OPTS       += -H12m
-Time_HC_OPTS             += -H8m
+PrelHandle_HC_OPTS       += -H14m
+Time_HC_OPTS             += -H18m
 Complex_HC_OPTS          += -H10m
 IO_HC_OPTS	         += -H12m
 PrelMain_HC_OPTS	 += -fno-prune-tydecls # avoids an apparent bug; ToDo
@@ -102,8 +97,3 @@ INSTALL_LIBS  += $(LIBRARY)
 INSTALL_DATAS += $(HS_IFACES)
 
 include $(TOP)/mk/target.mk
-
-glaExts/PackedString_HC_OPTS += -monly-3-regs
-concurrent/Parallel_HC_OPTS  += -fglasgow-exts
-glaExts/Int_HC_OPTS          += -H8m
-glaExts/Word_HC_OPTS         += -H8m