[project @ 2001-08-08 13:21:04 by qrczak]

Remove -H80M options introduced a week ago.

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index dea298a..3b2d20d 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.182 2001/08/07 08:16:48 rrt Exp $
+# $Id: Makefile,v 1.183 2001/08/08 13:21:04 qrczak Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -231,11 +231,7 @@ endif
 
 SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O
 SRC_HC_OPTS += -recomp $(GhcHcOpts)
-# TODO: change back to 16M when the strictness analyser is working again.
-SRC_HC_OPTS += -H80M
-# TODO: remove when the strictness analyser is working again.
-rename/ParseIface_HC_OPTS += -H120M
-parser/Parser_HC_OPTS     += -H100M
+SRC_HC_OPTS += -H16M
 
 #      Special flags for particular modules
 #      The standard suffix rule for compiling a Haskell file

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 3086179..4c2fdc9 100644 (file)
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -54,15 +54,8 @@ PrelHandle_HC_OPTS   += -fno-ignore-asserts
 PrelIO_HC_OPTS       += -fno-ignore-asserts
 
 # Special options
-# TODO: remove -H80M when the strictness analyser is working again.
-PrelStorable_HC_OPTS = -monly-3-regs -H80M
+PrelStorable_HC_OPTS = -monly-3-regs
 PrelCError_HC_OPTS   = +RTS -K4m -RTS
-PrelInt_HC_OPTS      = -H80M # -monly-3-regs
-PrelWord_HC_OPTS     = -H80M # -monly-3-regs
-PrelFloat_HC_OPTS    = -H80M
-PrelRead_HC_OPTS     = -H80M
-PrelHandle_HC_OPTS   = -H80M
-Time_HC_OPTS         = -H80M
 
 #-----------------------------------------------------------------------------
 #      Dependency generation
@@ -223,5 +216,3 @@ include $(TOP)/mk/target.mk
 
 # PrelIO.hsc includes PrelHandle_hsc.h
 PrelIO.hsc : PrelHandle_hsc.h
-
-

diff --git a/ghc/utils/genprimopcode/Makefile b/ghc/utils/genprimopcode/Makefile
index 30f9362..f160024 100644 (file)
--- a/ghc/utils/genprimopcode/Makefile
+++ b/ghc/utils/genprimopcode/Makefile
@@ -1,13 +1,11 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.6 2001/08/01 20:37:00 qrczak Exp $
+# $Id: Makefile,v 1.7 2001/08/08 13:21:04 qrczak Exp $
 
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
 HS_PROG        = genprimopcode
 SRC_HC_OPTS   += -syslib text
-# TODO: remove -H80M when the strictness analyser is working again.
-Main_HC_OPTS   = -H80M
 
 # genprimopcode is needed to boot in ghc/compiler...
 ifneq "$(BootingFromHc)" "YES"

diff --git a/ghc/utils/hsc2hs/Makefile b/ghc/utils/hsc2hs/Makefile
index 5595d5b..0fb2a29 100644 (file)
--- a/ghc/utils/hsc2hs/Makefile
+++ b/ghc/utils/hsc2hs/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.20 2001/08/01 20:37:00 qrczak Exp $
+# $Id: Makefile,v 1.21 2001/08/08 13:21:04 qrczak Exp $
 
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
@@ -11,8 +11,6 @@ INSTALLING=1
 
 HS_PROG           = hsc2hs-bin
 SRC_HC_OPTS      += -package util
-# TODO: remove -H80M when the strictness analyser is working again.
-Main_HC_OPTS      = -H80M
 
 INSTALLED_SCRIPT_PROG  = hsc2hs
 INPLACE_SCRIPT_PROG    = hsc2hs-inplace